@esotericsoftware/spine-webgl 4.2.2 → 4.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/SkeletonRenderer.d.ts +1 -2
- package/dist/SkeletonRenderer.js +20 -114
- package/dist/iife/spine-webgl.js +31 -174
- package/dist/iife/spine-webgl.js.map +3 -3
- package/dist/iife/spine-webgl.min.js +26 -26
- package/package.json +2 -2
|
@@ -26,13 +26,12 @@
|
|
|
26
26
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
27
27
|
* THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
28
28
|
*****************************************************************************/
|
|
29
|
-
import {
|
|
29
|
+
import { Skeleton } from "@esotericsoftware/spine-core";
|
|
30
30
|
import { PolygonBatcher } from "./PolygonBatcher";
|
|
31
31
|
import { ManagedWebGLRenderingContext } from "./WebGL";
|
|
32
32
|
export declare class SkeletonRenderer {
|
|
33
33
|
static QUAD_TRIANGLES: number[];
|
|
34
34
|
premultipliedAlpha: boolean;
|
|
35
|
-
vertexEffect: VertexEffect | null;
|
|
36
35
|
private tempColor;
|
|
37
36
|
private tempColor2;
|
|
38
37
|
private vertices;
|
package/dist/SkeletonRenderer.js
CHANGED
|
@@ -39,7 +39,6 @@ class Renderable {
|
|
|
39
39
|
export class SkeletonRenderer {
|
|
40
40
|
constructor(context, twoColorTint = true) {
|
|
41
41
|
this.premultipliedAlpha = false;
|
|
42
|
-
this.vertexEffect = null;
|
|
43
42
|
this.tempColor = new Color();
|
|
44
43
|
this.tempColor2 = new Color();
|
|
45
44
|
this.vertexSize = 2 + 2 + 4;
|
|
@@ -162,125 +161,32 @@ export class SkeletonRenderer {
|
|
|
162
161
|
clipper.clipTriangles(renderable.vertices, renderable.numFloats, triangles, triangles.length, uvs, finalColor, darkColor, twoColorTint);
|
|
163
162
|
let clippedVertices = new Float32Array(clipper.clippedVertices);
|
|
164
163
|
let clippedTriangles = clipper.clippedTriangles;
|
|
165
|
-
if (this.vertexEffect) {
|
|
166
|
-
let vertexEffect = this.vertexEffect;
|
|
167
|
-
let verts = clippedVertices;
|
|
168
|
-
if (!twoColorTint) {
|
|
169
|
-
for (let v = 0, n = clippedVertices.length; v < n; v += vertexSize) {
|
|
170
|
-
tempPos.x = verts[v];
|
|
171
|
-
tempPos.y = verts[v + 1];
|
|
172
|
-
tempLight.set(verts[v + 2], verts[v + 3], verts[v + 4], verts[v + 5]);
|
|
173
|
-
tempUv.x = verts[v + 6];
|
|
174
|
-
tempUv.y = verts[v + 7];
|
|
175
|
-
tempDark.set(0, 0, 0, 0);
|
|
176
|
-
vertexEffect.transform(tempPos, tempUv, tempLight, tempDark);
|
|
177
|
-
verts[v] = tempPos.x;
|
|
178
|
-
verts[v + 1] = tempPos.y;
|
|
179
|
-
verts[v + 2] = tempLight.r;
|
|
180
|
-
verts[v + 3] = tempLight.g;
|
|
181
|
-
verts[v + 4] = tempLight.b;
|
|
182
|
-
verts[v + 5] = tempLight.a;
|
|
183
|
-
verts[v + 6] = tempUv.x;
|
|
184
|
-
verts[v + 7] = tempUv.y;
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
else {
|
|
188
|
-
for (let v = 0, n = clippedVertices.length; v < n; v += vertexSize) {
|
|
189
|
-
tempPos.x = verts[v];
|
|
190
|
-
tempPos.y = verts[v + 1];
|
|
191
|
-
tempLight.set(verts[v + 2], verts[v + 3], verts[v + 4], verts[v + 5]);
|
|
192
|
-
tempUv.x = verts[v + 6];
|
|
193
|
-
tempUv.y = verts[v + 7];
|
|
194
|
-
tempDark.set(verts[v + 8], verts[v + 9], verts[v + 10], verts[v + 11]);
|
|
195
|
-
vertexEffect.transform(tempPos, tempUv, tempLight, tempDark);
|
|
196
|
-
verts[v] = tempPos.x;
|
|
197
|
-
verts[v + 1] = tempPos.y;
|
|
198
|
-
verts[v + 2] = tempLight.r;
|
|
199
|
-
verts[v + 3] = tempLight.g;
|
|
200
|
-
verts[v + 4] = tempLight.b;
|
|
201
|
-
verts[v + 5] = tempLight.a;
|
|
202
|
-
verts[v + 6] = tempUv.x;
|
|
203
|
-
verts[v + 7] = tempUv.y;
|
|
204
|
-
verts[v + 8] = tempDark.r;
|
|
205
|
-
verts[v + 9] = tempDark.g;
|
|
206
|
-
verts[v + 10] = tempDark.b;
|
|
207
|
-
verts[v + 11] = tempDark.a;
|
|
208
|
-
}
|
|
209
|
-
}
|
|
210
|
-
}
|
|
211
164
|
batcher.draw(texture, clippedVertices, clippedTriangles);
|
|
212
165
|
}
|
|
213
166
|
else {
|
|
214
167
|
let verts = renderable.vertices;
|
|
215
|
-
if (
|
|
216
|
-
let
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
tempLight.setFromColor(finalColor);
|
|
224
|
-
tempDark.set(0, 0, 0, 0);
|
|
225
|
-
vertexEffect.transform(tempPos, tempUv, tempLight, tempDark);
|
|
226
|
-
verts[v] = tempPos.x;
|
|
227
|
-
verts[v + 1] = tempPos.y;
|
|
228
|
-
verts[v + 2] = tempLight.r;
|
|
229
|
-
verts[v + 3] = tempLight.g;
|
|
230
|
-
verts[v + 4] = tempLight.b;
|
|
231
|
-
verts[v + 5] = tempLight.a;
|
|
232
|
-
verts[v + 6] = tempUv.x;
|
|
233
|
-
verts[v + 7] = tempUv.y;
|
|
234
|
-
}
|
|
235
|
-
}
|
|
236
|
-
else {
|
|
237
|
-
for (let v = 0, u = 0, n = renderable.numFloats; v < n; v += vertexSize, u += 2) {
|
|
238
|
-
tempPos.x = verts[v];
|
|
239
|
-
tempPos.y = verts[v + 1];
|
|
240
|
-
tempUv.x = uvs[u];
|
|
241
|
-
tempUv.y = uvs[u + 1];
|
|
242
|
-
tempLight.setFromColor(finalColor);
|
|
243
|
-
tempDark.setFromColor(darkColor);
|
|
244
|
-
vertexEffect.transform(tempPos, tempUv, tempLight, tempDark);
|
|
245
|
-
verts[v] = tempPos.x;
|
|
246
|
-
verts[v + 1] = tempPos.y;
|
|
247
|
-
verts[v + 2] = tempLight.r;
|
|
248
|
-
verts[v + 3] = tempLight.g;
|
|
249
|
-
verts[v + 4] = tempLight.b;
|
|
250
|
-
verts[v + 5] = tempLight.a;
|
|
251
|
-
verts[v + 6] = tempUv.x;
|
|
252
|
-
verts[v + 7] = tempUv.y;
|
|
253
|
-
verts[v + 8] = tempDark.r;
|
|
254
|
-
verts[v + 9] = tempDark.g;
|
|
255
|
-
verts[v + 10] = tempDark.b;
|
|
256
|
-
verts[v + 11] = tempDark.a;
|
|
257
|
-
}
|
|
168
|
+
if (!twoColorTint) {
|
|
169
|
+
for (let v = 2, u = 0, n = renderable.numFloats; v < n; v += vertexSize, u += 2) {
|
|
170
|
+
verts[v] = finalColor.r;
|
|
171
|
+
verts[v + 1] = finalColor.g;
|
|
172
|
+
verts[v + 2] = finalColor.b;
|
|
173
|
+
verts[v + 3] = finalColor.a;
|
|
174
|
+
verts[v + 4] = uvs[u];
|
|
175
|
+
verts[v + 5] = uvs[u + 1];
|
|
258
176
|
}
|
|
259
177
|
}
|
|
260
178
|
else {
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
for (let v = 2, u = 0, n = renderable.numFloats; v < n; v += vertexSize, u += 2) {
|
|
273
|
-
verts[v] = finalColor.r;
|
|
274
|
-
verts[v + 1] = finalColor.g;
|
|
275
|
-
verts[v + 2] = finalColor.b;
|
|
276
|
-
verts[v + 3] = finalColor.a;
|
|
277
|
-
verts[v + 4] = uvs[u];
|
|
278
|
-
verts[v + 5] = uvs[u + 1];
|
|
279
|
-
verts[v + 6] = darkColor.r;
|
|
280
|
-
verts[v + 7] = darkColor.g;
|
|
281
|
-
verts[v + 8] = darkColor.b;
|
|
282
|
-
verts[v + 9] = darkColor.a;
|
|
283
|
-
}
|
|
179
|
+
for (let v = 2, u = 0, n = renderable.numFloats; v < n; v += vertexSize, u += 2) {
|
|
180
|
+
verts[v] = finalColor.r;
|
|
181
|
+
verts[v + 1] = finalColor.g;
|
|
182
|
+
verts[v + 2] = finalColor.b;
|
|
183
|
+
verts[v + 3] = finalColor.a;
|
|
184
|
+
verts[v + 4] = uvs[u];
|
|
185
|
+
verts[v + 5] = uvs[u + 1];
|
|
186
|
+
verts[v + 6] = darkColor.r;
|
|
187
|
+
verts[v + 7] = darkColor.g;
|
|
188
|
+
verts[v + 8] = darkColor.b;
|
|
189
|
+
verts[v + 9] = darkColor.a;
|
|
284
190
|
}
|
|
285
191
|
}
|
|
286
192
|
let view = renderable.vertices.subarray(0, renderable.numFloats);
|
|
@@ -293,4 +199,4 @@ export class SkeletonRenderer {
|
|
|
293
199
|
}
|
|
294
200
|
}
|
|
295
201
|
SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
|
|
296
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SkeletonRenderer.js","sourceRoot":"","sources":["../src/SkeletonRenderer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;+EA2B+E;AAE/E,OAAO,EAAiC,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,KAAK,EAAuB,gBAAgB,EAAsB,cAAc,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAGrN,OAAO,EAAgC,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAGhF,MAAM,UAAU;IACf,YAAoB,QAAyB,EAAS,WAAmB,EAAS,SAAiB;QAA/E,aAAQ,GAAR,QAAQ,CAAiB;QAAS,gBAAW,GAAX,WAAW,CAAQ;QAAS,cAAS,GAAT,SAAS,CAAQ;IAAI,CAAC;CACxG;AAAA,CAAC;AAEF,MAAM,OAAO,gBAAgB;IAiB5B,YAAa,OAAqC,EAAE,eAAwB,IAAI;QAdhF,uBAAkB,GAAG,KAAK,CAAC;QAC3B,iBAAY,GAAwB,IAAI,CAAC;QACjC,cAAS,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,eAAU,GAAG,IAAI,KAAK,EAAE,CAAC;QAEzB,eAAU,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,iBAAY,GAAG,KAAK,CAAC;QACrB,eAAU,GAAe,IAAI,UAAU,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAClD,YAAO,GAAqB,IAAI,gBAAgB,EAAE,CAAC;QACnD,SAAI,GAAG,IAAI,OAAO,EAAE,CAAC;QACrB,UAAK,GAAG,IAAI,OAAO,EAAE,CAAC;QACtB,UAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QACpB,UAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAG3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,YAAY;YACf,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,CAAE,OAAuB,EAAE,QAAkB,EAAE,iBAAyB,CAAC,CAAC,EAAE,eAAuB,CAAC,CAAC;QACxG,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,IAAI,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACjD,IAAI,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACrC,IAAI,SAAS,GAAqB,IAAI,CAAC;QAEvC,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;QACxB,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;QAC3B,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAE1B,IAAI,UAAU,GAAe,IAAI,CAAC,UAAU,CAAC;QAC7C,IAAI,GAAoB,CAAC;QACzB,IAAI,SAAwB,CAAC;QAC7B,IAAI,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;QACnC,IAAI,eAAsB,CAAC;QAC3B,IAAI,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC;QACnC,IAAI,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,cAAc,IAAI,CAAC,CAAC;YAAE,OAAO,GAAG,IAAI,CAAC;QACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YACjD,IAAI,iBAAiB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAC9D,IAAI,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBACtB,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC9B,SAAS;aACT;YAED,IAAI,cAAc,IAAI,CAAC,IAAI,cAAc,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBAC7D,OAAO,GAAG,IAAI,CAAC;aACf;YAED,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC9B,SAAS;aACT;YAED,IAAI,YAAY,IAAI,CAAC,IAAI,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBACzD,OAAO,GAAG,KAAK,CAAC;aAChB;YAED,IAAI,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YACtC,IAAI,OAAkB,CAAC;YACvB,IAAI,UAAU,YAAY,gBAAgB,EAAE;gBAC3C,IAAI,MAAM,GAAqB,UAAU,CAAC;gBAC1C,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;gBACpC,UAAU,CAAC,WAAW,GAAG,CAAC,CAAC;gBAC3B,UAAU,CAAC,SAAS,GAAG,iBAAiB,IAAI,CAAC,CAAC;gBAC9C,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAAC;gBAC7E,SAAS,GAAG,gBAAgB,CAAC,cAAc,CAAC;gBAC5C,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;gBACjB,OAAO,GAAmC,MAAM,CAAC,MAAO,CAAC,YAAa,CAAC,IAAI,CAAC,OAAO,CAAC;gBACpF,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC;aAC/B;iBAAM,IAAI,UAAU,YAAY,cAAc,EAAE;gBAChD,IAAI,IAAI,GAAmB,UAAU,CAAC;gBACtC,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;gBACpC,UAAU,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,mBAAmB,IAAI,CAAC,CAAC,CAAC;gBACzD,UAAU,CAAC,SAAS,GAAG,UAAU,CAAC,WAAW,GAAG,iBAAiB,CAAC;gBAClE,IAAI,UAAU,CAAC,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE;oBACtD,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;iBAChF;gBACD,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAAC;gBACxG,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC3B,OAAO,GAAmC,IAAI,CAAC,MAAO,CAAC,YAAa,CAAC,IAAI,CAAC,OAAO,CAAC;gBAClF,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;gBACf,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC;aAC7B;iBAAM,IAAI,UAAU,YAAY,kBAAkB,EAAE;gBACpD,IAAI,IAAI,GAAuB,CAAC,UAAU,CAAC,CAAC;gBAC5C,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC9B,SAAS;aACT;iBAAM;gBACN,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC9B,SAAS;aACT;YAED,IAAI,OAAO,EAAE;gBACZ,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC3B,IAAI,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;gBAChC,UAAU,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;gBACjE,UAAU,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;gBACjE,UAAU,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;gBACjE,UAAU,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;gBACjE,IAAI,kBAAkB,EAAE;oBACvB,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC;oBAC7B,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC;oBAC7B,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC;iBAC7B;gBACD,IAAI,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;gBAChC,IAAI,CAAC,IAAI,CAAC,SAAS;oBAClB,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;qBACxB;oBACJ,IAAI,kBAAkB,EAAE;wBACvB,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;wBAC9C,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;wBAC9C,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;qBAC9C;yBAAM;wBACN,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;qBACvC;oBACD,SAAS,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;iBAC7C;gBAED,IAAI,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;gBACxC,IAAI,aAAa,IAAI,SAAS,EAAE;oBAC/B,SAAS,GAAG,aAAa,CAAC;oBAC1B,OAAO,CAAC,YAAY,CACnB,uBAAuB,CAAC,yBAAyB,CAAC,SAAS,EAAE,kBAAkB,CAAC,EAChF,uBAAuB,CAAC,yBAAyB,CAAC,SAAS,CAAC,EAC5D,uBAAuB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;iBACxD;gBAED,IAAI,OAAO,CAAC,UAAU,EAAE,EAAE;oBACzB,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;oBACxI,IAAI,eAAe,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;oBAChE,IAAI,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;oBAChD,IAAI,IAAI,CAAC,YAAY,EAAE;wBACtB,IAAI,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;wBACrC,IAAI,KAAK,GAAG,eAAe,CAAC;wBAC5B,IAAI,CAAC,YAAY,EAAE;4BAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE;gCACnE,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gCACrB,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gCACzB,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gCACtE,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gCACxB,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gCACxB,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gCACzB,YAAY,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gCAC7D,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;gCACrB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;gCACzB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;gCACxB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAA;6BACvB;yBACD;6BAAM;4BACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE;gCACnE,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gCACrB,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gCACzB,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gCACtE,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gCACxB,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gCACxB,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;gCACvE,YAAY,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gCAC7D,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;gCACrB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;gCACzB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;gCACxB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAA;gCACvB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;gCAC1B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;gCAC1B,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;6BAC3B;yBACD;qBACD;oBACD,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC;iBACzD;qBAAM;oBACN,IAAI,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC;oBAChC,IAAI,IAAI,CAAC,YAAY,EAAE;wBACtB,IAAI,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;wBACrC,IAAI,CAAC,YAAY,EAAE;4BAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE;gCAChF,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gCACrB,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gCACzB,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gCAClB,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;gCACrB,SAAS,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;gCACnC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gCACzB,YAAY,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gCAC7D,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;gCACrB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;gCACzB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;gCACxB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAA;6BACvB;yBACD;6BAAM;4BACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE;gCAChF,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gCACrB,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gCACzB,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gCAClB,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;gCACrB,SAAS,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;gCACnC,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gCACjC,YAAY,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gCAC7D,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;gCACrB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;gCACzB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;gCACxB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAA;gCACvB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;gCAC1B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;gCAC1B,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;6BAC3B;yBACD;qBACD;yBAAM;wBACN,IAAI,CAAC,YAAY,EAAE;4BAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE;gCAChF,KAAK,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;gCACxB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;gCAC5B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;gCAC5B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;gCAC5B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gCACtB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;6BAC1B;yBACD;6BAAM;4BACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE;gCAChF,KAAK,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;gCACxB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;gCAC5B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;gCAC5B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;gCAC5B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gCACtB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gCAC1B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;6BAC3B;yBACD;qBACD;oBACD,IAAI,IAAI,GAAI,UAAU,CAAC,QAAyB,CAAC,QAAQ,CAAC,CAAC,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;oBACnF,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;iBACvC;aACD;YAED,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;SAC9B;QACD,OAAO,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;;AArQM,+BAAc,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC"}
|
|
202
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SkeletonRenderer.js","sourceRoot":"","sources":["../src/SkeletonRenderer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;+EA2B+E;AAE/E,OAAO,EAAmB,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,KAAK,EAAuB,gBAAgB,EAAsB,cAAc,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAGvM,OAAO,EAAgC,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAGhF,MAAM,UAAU;IACf,YAAoB,QAAyB,EAAS,WAAmB,EAAS,SAAiB;QAA/E,aAAQ,GAAR,QAAQ,CAAiB;QAAS,gBAAW,GAAX,WAAW,CAAQ;QAAS,cAAS,GAAT,SAAS,CAAQ;IAAI,CAAC;CACxG;AAAA,CAAC;AAEF,MAAM,OAAO,gBAAgB;IAgB5B,YAAa,OAAqC,EAAE,eAAwB,IAAI;QAbhF,uBAAkB,GAAG,KAAK,CAAC;QACnB,cAAS,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,eAAU,GAAG,IAAI,KAAK,EAAE,CAAC;QAEzB,eAAU,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,iBAAY,GAAG,KAAK,CAAC;QACrB,eAAU,GAAe,IAAI,UAAU,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAClD,YAAO,GAAqB,IAAI,gBAAgB,EAAE,CAAC;QACnD,SAAI,GAAG,IAAI,OAAO,EAAE,CAAC;QACrB,UAAK,GAAG,IAAI,OAAO,EAAE,CAAC;QACtB,UAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QACpB,UAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAG3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,YAAY;YACf,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,CAAE,OAAuB,EAAE,QAAkB,EAAE,iBAAyB,CAAC,CAAC,EAAE,eAAuB,CAAC,CAAC;QACxG,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,IAAI,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACjD,IAAI,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACrC,IAAI,SAAS,GAAqB,IAAI,CAAC;QAEvC,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;QACxB,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;QAC3B,IAAI,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAE1B,IAAI,UAAU,GAAe,IAAI,CAAC,UAAU,CAAC;QAC7C,IAAI,GAAoB,CAAC;QACzB,IAAI,SAAwB,CAAC;QAC7B,IAAI,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;QACnC,IAAI,eAAsB,CAAC;QAC3B,IAAI,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC;QACnC,IAAI,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,cAAc,IAAI,CAAC,CAAC;YAAE,OAAO,GAAG,IAAI,CAAC;QACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YACjD,IAAI,iBAAiB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAC9D,IAAI,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBACtB,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC9B,SAAS;aACT;YAED,IAAI,cAAc,IAAI,CAAC,IAAI,cAAc,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBAC7D,OAAO,GAAG,IAAI,CAAC;aACf;YAED,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC9B,SAAS;aACT;YAED,IAAI,YAAY,IAAI,CAAC,IAAI,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBACzD,OAAO,GAAG,KAAK,CAAC;aAChB;YAED,IAAI,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YACtC,IAAI,OAAkB,CAAC;YACvB,IAAI,UAAU,YAAY,gBAAgB,EAAE;gBAC3C,IAAI,MAAM,GAAqB,UAAU,CAAC;gBAC1C,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;gBACpC,UAAU,CAAC,WAAW,GAAG,CAAC,CAAC;gBAC3B,UAAU,CAAC,SAAS,GAAG,iBAAiB,IAAI,CAAC,CAAC;gBAC9C,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAAC;gBAC7E,SAAS,GAAG,gBAAgB,CAAC,cAAc,CAAC;gBAC5C,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;gBACjB,OAAO,GAAmC,MAAM,CAAC,MAAO,CAAC,YAAa,CAAC,IAAI,CAAC,OAAO,CAAC;gBACpF,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC;aAC/B;iBAAM,IAAI,UAAU,YAAY,cAAc,EAAE;gBAChD,IAAI,IAAI,GAAmB,UAAU,CAAC;gBACtC,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;gBACpC,UAAU,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,mBAAmB,IAAI,CAAC,CAAC,CAAC;gBACzD,UAAU,CAAC,SAAS,GAAG,UAAU,CAAC,WAAW,GAAG,iBAAiB,CAAC;gBAClE,IAAI,UAAU,CAAC,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE;oBACtD,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;iBAChF;gBACD,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,EAAE,iBAAiB,CAAC,CAAC;gBACxG,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC3B,OAAO,GAAmC,IAAI,CAAC,MAAO,CAAC,YAAa,CAAC,IAAI,CAAC,OAAO,CAAC;gBAClF,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;gBACf,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC;aAC7B;iBAAM,IAAI,UAAU,YAAY,kBAAkB,EAAE;gBACpD,IAAI,IAAI,GAAuB,CAAC,UAAU,CAAC,CAAC;gBAC5C,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC9B,SAAS;aACT;iBAAM;gBACN,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC9B,SAAS;aACT;YAED,IAAI,OAAO,EAAE;gBACZ,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC3B,IAAI,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;gBAChC,UAAU,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;gBACjE,UAAU,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;gBACjE,UAAU,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;gBACjE,UAAU,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;gBACjE,IAAI,kBAAkB,EAAE;oBACvB,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC;oBAC7B,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC;oBAC7B,UAAU,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC;iBAC7B;gBACD,IAAI,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;gBAChC,IAAI,CAAC,IAAI,CAAC,SAAS;oBAClB,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;qBACxB;oBACJ,IAAI,kBAAkB,EAAE;wBACvB,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;wBAC9C,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;wBAC9C,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;qBAC9C;yBAAM;wBACN,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;qBACvC;oBACD,SAAS,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;iBAC7C;gBAED,IAAI,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;gBACxC,IAAI,aAAa,IAAI,SAAS,EAAE;oBAC/B,SAAS,GAAG,aAAa,CAAC;oBAC1B,OAAO,CAAC,YAAY,CACnB,uBAAuB,CAAC,yBAAyB,CAAC,SAAS,EAAE,kBAAkB,CAAC,EAChF,uBAAuB,CAAC,yBAAyB,CAAC,SAAS,CAAC,EAC5D,uBAAuB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;iBACxD;gBAED,IAAI,OAAO,CAAC,UAAU,EAAE,EAAE;oBACzB,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;oBACxI,IAAI,eAAe,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;oBAChE,IAAI,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;oBAChD,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC;iBACzD;qBAAM;oBACN,IAAI,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC;oBAChC,IAAI,CAAC,YAAY,EAAE;wBAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE;4BAChF,KAAK,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;4BACxB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;4BAC5B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;4BAC5B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;4BAC5B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;4BACtB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;yBAC1B;qBACD;yBAAM;wBACN,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE;4BAChF,KAAK,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;4BACxB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;4BAC5B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;4BAC5B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;4BAC5B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;4BACtB,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;4BAC1B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;4BAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;4BAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;4BAC3B,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;yBAC3B;qBACD;oBACD,IAAI,IAAI,GAAI,UAAU,CAAC,QAAyB,CAAC,QAAQ,CAAC,CAAC,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;oBACnF,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;iBACvC;aACD;YAED,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;SAC9B;QACD,OAAO,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;;AA1KM,+BAAc,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC"}
|
package/dist/iife/spine-webgl.js
CHANGED
|
@@ -56,7 +56,6 @@ var spine = (() => {
|
|
|
56
56
|
Input: () => Input,
|
|
57
57
|
IntSet: () => IntSet,
|
|
58
58
|
Interpolation: () => Interpolation,
|
|
59
|
-
JitterEffect: () => JitterEffect,
|
|
60
59
|
LoadingScreen: () => LoadingScreen,
|
|
61
60
|
M00: () => M00,
|
|
62
61
|
M01: () => M01,
|
|
@@ -132,7 +131,6 @@ var spine = (() => {
|
|
|
132
131
|
SpacingMode: () => SpacingMode,
|
|
133
132
|
SpineCanvas: () => SpineCanvas,
|
|
134
133
|
StringSet: () => StringSet,
|
|
135
|
-
SwirlEffect: () => SwirlEffect,
|
|
136
134
|
TexCoordAttribute: () => TexCoordAttribute,
|
|
137
135
|
Texture: () => Texture,
|
|
138
136
|
TextureAtlas: () => TextureAtlas,
|
|
@@ -557,7 +555,7 @@ var spine = (() => {
|
|
|
557
555
|
this.bones = null;
|
|
558
556
|
this.vertices = [];
|
|
559
557
|
this.worldVerticesLength = 0;
|
|
560
|
-
this.
|
|
558
|
+
this.timelineAttachment = this;
|
|
561
559
|
}
|
|
562
560
|
computeWorldVertices(slot, start, count, worldVertices, offset, stride) {
|
|
563
561
|
count = offset + (count >> 1) * stride;
|
|
@@ -628,7 +626,7 @@ var spine = (() => {
|
|
|
628
626
|
Utils.arrayCopy(this.vertices, 0, attachment.vertices, 0, this.vertices.length);
|
|
629
627
|
}
|
|
630
628
|
attachment.worldVerticesLength = this.worldVerticesLength;
|
|
631
|
-
attachment.
|
|
629
|
+
attachment.timelineAttachment = this.timelineAttachment;
|
|
632
630
|
}
|
|
633
631
|
};
|
|
634
632
|
var VertexAttachment = _VertexAttachment;
|
|
@@ -1927,7 +1925,7 @@ var spine = (() => {
|
|
|
1927
1925
|
let slotAttachment = slot.getAttachment();
|
|
1928
1926
|
if (!slotAttachment)
|
|
1929
1927
|
return;
|
|
1930
|
-
if (!(slotAttachment instanceof VertexAttachment) || slotAttachment.
|
|
1928
|
+
if (!(slotAttachment instanceof VertexAttachment) || slotAttachment.timelineAttachment != this.attachment)
|
|
1931
1929
|
return;
|
|
1932
1930
|
let deform = slot.deform;
|
|
1933
1931
|
if (deform.length == 0)
|
|
@@ -2506,7 +2504,7 @@ var spine = (() => {
|
|
|
2506
2504
|
let slotAttachment = slot.attachment;
|
|
2507
2505
|
let attachment = this.attachment;
|
|
2508
2506
|
if (slotAttachment != attachment) {
|
|
2509
|
-
if (!(slotAttachment instanceof VertexAttachment) || slotAttachment.
|
|
2507
|
+
if (!(slotAttachment instanceof VertexAttachment) || slotAttachment.timelineAttachment != attachment)
|
|
2510
2508
|
return;
|
|
2511
2509
|
}
|
|
2512
2510
|
let frames = this.frames;
|
|
@@ -2519,6 +2517,8 @@ var spine = (() => {
|
|
|
2519
2517
|
let before = frames[i];
|
|
2520
2518
|
let modeAndIndex = frames[i + _SequenceTimeline.MODE];
|
|
2521
2519
|
let delay = frames[i + _SequenceTimeline.DELAY];
|
|
2520
|
+
if (!this.attachment.sequence)
|
|
2521
|
+
return;
|
|
2522
2522
|
let index = modeAndIndex >> 4, count = this.attachment.sequence.regions.length;
|
|
2523
2523
|
let mode = SequenceModeValues[modeAndIndex & 15];
|
|
2524
2524
|
if (mode != SequenceMode.hold) {
|
|
@@ -2532,7 +2532,7 @@ var spine = (() => {
|
|
|
2532
2532
|
break;
|
|
2533
2533
|
case SequenceMode.pingpong: {
|
|
2534
2534
|
let n = (count << 1) - 2;
|
|
2535
|
-
index
|
|
2535
|
+
index = n == 0 ? 0 : index % n;
|
|
2536
2536
|
if (index >= count)
|
|
2537
2537
|
index = n - index;
|
|
2538
2538
|
break;
|
|
@@ -2545,7 +2545,7 @@ var spine = (() => {
|
|
|
2545
2545
|
break;
|
|
2546
2546
|
case SequenceMode.pingpongReverse: {
|
|
2547
2547
|
let n = (count << 1) - 2;
|
|
2548
|
-
index = (index + count - 1) % n;
|
|
2548
|
+
index = n == 0 ? 0 : (index + count - 1) % n;
|
|
2549
2549
|
if (index >= count)
|
|
2550
2550
|
index = n - index;
|
|
2551
2551
|
}
|
|
@@ -3833,7 +3833,7 @@ var spine = (() => {
|
|
|
3833
3833
|
let copy = new MeshAttachment(this.name, this.path);
|
|
3834
3834
|
copy.region = this.region;
|
|
3835
3835
|
copy.color.setFromColor(this.color);
|
|
3836
|
-
copy.
|
|
3836
|
+
copy.timelineAttachment = this.timelineAttachment;
|
|
3837
3837
|
copy.setParentMesh(this.parentMesh ? this.parentMesh : this);
|
|
3838
3838
|
if (copy.region != null)
|
|
3839
3839
|
copy.updateRegion();
|
|
@@ -5481,7 +5481,7 @@ var spine = (() => {
|
|
|
5481
5481
|
setAttachment(attachment) {
|
|
5482
5482
|
if (this.attachment == attachment)
|
|
5483
5483
|
return;
|
|
5484
|
-
if (!(attachment instanceof VertexAttachment) || !(this.attachment instanceof VertexAttachment) || attachment.
|
|
5484
|
+
if (!(attachment instanceof VertexAttachment) || !(this.attachment instanceof VertexAttachment) || attachment.timelineAttachment != this.attachment.timelineAttachment) {
|
|
5485
5485
|
this.deform.length = 0;
|
|
5486
5486
|
}
|
|
5487
5487
|
this.attachment = attachment;
|
|
@@ -6687,7 +6687,7 @@ var spine = (() => {
|
|
|
6687
6687
|
let parent = skin.getAttachment(linkedMesh.slotIndex, linkedMesh.parent);
|
|
6688
6688
|
if (!parent)
|
|
6689
6689
|
throw new Error(`Parent mesh not found: ${linkedMesh.parent}`);
|
|
6690
|
-
linkedMesh.mesh.
|
|
6690
|
+
linkedMesh.mesh.timelineAttachment = linkedMesh.inheritTimeline ? parent : linkedMesh.mesh;
|
|
6691
6691
|
linkedMesh.mesh.setParentMesh(parent);
|
|
6692
6692
|
if (linkedMesh.mesh.region != null)
|
|
6693
6693
|
linkedMesh.mesh.updateRegion();
|
|
@@ -8494,7 +8494,7 @@ var spine = (() => {
|
|
|
8494
8494
|
let parent = skin.getAttachment(linkedMesh.slotIndex, linkedMesh.parent);
|
|
8495
8495
|
if (!parent)
|
|
8496
8496
|
throw new Error(`Parent mesh not found: ${linkedMesh.parent}`);
|
|
8497
|
-
linkedMesh.mesh.
|
|
8497
|
+
linkedMesh.mesh.timelineAttachment = linkedMesh.inheritTimeline ? parent : linkedMesh.mesh;
|
|
8498
8498
|
linkedMesh.mesh.setParentMesh(parent);
|
|
8499
8499
|
if (linkedMesh.mesh.region != null)
|
|
8500
8500
|
linkedMesh.mesh.updateRegion();
|
|
@@ -9221,58 +9221,6 @@ var spine = (() => {
|
|
|
9221
9221
|
}
|
|
9222
9222
|
})();
|
|
9223
9223
|
|
|
9224
|
-
// spine-core/src/vertexeffects/JitterEffect.ts
|
|
9225
|
-
var JitterEffect = class {
|
|
9226
|
-
constructor(jitterX, jitterY) {
|
|
9227
|
-
this.jitterX = 0;
|
|
9228
|
-
this.jitterY = 0;
|
|
9229
|
-
this.jitterX = jitterX;
|
|
9230
|
-
this.jitterY = jitterY;
|
|
9231
|
-
}
|
|
9232
|
-
begin(skeleton) {
|
|
9233
|
-
}
|
|
9234
|
-
transform(position, uv, light, dark) {
|
|
9235
|
-
position.x += MathUtils.randomTriangular(-this.jitterX, this.jitterY);
|
|
9236
|
-
position.y += MathUtils.randomTriangular(-this.jitterX, this.jitterY);
|
|
9237
|
-
}
|
|
9238
|
-
end() {
|
|
9239
|
-
}
|
|
9240
|
-
};
|
|
9241
|
-
|
|
9242
|
-
// spine-core/src/vertexeffects/SwirlEffect.ts
|
|
9243
|
-
var _SwirlEffect = class {
|
|
9244
|
-
constructor(radius) {
|
|
9245
|
-
this.centerX = 0;
|
|
9246
|
-
this.centerY = 0;
|
|
9247
|
-
this.radius = 0;
|
|
9248
|
-
this.angle = 0;
|
|
9249
|
-
this.worldX = 0;
|
|
9250
|
-
this.worldY = 0;
|
|
9251
|
-
this.radius = radius;
|
|
9252
|
-
}
|
|
9253
|
-
begin(skeleton) {
|
|
9254
|
-
this.worldX = skeleton.x + this.centerX;
|
|
9255
|
-
this.worldY = skeleton.y + this.centerY;
|
|
9256
|
-
}
|
|
9257
|
-
transform(position, uv, light, dark) {
|
|
9258
|
-
let radAngle = this.angle * MathUtils.degreesToRadians;
|
|
9259
|
-
let x = position.x - this.worldX;
|
|
9260
|
-
let y = position.y - this.worldY;
|
|
9261
|
-
let dist = Math.sqrt(x * x + y * y);
|
|
9262
|
-
if (dist < this.radius) {
|
|
9263
|
-
let theta = _SwirlEffect.interpolation.apply(0, radAngle, (this.radius - dist) / this.radius);
|
|
9264
|
-
let cos = Math.cos(theta);
|
|
9265
|
-
let sin = Math.sin(theta);
|
|
9266
|
-
position.x = cos * x - sin * y + this.worldX;
|
|
9267
|
-
position.y = sin * x + cos * y + this.worldY;
|
|
9268
|
-
}
|
|
9269
|
-
}
|
|
9270
|
-
end() {
|
|
9271
|
-
}
|
|
9272
|
-
};
|
|
9273
|
-
var SwirlEffect = _SwirlEffect;
|
|
9274
|
-
SwirlEffect.interpolation = new PowOut(2);
|
|
9275
|
-
|
|
9276
9224
|
// spine-webgl/src/WebGL.ts
|
|
9277
9225
|
var ManagedWebGLRenderingContext = class {
|
|
9278
9226
|
constructor(canvasOrContext, contextConfig = { alpha: "true" }) {
|
|
@@ -11131,7 +11079,6 @@ var spine = (() => {
|
|
|
11131
11079
|
var _SkeletonRenderer = class {
|
|
11132
11080
|
constructor(context, twoColorTint = true) {
|
|
11133
11081
|
this.premultipliedAlpha = false;
|
|
11134
|
-
this.vertexEffect = null;
|
|
11135
11082
|
this.tempColor = new Color();
|
|
11136
11083
|
this.tempColor2 = new Color();
|
|
11137
11084
|
this.vertexSize = 2 + 2 + 4;
|
|
@@ -11250,120 +11197,30 @@ var spine = (() => {
|
|
|
11250
11197
|
clipper.clipTriangles(renderable.vertices, renderable.numFloats, triangles, triangles.length, uvs, finalColor, darkColor, twoColorTint);
|
|
11251
11198
|
let clippedVertices = new Float32Array(clipper.clippedVertices);
|
|
11252
11199
|
let clippedTriangles = clipper.clippedTriangles;
|
|
11253
|
-
if (this.vertexEffect) {
|
|
11254
|
-
let vertexEffect = this.vertexEffect;
|
|
11255
|
-
let verts = clippedVertices;
|
|
11256
|
-
if (!twoColorTint) {
|
|
11257
|
-
for (let v = 0, n2 = clippedVertices.length; v < n2; v += vertexSize) {
|
|
11258
|
-
tempPos.x = verts[v];
|
|
11259
|
-
tempPos.y = verts[v + 1];
|
|
11260
|
-
tempLight.set(verts[v + 2], verts[v + 3], verts[v + 4], verts[v + 5]);
|
|
11261
|
-
tempUv.x = verts[v + 6];
|
|
11262
|
-
tempUv.y = verts[v + 7];
|
|
11263
|
-
tempDark.set(0, 0, 0, 0);
|
|
11264
|
-
vertexEffect.transform(tempPos, tempUv, tempLight, tempDark);
|
|
11265
|
-
verts[v] = tempPos.x;
|
|
11266
|
-
verts[v + 1] = tempPos.y;
|
|
11267
|
-
verts[v + 2] = tempLight.r;
|
|
11268
|
-
verts[v + 3] = tempLight.g;
|
|
11269
|
-
verts[v + 4] = tempLight.b;
|
|
11270
|
-
verts[v + 5] = tempLight.a;
|
|
11271
|
-
verts[v + 6] = tempUv.x;
|
|
11272
|
-
verts[v + 7] = tempUv.y;
|
|
11273
|
-
}
|
|
11274
|
-
} else {
|
|
11275
|
-
for (let v = 0, n2 = clippedVertices.length; v < n2; v += vertexSize) {
|
|
11276
|
-
tempPos.x = verts[v];
|
|
11277
|
-
tempPos.y = verts[v + 1];
|
|
11278
|
-
tempLight.set(verts[v + 2], verts[v + 3], verts[v + 4], verts[v + 5]);
|
|
11279
|
-
tempUv.x = verts[v + 6];
|
|
11280
|
-
tempUv.y = verts[v + 7];
|
|
11281
|
-
tempDark.set(verts[v + 8], verts[v + 9], verts[v + 10], verts[v + 11]);
|
|
11282
|
-
vertexEffect.transform(tempPos, tempUv, tempLight, tempDark);
|
|
11283
|
-
verts[v] = tempPos.x;
|
|
11284
|
-
verts[v + 1] = tempPos.y;
|
|
11285
|
-
verts[v + 2] = tempLight.r;
|
|
11286
|
-
verts[v + 3] = tempLight.g;
|
|
11287
|
-
verts[v + 4] = tempLight.b;
|
|
11288
|
-
verts[v + 5] = tempLight.a;
|
|
11289
|
-
verts[v + 6] = tempUv.x;
|
|
11290
|
-
verts[v + 7] = tempUv.y;
|
|
11291
|
-
verts[v + 8] = tempDark.r;
|
|
11292
|
-
verts[v + 9] = tempDark.g;
|
|
11293
|
-
verts[v + 10] = tempDark.b;
|
|
11294
|
-
verts[v + 11] = tempDark.a;
|
|
11295
|
-
}
|
|
11296
|
-
}
|
|
11297
|
-
}
|
|
11298
11200
|
batcher.draw(texture, clippedVertices, clippedTriangles);
|
|
11299
11201
|
} else {
|
|
11300
11202
|
let verts = renderable.vertices;
|
|
11301
|
-
if (
|
|
11302
|
-
let
|
|
11303
|
-
|
|
11304
|
-
|
|
11305
|
-
|
|
11306
|
-
|
|
11307
|
-
|
|
11308
|
-
|
|
11309
|
-
tempLight.setFromColor(finalColor);
|
|
11310
|
-
tempDark.set(0, 0, 0, 0);
|
|
11311
|
-
vertexEffect.transform(tempPos, tempUv, tempLight, tempDark);
|
|
11312
|
-
verts[v] = tempPos.x;
|
|
11313
|
-
verts[v + 1] = tempPos.y;
|
|
11314
|
-
verts[v + 2] = tempLight.r;
|
|
11315
|
-
verts[v + 3] = tempLight.g;
|
|
11316
|
-
verts[v + 4] = tempLight.b;
|
|
11317
|
-
verts[v + 5] = tempLight.a;
|
|
11318
|
-
verts[v + 6] = tempUv.x;
|
|
11319
|
-
verts[v + 7] = tempUv.y;
|
|
11320
|
-
}
|
|
11321
|
-
} else {
|
|
11322
|
-
for (let v = 0, u = 0, n2 = renderable.numFloats; v < n2; v += vertexSize, u += 2) {
|
|
11323
|
-
tempPos.x = verts[v];
|
|
11324
|
-
tempPos.y = verts[v + 1];
|
|
11325
|
-
tempUv.x = uvs[u];
|
|
11326
|
-
tempUv.y = uvs[u + 1];
|
|
11327
|
-
tempLight.setFromColor(finalColor);
|
|
11328
|
-
tempDark.setFromColor(darkColor);
|
|
11329
|
-
vertexEffect.transform(tempPos, tempUv, tempLight, tempDark);
|
|
11330
|
-
verts[v] = tempPos.x;
|
|
11331
|
-
verts[v + 1] = tempPos.y;
|
|
11332
|
-
verts[v + 2] = tempLight.r;
|
|
11333
|
-
verts[v + 3] = tempLight.g;
|
|
11334
|
-
verts[v + 4] = tempLight.b;
|
|
11335
|
-
verts[v + 5] = tempLight.a;
|
|
11336
|
-
verts[v + 6] = tempUv.x;
|
|
11337
|
-
verts[v + 7] = tempUv.y;
|
|
11338
|
-
verts[v + 8] = tempDark.r;
|
|
11339
|
-
verts[v + 9] = tempDark.g;
|
|
11340
|
-
verts[v + 10] = tempDark.b;
|
|
11341
|
-
verts[v + 11] = tempDark.a;
|
|
11342
|
-
}
|
|
11203
|
+
if (!twoColorTint) {
|
|
11204
|
+
for (let v = 2, u = 0, n2 = renderable.numFloats; v < n2; v += vertexSize, u += 2) {
|
|
11205
|
+
verts[v] = finalColor.r;
|
|
11206
|
+
verts[v + 1] = finalColor.g;
|
|
11207
|
+
verts[v + 2] = finalColor.b;
|
|
11208
|
+
verts[v + 3] = finalColor.a;
|
|
11209
|
+
verts[v + 4] = uvs[u];
|
|
11210
|
+
verts[v + 5] = uvs[u + 1];
|
|
11343
11211
|
}
|
|
11344
11212
|
} else {
|
|
11345
|
-
|
|
11346
|
-
|
|
11347
|
-
|
|
11348
|
-
|
|
11349
|
-
|
|
11350
|
-
|
|
11351
|
-
|
|
11352
|
-
|
|
11353
|
-
|
|
11354
|
-
|
|
11355
|
-
|
|
11356
|
-
verts[v] = finalColor.r;
|
|
11357
|
-
verts[v + 1] = finalColor.g;
|
|
11358
|
-
verts[v + 2] = finalColor.b;
|
|
11359
|
-
verts[v + 3] = finalColor.a;
|
|
11360
|
-
verts[v + 4] = uvs[u];
|
|
11361
|
-
verts[v + 5] = uvs[u + 1];
|
|
11362
|
-
verts[v + 6] = darkColor.r;
|
|
11363
|
-
verts[v + 7] = darkColor.g;
|
|
11364
|
-
verts[v + 8] = darkColor.b;
|
|
11365
|
-
verts[v + 9] = darkColor.a;
|
|
11366
|
-
}
|
|
11213
|
+
for (let v = 2, u = 0, n2 = renderable.numFloats; v < n2; v += vertexSize, u += 2) {
|
|
11214
|
+
verts[v] = finalColor.r;
|
|
11215
|
+
verts[v + 1] = finalColor.g;
|
|
11216
|
+
verts[v + 2] = finalColor.b;
|
|
11217
|
+
verts[v + 3] = finalColor.a;
|
|
11218
|
+
verts[v + 4] = uvs[u];
|
|
11219
|
+
verts[v + 5] = uvs[u + 1];
|
|
11220
|
+
verts[v + 6] = darkColor.r;
|
|
11221
|
+
verts[v + 7] = darkColor.g;
|
|
11222
|
+
verts[v + 8] = darkColor.b;
|
|
11223
|
+
verts[v + 9] = darkColor.a;
|
|
11367
11224
|
}
|
|
11368
11225
|
}
|
|
11369
11226
|
let view = renderable.vertices.subarray(0, renderable.numFloats);
|