run success, but effect wrong

Author: drelaptop

extensions/spine/CCSkeleton.js

@@ -228,7 +228,9 @@ sp.Skeleton = cc.Node.extend(/** @lends sp.Skeleton# */{
             var attachment = slot.attachment;
             if (!attachment || !(attachment instanceof spine.RegionAttachment))
                 continue;
-            vertices = attachment.updateWorldVertices(slot, false);
+            // 3.5 vertices = attachment.updateWorldVertices(slot, false);
+            vertices = spine.Utils.setArraySize(new Array(), 8, 0);
+            attachment.computeWorldVertices(slot.bone, vertices, 0, 8);
             minX = Math.min(minX, vertices[VERTEX.X1] * scaleX, vertices[VERTEX.X4] * scaleX, vertices[VERTEX.X2] * scaleX, vertices[VERTEX.X3] * scaleX);
             minY = Math.min(minY, vertices[VERTEX.Y1] * scaleY, vertices[VERTEX.Y4] * scaleY, vertices[VERTEX.Y2] * scaleY, vertices[VERTEX.Y3] * scaleY);
             maxX = Math.max(maxX, vertices[VERTEX.X1] * scaleX, vertices[VERTEX.X4] * scaleX, vertices[VERTEX.X2] * scaleX, vertices[VERTEX.X3] * scaleX);

extensions/spine/CCSkeletonCanvasRenderCmd.js

@@ -87,6 +87,7 @@ proto.rendering = function (wrapper, scaleX, scaleY) {
         }
 
         // Bone origins.
+        // FIXME: point position wrong, might due to scale
         drawingUtil.setPointSize(4);
         drawingUtil.setDrawColor(0, 0, 255, 255); // Root bone is blue.
 
@@ -114,7 +115,9 @@ proto._updateRegionAttachmentSlot = function (attachment, slot, points) {
     if (!points)
         return;
 
-    var vertices = attachment.updateWorldVertices(slot, false);
+    // 3.5 var vertices = attachment.updateWorldVertices(slot, false);
+    var vertices = spine.Utils.setArraySize(new Array(), 8, 0);
+    attachment.computeWorldVertices(slot.bone, vertices, 0, 8);
     var VERTEX = spine.RegionAttachment;
     points.length = 0;
     points.push(cc.p(vertices[VERTEX.X1], vertices[VERTEX.Y1]));

extensions/spine/CCSkeletonWebGLRenderCmd.js

@@ -233,7 +233,11 @@ proto._uploadRegionAttachmentData = function(attachment, slot, premultipliedAlph
         nodeG = nodeColor.g,
         nodeB = nodeColor.b,
         nodeA = this._displayedOpacity;
-    var vertices = attachment.updateWorldVertices(slot, premultipliedAlpha);
+    // 3.5 var vertices = attachment.updateWorldVertices(slot, premultipliedAlpha);
+    // FIXME: lose premultipliedAlpha?
+    var vertices = spine.Utils.setArraySize(new Array(), 8, 0);
+    attachment.computeWorldVertices(slot.bone, vertices, 0, 8);
+    
     var wt = this._worldTransform,
         wa = wt.a, wb = wt.b, wc = wt.c, wd = wt.d,
         wx = wt.tx, wy = wt.ty,
@@ -280,14 +284,17 @@ proto._uploadMeshAttachmentData = function(attachment, slot, premultipliedAlpha,
         wx = wt.tx, wy = wt.ty,
         z = this._node.vertexZ;
     // get the vertex data
-    var vertices = attachment.updateWorldVertices(slot, premultipliedAlpha);
+    // 3.5 var vertices = attachment.updateWorldVertices(slot, premultipliedAlpha);
+    var verticesLength = attachment.worldVerticesLength;
+    var vertices = spine.Utils.setArraySize(new Array(), verticesLength, 0);
+    attachment.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2);
     var offset = vertexDataOffset;
     var nodeColor = this._displayedColor;
     var nodeR = nodeColor.r,
         nodeG = nodeColor.g,
         nodeB = nodeColor.b,
         nodeA = this._displayedOpacity;
-    for (var i = 0, n = vertices.length; i < n; i += 8) {
+    for (var i = 0, n = vertices.length; i < n; i += 2) {
         var vx = vertices[i],
             vy = vertices[i + 1];
         var x = vx * wa + vy * wb + wx,

extensions/spine/Spine.js

@@ -6453,3 +6453,6 @@ var spine;
 	SwirlEffect.interpolation = new spine.PowOut(2);
 	spine.SwirlEffect = SwirlEffect;
 })(spine || (spine = {}));
+
+var sp = sp || {};
+sp.spine = spine;