Merge pull request #3358 from pandamicro/develop

Fix rendering issue for Armature using sprite as display in bone

Author: pandamicro

cocos2d/core/platform/CCConfig.js

@@ -31,7 +31,7 @@
  * @type {String}
  * @name cc.ENGINE_VERSION
  */
-window["CocosEngine"] = cc.ENGINE_VERSION = "Cocos2d-JS v3.12";
+window["CocosEngine"] = cc.ENGINE_VERSION = "Cocos2d-JS v3.13";
 
 /**
  * <p>

extensions/cocostudio/armature/CCArmatureCanvasRenderCmd.js

@@ -77,10 +77,14 @@
             var selBone = locChildren[i];
             var boneCmd = selBone._renderCmd;
             if (selBone && selBone.getDisplayRenderNode) {
+                var boneType = selBone.getDisplayRenderNodeType();
                 var selNode = selBone.getDisplayRenderNode();
                 if (selNode && selNode._renderCmd){
                     var cmd = selNode._renderCmd;
                     cmd.transform(null);   //must be null, use transform in armature mode
+                    if (boneType !== ccs.DISPLAY_TYPE_ARMATURE && boneType !== ccs.DISPLAY_TYPE_SPRITE) {
+                        cc.affineTransformConcatIn(cmd._worldTransform, selBone._worldTransform);
+                    }
 
                     //update displayNode's color and opacity, because skin didn't call visit()
                     var flags = cc.Node._dirtyFlags, locFlag = cmd._dirtyFlag, boneFlag = boneCmd._dirtyFlag;
@@ -137,13 +141,13 @@
                 boneCmd._syncStatus(this);
                 switch (selBone.getDisplayRenderNodeType()) {
                     case ccs.DISPLAY_TYPE_SPRITE:
-                        selNode.visit(boneCmd);
+                        selNode._renderCmd.visit(boneCmd);
                         break;
                     case ccs.DISPLAY_TYPE_ARMATURE:
                         selNode._renderCmd.rendering(ctx, scaleX, scaleY);
                         break;
                     default:
-                        selNode.visit(boneCmd);
+                        selNode._renderCmd.visit(boneCmd);
                         break;
                 }
             } else if(selBone instanceof cc.Node) {

extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js

@@ -44,6 +44,7 @@
         var alphaPremultiplied = cc.BlendFunc.ALPHA_PREMULTIPLIED, alphaNonPremultipled = cc.BlendFunc.ALPHA_NON_PREMULTIPLIED;
         for (var i = 0, len = locChildren.length; i < len; i++) {
             var selBone = locChildren[i];
+            var boneCmd = selBone._renderCmd;
             if (selBone && selBone.getDisplayRenderNode) {
                 var selNode = selBone.getDisplayRenderNode();
                 if (null === selNode)
@@ -52,7 +53,6 @@
                 switch (selBone.getDisplayRenderNodeType()) {
                     case ccs.DISPLAY_TYPE_SPRITE:
                         if (selNode instanceof ccs.Skin) {
-                            selBone._renderCmd._syncStatus(parentCmd);
                             selNode.setShaderProgram(this._shaderProgram);
                             this._updateColorAndOpacity(cmd, selBone);   //because skin didn't call visit()
                             cmd.transform(parentCmd);
@@ -77,31 +77,31 @@
                         break;
                     case ccs.DISPLAY_TYPE_ARMATURE:
                         selNode.setShaderProgram(this._shaderProgram);
-                        cmd._parentCmd = parentCmd;
+                        cmd._parentCmd = this;
                         // Continue rendering in default
                     default:
+                        boneCmd._syncStatus(parentCmd);
+                        cmd._syncStatus(boneCmd);
                         if (cmd.uploadData) {
                             cc.renderer._uploadBufferData(cmd);
                         }
-                        else {
+                        else if (cmd.rendering) {
                             // Finish previous batch
                             cc.renderer._batchRendering();
-                            cmd.transform(this);
                             cmd.rendering(cc._renderContext);
                         }
                         break;
                 }
             } else if (selBone instanceof cc.Node) {
                 selBone.setShaderProgram(this._shaderProgram);
-                cmd = selBone._renderCmd;
-                cmd.transform(this);
-                if (cmd.uploadData) {
-                    cc.renderer._uploadBufferData(cmd);
+                boneCmd._syncStatus(parentCmd);
+                if (boneCmd.uploadData) {
+                    cc.renderer._uploadBufferData(boneCmd);
                 }
-                else if (cmd.rendering) {
+                else if (boneCmd.rendering) {
                     // Finish previous batch
                     cc.renderer._batchRendering();
-                    cmd.rendering(cc._renderContext);
+                    boneCmd.rendering(cc._renderContext);
                 }
             }
         }

extensions/cocostudio/armature/CCBone.js

@@ -191,7 +191,7 @@ ccs.Bone = ccs.Node.extend(/** @lends ccs.Bone# */{
 
             ccs.TransformHelp.nodeToMatrix(locWorldInfo, this._worldTransform);
             if (this._armatureParentBone)
-                this._worldTransform = cc.affineTransformConcat(this._worldTransform, this._armature.getNodeToParentTransform());            //TODO TransformConcat
+                cc.affineTransformConcatIn(this._worldTransform, this._armature.getNodeToParentTransform());            //TODO TransformConcat
         }
 
         ccs.displayFactory.updateDisplay(this, delta, this._boneTransformDirty || this._armature.getArmatureTransformDirty());
@@ -685,6 +685,35 @@ ccs.Bone.RenderCmd = {
             displayCmd._syncDisplayOpacity(node._tweenData.a);
             displayCmd._updateColor();
         }
+    },
+
+    transform: function (parentCmd, recursive) {
+        var node = this._node,
+            t = this._transform,
+            wt = this._worldTransform,
+            pt = parentCmd ? parentCmd._worldTransform : null;
+
+        if (pt) {
+            this.originTransform();
+            cc.affineTransformConcatIn(t, node._worldTransform);
+        }
+
+        if (pt) {
+            wt.a  = t.a  * pt.a + t.b  * pt.c;
+            wt.b  = t.a  * pt.b + t.b  * pt.d;
+            wt.c  = t.c  * pt.a + t.d  * pt.c;
+            wt.d  = t.c  * pt.b + t.d  * pt.d;
+            wt.tx = t.tx * pt.a + t.ty * pt.c + pt.tx;
+            wt.ty = t.tx * pt.b + t.ty * pt.d + pt.ty;
+        }
+        else {
+            wt.a  = t.a;
+            wt.b  = t.b;
+            wt.c  = t.c;
+            wt.d  = t.d;
+            wt.tx = t.tx;
+            wt.ty = t.ty;
+        }
     }
 };
 

tools/build.xml

@@ -5,9 +5,9 @@
              classpath="./compiler/compiler.jar"/>
     <target name="compile">
         <jscomp compilationLevel="simple" warning="quiet"
-                debug="false" output="./../lib/cocos2d-js-v3.12-min.js"
+                debug="false" output="./../lib/cocos2d-js-v3.13-min.js"
                 languageIn="ECMASCRIPT5"
-                sourceMapOutputFile="./../lib/cocos2d-js-v3.12-sourcemap" sourceMapFormat="V3">
+                sourceMapOutputFile="./../lib/cocos2d-js-v3.13-sourcemap" sourceMapFormat="V3">
             <sources dir="./../">
                 <file name="Base64Images.js"/>
                 <file name="CCBoot.js"/>
@@ -306,9 +306,9 @@
 
     <target name="compile_core">
         <jscomp compilationLevel="simple" warning="quiet"
-                debug="false" output="./../lib/cocos2d-js-v3.12-core-min.js"
+                debug="false" output="./../lib/cocos2d-js-v3.13-core-min.js"
                 languageIn="ECMASCRIPT5"
-                sourceMapOutputFile="./../lib/cocos2d-js-v3.12-core-sourcemap" sourceMapFormat="V3">
+                sourceMapOutputFile="./../lib/cocos2d-js-v3.13-core-sourcemap" sourceMapFormat="V3">
             <sources dir="./../">
                 <file name="cocos2d/core/utils/CCSimplePool.js"/>
                 <file name="CCBoot.js"/>