Merge pull request #1832 from Lurenyiabc/Master3.0

fix:spine bug.

Author: lirong2f

src/layaAir/laya/spine/Spine2DRenderNode.ts

@@ -574,15 +574,15 @@ export class Spine2DRenderNode extends BaseRenderNode2D {
         if (null == this._skeleton) return;
         let skins = this._externalSkins;
         if (skins) {
-            let normal = false;
+            let normal = false;//todo 需要修改顶点构成?
             for (let i = skins.length - 1; i >= 0; i--) {
                 skins[i].flush();
-                normal = skins[i].normal || normal;
+                // normal = skins[i].normal || normal;
             }
 
-            if (normal) {
+            // if (normal) {
                 this.useFastRender = false;
-            }
+            // }
         }
     }
     /**
@@ -653,6 +653,7 @@ export class Spine2DRenderNode extends BaseRenderNode2D {
             this._clearUpdate();
             //this.timer.clear(this, this._update);
             this._state.update(-this._currentPlayTime);
+            // this._skeleton.setToSetupPose();
             // this._state.clearTrack(this.trackIndex);
             this._currentPlayTime = 0;
             this.event(Event.STOPPED);

src/layaAir/laya/spine/normal/SpineSkeletonRenderer.ts

@@ -402,7 +402,8 @@ export class SpineSkeletonRenderer extends SpineNormalRenderBase implements ISpi
                 attachmentColor = mesh.color;
             } else if (attachment instanceof window.spine.ClippingAttachment) {
                 let clip = <spine.ClippingAttachment>(attachment);
-                clipper.clipStart(slot, clip);
+                // clipper.clipStart(slot, clip);
+                this.clipStart(this.clipper , slot , clip , -skeleton.x, -skeleton.y);
                 continue;
             } else {
                 clipper.clipEndWithSlot(slot);
@@ -480,6 +481,40 @@ export class SpineSkeletonRenderer extends SpineNormalRenderBase implements ISpi
         virtualMesh && virtualMesh.draw();
     }
 
+    /**
+     * @link spine-ts/.../SkeletonClipping.ts
+     * @param clipper 
+     * @param slot 
+     * @param clip 
+     * @param ofx 
+     * @param ofy 
+     * @returns 
+     */
+    clipStart(clipper:spine.SkeletonClipping , slot : spine.Slot, clip:spine.VertexAttachment ,ofx: number, ofy: number) {
+        //@ts-ignore
+        if (clipper.clipAttachment)
+            return 0;
+        //@ts-ignore
+        clipper.clipAttachment = clip;
+        let n = clip.worldVerticesLength;
+        //@ts-ignore
+        let vertices:spine.NumberArrayLike = spine.Utils.setArraySize(clipper.clippingPolygon, n);
+        // clip.computeWorldVertices(slot, 0, n, vertices, 0, 2);
+        this.computeWorldVertices_MeshAttachment(clip , slot , 0 , n , vertices , 0 , 2 , ofx , ofy);
+        //@ts-ignore
+        let clippingPolygon = clipper.clippingPolygon;
+        spine.SkeletonClipping.makeClockwise(clippingPolygon);
+        //@ts-ignore
+        let clippingPolygons = clipper.clippingPolygons = clipper.triangulator.decompose(clippingPolygon, clipper.triangulator.triangulate(clippingPolygon));
+        for (let i = 0, n = clippingPolygons.length; i < n; i++) {
+            let polygon = clippingPolygons[i];
+            spine.SkeletonClipping.makeClockwise(polygon);
+            polygon.push(polygon[0]);
+            polygon.push(polygon[1]);
+        }
+        return clippingPolygons.length;
+    }
+
     /**
      * @link spine-ts/.../RegionAttachment.ts
      * @param attachment 
@@ -537,7 +572,7 @@ export class SpineSkeletonRenderer extends SpineNormalRenderBase implements ISpi
      * @param ofy 
      * @returns 
      */
-    private computeWorldVertices_MeshAttachment(attachment: spine.MeshAttachment, slot: spine.Slot, start: number, count: number, worldVertices: spine.NumberArrayLike, offset: number, stride: number, ofx: number, ofy: number) {
+    private computeWorldVertices_MeshAttachment(attachment: spine.VertexAttachment, slot: spine.Slot, start: number, count: number, worldVertices: spine.NumberArrayLike, offset: number, stride: number, ofx: number, ofy: number) {
         count = offset + (count >> 1) * stride;
         let skeleton = slot.bone.skeleton;
         let deformArray = slot.deform;

src/layaAir/laya/spine/optimize/SpineNormalRender.ts

@@ -42,7 +42,8 @@ export class SpineNormalRender implements ISpineOptimizeRender {
     _skeleton: spine.Skeleton;
     /**@internal */
     _spineColor: Color
-
+    /** @internal */
+    _skinIndex: number = 0;
     /**
      * @en Initializes the renderer.
      * @param skeleton The spine skeleton.
@@ -91,7 +92,7 @@ export class SpineNormalRender implements ISpineOptimizeRender {
      * @param index 要设置的皮肤索引。
      */
     setSkinIndex(index: number): void {
-        //throw new NotImplementedError();
+        this._skinIndex = index;
     }
 
 
@@ -103,6 +104,9 @@ export class SpineNormalRender implements ISpineOptimizeRender {
      */
     changeSkeleton(skeleton: spine.Skeleton) {
         this._skeleton = skeleton;
+        //@ts-ignore
+        skeleton.showSkinByIndex(this._skinIndex);
+        this._skeleton.setSlotsToSetupPose();
     }
 
     /**

src/layaAir/laya/spine/optimize/SpineOptimizeRender.ts

@@ -169,6 +169,9 @@ export class SpineOptimizeRender implements ISpineOptimizeRender {
         this.renderProxyMap.forEach(render=>{
             render.changeSkeleton(skeleton);
         });
+        //@ts-ignore
+        skeleton.showSkinByIndex(this._skinIndex);
+        this._skeleton.setSlotsToSetupPose();
     }
 
     /**