@safe-engine/cocos 1.9.6 → 1.10.2

package/dist/spine/CCSkeletonWebGLRenderCmd.js

@@ -22,260 +22,256 @@ import * as spine from '@esotericsoftware/spine-core';
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
  ****************************************************************************/
-var gworld = gworld || {};
-(function () {
-    gworld.WebGLRenderCmd = function (renderableObject) {
-        this._rootCtor(renderableObject);
-        this._needDraw = true;
-        this._matrix = new cc.math.Matrix4();
-        this._matrix.identity();
-        this._currTexture = null;
-        this._currBlendFunc = {};
-        this.vertexType = cc.renderer.VertexType.CUSTOM;
-        this.setShaderProgram(cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLOR));
-    };
-    const proto = (gworld.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype));
-    proto.constructor = gworld.WebGLRenderCmd;
-    proto.uploadData = function (f32buffer, ui32buffer, vertexDataOffset) {
-        const node = this._node;
-        const color = this._displayedColor, locSkeleton = node._skeleton;
-        let attachment, slot, i, n;
-        const premultiAlpha = node._premultipliedAlpha;
-        locSkeleton.r = color.r / 255;
-        locSkeleton.g = color.g / 255;
-        locSkeleton.b = color.b / 255;
-        locSkeleton.a = this._displayedOpacity / 255;
-        if (premultiAlpha) {
-            locSkeleton.r *= locSkeleton.a;
-            locSkeleton.g *= locSkeleton.a;
-            locSkeleton.b *= locSkeleton.a;
+export const WebGLRenderCmd = function (renderableObject) {
+    this._rootCtor(renderableObject);
+    this._needDraw = true;
+    this._matrix = new cc.math.Matrix4();
+    this._matrix.identity();
+    this._currTexture = null;
+    this._currBlendFunc = {};
+    this.vertexType = cc.renderer.VertexType.CUSTOM;
+    this.setShaderProgram(cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLOR));
+};
+const proto = (WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype));
+proto.constructor = WebGLRenderCmd;
+proto.uploadData = function (f32buffer, ui32buffer, vertexDataOffset) {
+    const node = this._node;
+    const color = this._displayedColor, locSkeleton = node._skeleton;
+    let attachment, slot, i, n;
+    const premultiAlpha = node._premultipliedAlpha;
+    locSkeleton.r = color.r / 255;
+    locSkeleton.g = color.g / 255;
+    locSkeleton.b = color.b / 255;
+    locSkeleton.a = this._displayedOpacity / 255;
+    if (premultiAlpha) {
+        locSkeleton.r *= locSkeleton.a;
+        locSkeleton.g *= locSkeleton.a;
+        locSkeleton.b *= locSkeleton.a;
+    }
+    let debugSlotsInfo = null;
+    if (this._node._debugSlots) {
+        debugSlotsInfo = [];
+    }
+    for (i = 0, n = locSkeleton.drawOrder.length; i < n; i++) {
+        slot = locSkeleton.drawOrder[i];
+        if (!slot.attachment)
+            continue;
+        attachment = slot.attachment;
+        // get the vertices length
+        let vertCount = 0;
+        if (attachment instanceof spine.RegionAttachment) {
+            vertCount = 6; // a quad = two triangles = six vertices
         }
-        let debugSlotsInfo = null;
-        if (this._node._debugSlots) {
-            debugSlotsInfo = [];
+        else if (attachment instanceof spine.MeshAttachment) {
+            vertCount = attachment.regionUVs.length / 2;
         }
-        for (i = 0, n = locSkeleton.drawOrder.length; i < n; i++) {
-            slot = locSkeleton.drawOrder[i];
-            if (!slot.attachment)
-                continue;
-            attachment = slot.attachment;
-            // get the vertices length
-            let vertCount = 0;
-            if (attachment instanceof spine.RegionAttachment) {
-                vertCount = 6; // a quad = two triangles = six vertices
-            }
-            else if (attachment instanceof spine.MeshAttachment) {
-                vertCount = attachment.regionUVs.length / 2;
-            }
-            else {
-                continue;
-            }
-            // no vertices to render
-            if (vertCount === 0) {
-                continue;
-            }
-            const regionTextureAtlas = node.getTextureAtlas(attachment);
-            // Broken for changing batch info
-            var batchBroken;
-            if (regionTextureAtlas.texture) {
-                this._currTexture = regionTextureAtlas.texture.getRealTexture();
-                batchBroken = cc.renderer._updateBatchedInfo(this._currTexture, this._getBlendFunc(slot.data.blendMode, premultiAlpha), this._glProgramState);
-            }
-            // keep the same logic with RendererWebGL.js, avoid vertex data overflow
-            const uploadAll = vertexDataOffset / 6 + vertCount > (cc.BATCH_VERTEX_COUNT - 200) * 0.5;
-            // Broken for vertex data overflow
-            if (!batchBroken && uploadAll) {
-                // render the cached data
-                cc.renderer._batchRendering();
-                batchBroken = true;
-            }
-            if (batchBroken) {
-                vertexDataOffset = 0;
-            }
-            // update the vertex buffer
-            let slotDebugPoints = null;
-            if (attachment instanceof spine.RegionAttachment) {
-                slotDebugPoints = this._uploadRegionAttachmentData(attachment, slot, premultiAlpha, f32buffer, ui32buffer, vertexDataOffset);
-            }
-            else if (attachment instanceof spine.MeshAttachment) {
-                this._uploadMeshAttachmentData(attachment, slot, premultiAlpha, f32buffer, ui32buffer, vertexDataOffset);
-            }
-            else {
-                continue;
-            }
-            if (this._node._debugSlots) {
-                debugSlotsInfo[i] = slotDebugPoints;
-            }
-            // update the index buffer
-            if (attachment instanceof spine.RegionAttachment) {
-                cc.renderer._increaseBatchingSize(vertCount, cc.renderer.VertexType.TRIANGLE);
-            }
-            else {
-                cc.renderer._increaseBatchingSize(vertCount, cc.renderer.VertexType.CUSTOM, attachment.triangles);
-            }
-            // update the index data
-            vertexDataOffset += vertCount * 6;
+        else {
+            continue;
+        }
+        // no vertices to render
+        if (vertCount === 0) {
+            continue;
+        }
+        const regionTextureAtlas = node.getTextureAtlas(attachment);
+        // Broken for changing batch info
+        let batchBroken;
+        if (regionTextureAtlas.texture) {
+            this._currTexture = regionTextureAtlas.texture.getRealTexture();
+            batchBroken = cc.renderer._updateBatchedInfo(this._currTexture, this._getBlendFunc(slot.data.blendMode, premultiAlpha), this._glProgramState);
         }
-        if (node._debugBones || node._debugSlots) {
-            // flush previous vertices
+        // keep the same logic with RendererWebGL.js, avoid vertex data overflow
+        const uploadAll = vertexDataOffset / 6 + vertCount > (cc.BATCH_VERTEX_COUNT - 200) * 0.5;
+        // Broken for vertex data overflow
+        if (!batchBroken && uploadAll) {
+            // render the cached data
             cc.renderer._batchRendering();
-            const wt = this._worldTransform, mat = this._matrix.mat;
-            mat[0] = wt.a;
-            mat[4] = wt.c;
-            mat[12] = wt.tx;
-            mat[1] = wt.b;
-            mat[5] = wt.d;
-            mat[13] = wt.ty;
-            cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW);
-            cc.current_stack.stack.push(cc.current_stack.top);
-            cc.current_stack.top = this._matrix;
-            const drawingUtil = cc._drawingUtil;
-            if (node._debugSlots && debugSlotsInfo && debugSlotsInfo.length > 0) {
-                // Slots.
-                drawingUtil.setDrawColor(0, 0, 255, 255);
-                drawingUtil.setLineWidth(1);
-                for (i = 0, n = locSkeleton.slots.length; i < n; i++) {
-                    const points = debugSlotsInfo[i];
-                    if (points) {
-                        drawingUtil.drawPoly(points, 4, true);
-                    }
-                }
-            }
-            if (node._debugBones) {
-                // Bone lengths.
-                let bone;
-                drawingUtil.setLineWidth(2);
-                drawingUtil.setDrawColor(255, 0, 0, 255);
-                for (i = 0, n = locSkeleton.bones.length; i < n; i++) {
-                    bone = locSkeleton.bones[i];
-                    const x = bone.data.length * bone.a + bone.worldX;
-                    const y = bone.data.length * bone.c + bone.worldY;
-                    drawingUtil.drawLine(cc.p(bone.worldX, bone.worldY), cc.p(x, y));
-                }
-                // Bone origins.
-                drawingUtil.setPointSize(4);
-                drawingUtil.setDrawColor(0, 0, 255, 255); // Root bone is blue.
-                for (i = 0, n = locSkeleton.bones.length; i < n; i++) {
-                    bone = locSkeleton.bones[i];
-                    drawingUtil.drawPoint(cc.p(bone.worldX, bone.worldY));
-                    if (i == 0) {
-                        drawingUtil.setDrawColor(0, 255, 0, 255);
-                    }
-                }
-            }
-            cc.kmGLPopMatrix();
+            batchBroken = true;
+        }
+        if (batchBroken) {
+            vertexDataOffset = 0;
         }
-        return 0;
-    };
-    proto._getBlendFunc = function (blendMode, premultiAlpha) {
-        let ret = this._currBlendFunc;
-        switch (blendMode) {
-            case spine.BlendMode.Normal:
-                ret.src = premultiAlpha ? cc.ONE : cc.SRC_ALPHA;
-                ret.dst = cc.ONE_MINUS_SRC_ALPHA;
-                break;
-            case spine.BlendMode.Additive:
-                ret.src = premultiAlpha ? cc.ONE : cc.SRC_ALPHA;
-                ret.dst = cc.ONE;
-                break;
-            case spine.BlendMode.Multiply:
-                ret.src = cc.DST_COLOR;
-                ret.dst = cc.ONE_MINUS_SRC_ALPHA;
-                break;
-            case spine.BlendMode.Screen:
-                ret.src = cc.ONE;
-                ret.dst = cc.ONE_MINUS_SRC_COLOR;
-                break;
-            default:
-                ret = this._node._blendFunc;
-                break;
+        // update the vertex buffer
+        let slotDebugPoints = null;
+        if (attachment instanceof spine.RegionAttachment) {
+            slotDebugPoints = this._uploadRegionAttachmentData(attachment, slot, premultiAlpha, f32buffer, ui32buffer, vertexDataOffset);
         }
-        return ret;
-    };
-    proto._createChildFormSkeletonData = function () { };
-    proto._updateChild = function () { };
-    proto._uploadRegionAttachmentData = function (attachment, slot, premultipliedAlpha, f32buffer, ui32buffer, vertexDataOffset) {
-        // the vertices in format:
-        // [
-        //   X1, Y1, C1R, C1G, C1B, C1A, U1, V1,    // bottom left
-        //   X2, Y2, C2R, C2G, C2B, C2A, U2, V2,    // top left
-        //   X3, Y3, C3R, C3G, C3B, C3A, U3, V3,    // top right
-        //   X4, Y4, C4R, C4G, C4B, C4A, U4, V4     // bottom right
-        // ]
-        //
-        const nodeColor = this._displayedColor;
-        const nodeR = nodeColor.r, nodeG = nodeColor.g, nodeB = nodeColor.b, nodeA = this._displayedOpacity;
-        const vertices = spine.Utils.setArraySize([], 8, 0);
-        attachment.computeWorldVertices(slot, vertices, 0, 2);
-        const uvs = attachment.uvs;
-        // get the colors data
-        const skeleton = slot.bone.skeleton;
-        const skeletonColor = skeleton.color;
-        const slotColor = slot.color;
-        const regionColor = attachment.color;
-        const alpha = skeletonColor.a * slotColor.a * regionColor.a;
-        const multiplier = premultipliedAlpha ? alpha : 1;
-        const colors = attachment.tempColor;
-        colors.set(skeletonColor.r * slotColor.r * regionColor.r * multiplier, skeletonColor.g * slotColor.g * regionColor.g * multiplier, skeletonColor.b * slotColor.b * regionColor.b * multiplier, alpha);
-        const wt = this._worldTransform, wa = wt.a, wb = wt.b, wc = wt.c, wd = wt.d, wx = wt.tx, wy = wt.ty, z = this._node.vertexZ;
-        let offset = vertexDataOffset;
-        // generate 6 vertices data (two triangles) from the quad vertices
-        // using two angles : (0, 1, 2) & (0, 2, 3)
-        for (let i = 0; i < 6; i++) {
-            const srcIdx = i < 4 ? i % 3 : i - 2;
-            const vx = vertices[srcIdx * 2], vy = vertices[srcIdx * 2 + 1];
-            const x = vx * wa + vy * wc + wx, y = vx * wb + vy * wd + wy;
-            const r = colors.r * nodeR, g = colors.g * nodeG, b = colors.b * nodeB, a = colors.a * nodeA;
-            const color = (a << 24) | (b << 16) | (g << 8) | r;
-            f32buffer[offset] = x;
-            f32buffer[offset + 1] = y;
-            f32buffer[offset + 2] = z;
-            ui32buffer[offset + 3] = color;
-            f32buffer[offset + 4] = uvs[srcIdx * 2];
-            f32buffer[offset + 5] = uvs[srcIdx * 2 + 1];
-            offset += 6;
+        else if (attachment instanceof spine.MeshAttachment) {
+            this._uploadMeshAttachmentData(attachment, slot, premultiAlpha, f32buffer, ui32buffer, vertexDataOffset);
+        }
+        else {
+            continue;
         }
         if (this._node._debugSlots) {
-            // return the quad points info if debug slot enabled
-            const VERTEX = spine.RegionAttachment;
-            return [
-                cc.p(vertices[VERTEX.X1], vertices[VERTEX.Y1]),
-                cc.p(vertices[VERTEX.X2], vertices[VERTEX.Y2]),
-                cc.p(vertices[VERTEX.X3], vertices[VERTEX.Y3]),
-                cc.p(vertices[VERTEX.X4], vertices[VERTEX.Y4]),
-            ];
+            debugSlotsInfo[i] = slotDebugPoints;
+        }
+        // update the index buffer
+        if (attachment instanceof spine.RegionAttachment) {
+            cc.renderer._increaseBatchingSize(vertCount, cc.renderer.VertexType.TRIANGLE);
         }
-    };
-    proto._uploadMeshAttachmentData = function (attachment, slot, premultipliedAlpha, f32buffer, ui32buffer, vertexDataOffset) {
-        const wt = this._worldTransform, wa = wt.a, wb = wt.b, wc = wt.c, wd = wt.d, wx = wt.tx, wy = wt.ty, z = this._node.vertexZ;
-        // get the vertex data
-        const verticesLength = attachment.worldVerticesLength;
-        const vertices = spine.Utils.setArraySize([], verticesLength, 0);
-        attachment.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2);
-        const uvs = attachment.uvs;
-        // get the colors data
-        const skeleton = slot.bone.skeleton;
-        const skeletonColor = skeleton.color, slotColor = slot.color, meshColor = attachment.color;
-        const alpha = skeletonColor.a * slotColor.a * meshColor.a;
-        const multiplier = premultipliedAlpha ? alpha : 1;
-        const colors = attachment.tempColor;
-        colors.set(skeletonColor.r * slotColor.r * meshColor.r * multiplier, skeletonColor.g * slotColor.g * meshColor.g * multiplier, skeletonColor.b * slotColor.b * meshColor.b * multiplier, alpha);
-        let offset = vertexDataOffset;
-        const nodeColor = this._displayedColor;
-        const nodeR = nodeColor.r, nodeG = nodeColor.g, nodeB = nodeColor.b, nodeA = this._displayedOpacity;
-        for (let i = 0, n = vertices.length; i < n; i += 2) {
-            const vx = vertices[i], vy = vertices[i + 1];
-            const x = vx * wa + vy * wb + wx, y = vx * wc + vy * wd + wy;
-            const r = colors.r * nodeR, g = colors.g * nodeG, b = colors.b * nodeB, a = colors.a * nodeA;
-            const color = (a << 24) | (b << 16) | (g << 8) | r;
-            f32buffer[offset] = x;
-            f32buffer[offset + 1] = y;
-            f32buffer[offset + 2] = z;
-            ui32buffer[offset + 3] = color;
-            f32buffer[offset + 4] = uvs[i];
-            f32buffer[offset + 5] = uvs[i + 1];
-            offset += 6;
+        else {
+            cc.renderer._increaseBatchingSize(vertCount, cc.renderer.VertexType.CUSTOM, attachment.triangles);
+        }
+        // update the index data
+        vertexDataOffset += vertCount * 6;
+    }
+    if (node._debugBones || node._debugSlots) {
+        // flush previous vertices
+        cc.renderer._batchRendering();
+        const wt = this._worldTransform, mat = this._matrix.mat;
+        mat[0] = wt.a;
+        mat[4] = wt.c;
+        mat[12] = wt.tx;
+        mat[1] = wt.b;
+        mat[5] = wt.d;
+        mat[13] = wt.ty;
+        cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW);
+        cc.current_stack.stack.push(cc.current_stack.top);
+        cc.current_stack.top = this._matrix;
+        const drawingUtil = cc._drawingUtil;
+        if (node._debugSlots && debugSlotsInfo && debugSlotsInfo.length > 0) {
+            // Slots.
+            drawingUtil.setDrawColor(0, 0, 255, 255);
+            drawingUtil.setLineWidth(1);
+            for (i = 0, n = locSkeleton.slots.length; i < n; i++) {
+                const points = debugSlotsInfo[i];
+                if (points) {
+                    drawingUtil.drawPoly(points, 4, true);
+                }
+            }
+        }
+        if (node._debugBones) {
+            // Bone lengths.
+            let bone;
+            drawingUtil.setLineWidth(2);
+            drawingUtil.setDrawColor(255, 0, 0, 255);
+            for (i = 0, n = locSkeleton.bones.length; i < n; i++) {
+                bone = locSkeleton.bones[i];
+                const x = bone.data.length * bone.a + bone.worldX;
+                const y = bone.data.length * bone.c + bone.worldY;
+                drawingUtil.drawLine(cc.p(bone.worldX, bone.worldY), cc.p(x, y));
+            }
+            // Bone origins.
+            drawingUtil.setPointSize(4);
+            drawingUtil.setDrawColor(0, 0, 255, 255); // Root bone is blue.
+            for (i = 0, n = locSkeleton.bones.length; i < n; i++) {
+                bone = locSkeleton.bones[i];
+                drawingUtil.drawPoint(cc.p(bone.worldX, bone.worldY));
+                if (i == 0) {
+                    drawingUtil.setDrawColor(0, 255, 0, 255);
+                }
+            }
         }
-    };
-})();
-export const WebGLRenderCmd = gworld.WebGLRenderCmd;
+        cc.kmGLPopMatrix();
+    }
+    return 0;
+};
+proto._getBlendFunc = function (blendMode, premultiAlpha) {
+    let ret = this._currBlendFunc;
+    switch (blendMode) {
+        case spine.BlendMode.Normal:
+            ret.src = premultiAlpha ? cc.ONE : cc.SRC_ALPHA;
+            ret.dst = cc.ONE_MINUS_SRC_ALPHA;
+            break;
+        case spine.BlendMode.Additive:
+            ret.src = premultiAlpha ? cc.ONE : cc.SRC_ALPHA;
+            ret.dst = cc.ONE;
+            break;
+        case spine.BlendMode.Multiply:
+            ret.src = cc.DST_COLOR;
+            ret.dst = cc.ONE_MINUS_SRC_ALPHA;
+            break;
+        case spine.BlendMode.Screen:
+            ret.src = cc.ONE;
+            ret.dst = cc.ONE_MINUS_SRC_COLOR;
+            break;
+        default:
+            ret = this._node._blendFunc;
+            break;
+    }
+    return ret;
+};
+proto._createChildFormSkeletonData = function () { };
+proto._updateChild = function () { };
+proto._uploadRegionAttachmentData = function (attachment, slot, premultipliedAlpha, f32buffer, ui32buffer, vertexDataOffset) {
+    // the vertices in format:
+    // [
+    //   X1, Y1, C1R, C1G, C1B, C1A, U1, V1,    // bottom left
+    //   X2, Y2, C2R, C2G, C2B, C2A, U2, V2,    // top left
+    //   X3, Y3, C3R, C3G, C3B, C3A, U3, V3,    // top right
+    //   X4, Y4, C4R, C4G, C4B, C4A, U4, V4     // bottom right
+    // ]
+    //
+    const nodeColor = this._displayedColor;
+    const nodeR = nodeColor.r, nodeG = nodeColor.g, nodeB = nodeColor.b, nodeA = this._displayedOpacity;
+    const vertices = spine.Utils.setArraySize([], 8, 0);
+    attachment.computeWorldVertices(slot, vertices, 0, 2);
+    const uvs = attachment.uvs;
+    // get the colors data
+    const skeleton = slot.bone.skeleton;
+    const skeletonColor = skeleton.color;
+    const slotColor = slot.color;
+    const regionColor = attachment.color;
+    const alpha = skeletonColor.a * slotColor.a * regionColor.a;
+    const multiplier = premultipliedAlpha ? alpha : 1;
+    const colors = attachment.tempColor;
+    colors.set(skeletonColor.r * slotColor.r * regionColor.r * multiplier, skeletonColor.g * slotColor.g * regionColor.g * multiplier, skeletonColor.b * slotColor.b * regionColor.b * multiplier, alpha);
+    const wt = this._worldTransform, wa = wt.a, wb = wt.b, wc = wt.c, wd = wt.d, wx = wt.tx, wy = wt.ty, z = this._node.vertexZ;
+    let offset = vertexDataOffset;
+    // generate 6 vertices data (two triangles) from the quad vertices
+    // using two angles : (0, 1, 2) & (0, 2, 3)
+    for (let i = 0; i < 6; i++) {
+        const srcIdx = i < 4 ? i % 3 : i - 2;
+        const vx = vertices[srcIdx * 2], vy = vertices[srcIdx * 2 + 1];
+        const x = vx * wa + vy * wc + wx, y = vx * wb + vy * wd + wy;
+        const r = colors.r * nodeR, g = colors.g * nodeG, b = colors.b * nodeB, a = colors.a * nodeA;
+        const color = (a << 24) | (b << 16) | (g << 8) | r;
+        f32buffer[offset] = x;
+        f32buffer[offset + 1] = y;
+        f32buffer[offset + 2] = z;
+        ui32buffer[offset + 3] = color;
+        f32buffer[offset + 4] = uvs[srcIdx * 2];
+        f32buffer[offset + 5] = uvs[srcIdx * 2 + 1];
+        offset += 6;
+    }
+    if (this._node._debugSlots) {
+        // return the quad points info if debug slot enabled
+        const VERTEX = spine.RegionAttachment;
+        return [
+            cc.p(vertices[VERTEX.X1], vertices[VERTEX.Y1]),
+            cc.p(vertices[VERTEX.X2], vertices[VERTEX.Y2]),
+            cc.p(vertices[VERTEX.X3], vertices[VERTEX.Y3]),
+            cc.p(vertices[VERTEX.X4], vertices[VERTEX.Y4]),
+        ];
+    }
+};
+proto._uploadMeshAttachmentData = function (attachment, slot, premultipliedAlpha, f32buffer, ui32buffer, vertexDataOffset) {
+    const wt = this._worldTransform, wa = wt.a, wb = wt.b, wc = wt.c, wd = wt.d, wx = wt.tx, wy = wt.ty, z = this._node.vertexZ;
+    // get the vertex data
+    const verticesLength = attachment.worldVerticesLength;
+    const vertices = spine.Utils.setArraySize([], verticesLength, 0);
+    attachment.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2);
+    const uvs = attachment.uvs;
+    // get the colors data
+    const skeleton = slot.bone.skeleton;
+    const skeletonColor = skeleton.color, slotColor = slot.color, meshColor = attachment.color;
+    const alpha = skeletonColor.a * slotColor.a * meshColor.a;
+    const multiplier = premultipliedAlpha ? alpha : 1;
+    const colors = attachment.tempColor;
+    colors.set(skeletonColor.r * slotColor.r * meshColor.r * multiplier, skeletonColor.g * slotColor.g * meshColor.g * multiplier, skeletonColor.b * slotColor.b * meshColor.b * multiplier, alpha);
+    let offset = vertexDataOffset;
+    const nodeColor = this._displayedColor;
+    const nodeR = nodeColor.r, nodeG = nodeColor.g, nodeB = nodeColor.b, nodeA = this._displayedOpacity;
+    for (let i = 0, n = vertices.length; i < n; i += 2) {
+        const vx = vertices[i], vy = vertices[i + 1];
+        const x = vx * wa + vy * wb + wx, y = vx * wc + vy * wd + wy;
+        const r = colors.r * nodeR, g = colors.g * nodeG, b = colors.b * nodeB, a = colors.a * nodeA;
+        const color = (a << 24) | (b << 16) | (g << 8) | r;
+        f32buffer[offset] = x;
+        f32buffer[offset + 1] = y;
+        f32buffer[offset + 2] = z;
+        ui32buffer[offset + 3] = color;
+        f32buffer[offset + 4] = uvs[i];
+        f32buffer[offset + 5] = uvs[i + 1];
+        offset += 6;
+    }
+};

package/dist/spine/index.d.ts

@@ -1,6 +1,7 @@
 import { EntityManager, EventManager, System } from 'entityx-ts';
 import { BaseComponentProps, ComponentX } from '..';
-interface SpineData {
+import { SkeletonAnimation } from './CCSkeletonAnimation';
+export interface SpineData {
     atlas: string;
     skeleton: string;
     texture?: string;
@@ -12,14 +13,9 @@ interface SpineSkeletonProps {
     timeScale?: number;
     loop?: boolean;
 }
-export declare class SpineSkeleton extends ComponentX<SpineSkeletonProps & BaseComponentProps<SpineSkeleton>> {
-    data: SpineData;
-    skin: string;
-    animation: string;
-    loop: boolean;
-    timeScale: number;
+export declare class SpineSkeleton extends ComponentX<SpineSkeletonProps & BaseComponentProps<SpineSkeleton>, SkeletonAnimation> {
     setAnimation(name: string, loop?: boolean): void;
-    setSkeletonData(data: string): void;
+    setSkeletonData(data: SpineData): void;
 }
 export declare class SpineSystem implements System {
     configure(event_manager: EventManager): void;

package/dist/spine/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/spine/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAc,MAAM,EAAE,MAAM,YAAY,CAAA;AAE5E,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAuB,MAAM,IAAI,CAAA;AAGxE,UAAU,SAAS;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AACD,qBAAa,aAAc,SAAQ,UAAU,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACnG,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,OAAO,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IAEjB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,UAAQ;IAOvC,eAAe,CAAC,IAAI,EAAE,MAAM;CAK7B;AAED,qBAAa,WAAY,YAAW,MAAM;IACxC,SAAS,CAAC,aAAa,EAAE,YAAY;IAGrC,OAAO,CAAC,kBAAkB,CAazB;IACD,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAIjE;AAED,wBAAgB,UAAU,SAIzB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/spine/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAoC,MAAM,EAAE,MAAM,YAAY,CAAA;AAElG,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAuB,MAAM,IAAI,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAEzD,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AACD,qBAAa,aAAc,SAAQ,UAAU,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAC;IACtH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,UAAQ;IAOvC,eAAe,CAAC,IAAI,EAAE,SAAS;CAKhC;AAED,qBAAa,WAAY,YAAW,MAAM;IACxC,SAAS,CAAC,aAAa,EAAE,YAAY;IAGrC,OAAO,CAAC,kBAAkB,CAYzB;IACD,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM;CAIjE;AAED,wBAAgB,UAAU,SAIzB"}

package/dist/spine/index.js

@@ -2,11 +2,6 @@ import { EventTypes } from 'entityx-ts';
 import { ComponentX, GameWorld, NodeComp } from '..';
 import { SkeletonAnimation } from './CCSkeletonAnimation';
 export class SpineSkeleton extends ComponentX {
-    data;
-    skin;
-    animation;
-    loop;
-    timeScale;
     setAnimation(name, loop = false) {
         const skel = this.node.instance;
         if (skel.setAnimation) {
@@ -15,19 +10,18 @@ export class SpineSkeleton extends ComponentX {
     }
     setSkeletonData(data) {
         const skel = this.node.instance;
-        const atlas = data.replace('.json', '.atlas');
-        skel.initWithArgs(data, atlas, this.node.scale);
+        const { atlas, skeleton } = data;
+        skel.initWithArgs(skeleton, atlas);
     }
 }
 export class SpineSystem {
     configure(event_manager) {
         event_manager.subscribe(EventTypes.ComponentAdded, SpineSkeleton, this.onAddSpineSkeleton);
     }
-    onAddSpineSkeleton = ({ entity }) => {
-        const spineComp = entity.getComponent(SpineSkeleton);
-        const { data, skin, animation, loop, timeScale = 1 } = spineComp.props;
+    onAddSpineSkeleton = ({ entity, component: spineComp }) => {
+        const { data, skin, animation, loop = true, timeScale = 1 } = spineComp.props;
         const { atlas, skeleton } = data;
-        // cc.log(skel, atlas);
+        // console.log('spineComp', spineComp)
         const node = SkeletonAnimation.createWithJsonFile(skeleton, atlas, timeScale);
         if (skin) {
             node.setSkin(skin);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@safe-engine/cocos",
-  "version": "1.9.6",
+  "version": "1.10.2",
   "description": "safe-engine with cocos renderer support",
   "type": "module",
   "main": "dist/index.js",