Fix armature status sync issue

Author: pandamicro

extensions/cocostudio/armature/CCArmatureCanvasRenderCmd.js

@@ -75,21 +75,34 @@
         var locChildren = this._node._children;
         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 (selNode && selNode._renderCmd){
                     var cmd = selNode._renderCmd;
                     cmd.transform(null);   //must be null, use transform in armature mode
 
                     //update displayNode's color and opacity, because skin didn't call visit()
+                    var flags = cc.Node._dirtyFlags, locFlag = cmd._dirtyFlag, boneFlag = boneCmd._dirtyFlag;
+                    var colorDirty = boneFlag & flags.colorDirty,
+                        opacityDirty = boneFlag & flags.opacityDirty;
+                    if (colorDirty)
+                        boneCmd._updateDisplayColor();
+                    if (opacityDirty)
+                        boneCmd._updateDisplayOpacity();
+                    if (colorDirty || opacityDirty)
+                        boneCmd._updateColor();
+
                     var parentColor = selBone._renderCmd._displayedColor, parentOpacity = selBone._renderCmd._displayedOpacity;
-                    var flags = cc.Node._dirtyFlags, locFlag = cmd._dirtyFlag;
-                    var colorDirty = locFlag & flags.colorDirty,
-                        opacityDirty = locFlag & flags.opacityDirty;
-                    if(colorDirty)
+                    colorDirty = locFlag & flags.colorDirty;
+                    opacityDirty = locFlag & flags.opacityDirty;
+                    if (colorDirty)
                         cmd._updateDisplayColor(parentColor);
-                    if(opacityDirty)
+                    if (opacityDirty)
                         cmd._updateDisplayOpacity(parentOpacity);
+                    if (colorDirty || opacityDirty) {
+                        cmd._updateColor();
+                    }
                 }
             }
         }
@@ -120,27 +133,28 @@
                 if (null === selNode)
                     continue;
 
+                var boneCmd = selBone._renderCmd;
+                boneCmd._syncStatus(this);
                 switch (selBone.getDisplayRenderNodeType()) {
                     case ccs.DISPLAY_TYPE_SPRITE:
-                        if(selNode instanceof ccs.Skin)
-                            this.updateChildPosition(selNode, selBone, alphaPremultiplied, alphaNonPremultipled);
+                        selNode.visit(boneCmd);
                         break;
                     case ccs.DISPLAY_TYPE_ARMATURE:
                         selNode._renderCmd.rendering(ctx, scaleX, scaleY);
                         break;
                     default:
-                        selNode.visit(this);
+                        selNode.visit(boneCmd);
                         break;
                 }
             } else if(selBone instanceof cc.Node) {
                 this._visitNormalChild(selBone);
-                //selBone.visit(this);
+                // selBone.visit(this);
             }
         }
     };
 
     proto._visitNormalChild = function(childNode){
-        if(childNode == null)
+        if (!childNode)
             return;
 
         var cmd = childNode._renderCmd;
@@ -181,7 +195,7 @@
         if (!node._visible)
             return;
 
-        this.updateStatus(parentCmd);
+        this._syncStatus(parentCmd);
         node.sortAllChildren();
 
         cc.renderer.pushRenderCommand(this._startRenderCmd);

extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js

@@ -52,6 +52,7 @@
                 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);
@@ -76,7 +77,7 @@
                         break;
                     case ccs.DISPLAY_TYPE_ARMATURE:
                         selNode.setShaderProgram(this._shaderProgram);
-                        cmd._parentCmd = this;
+                        cmd._parentCmd = parentCmd;
                         // Continue rendering in default
                     default:
                         if (cmd.uploadData) {
@@ -119,6 +120,7 @@
     proto._updateColorAndOpacity = function(skinRenderCmd, bone){
         //update displayNode's color and opacity
         var parentColor = bone._renderCmd._displayedColor, parentOpacity = bone._renderCmd._displayedOpacity;
+
         var flags = cc.Node._dirtyFlags, locFlag = skinRenderCmd._dirtyFlag;
         var colorDirty = locFlag & flags.colorDirty,
             opacityDirty = locFlag & flags.opacityDirty;

extensions/cocostudio/armature/CCBone.js

@@ -674,15 +674,15 @@ ccs.Bone.create = function (name) {
 };
 
 ccs.Bone.RenderCmd = {
-    _updateColor: function(){
+    _updateColor: function () {
         var node = this._node;
         var display = node._displayManager.getDisplayRenderNode();
         if (display !== null) {
             var displayCmd = display._renderCmd;
-            display.setColor(cc.color( node._tweenData.r, node._tweenData.g, node._tweenData.g));
-            display.setOpacity(node._tweenData.a);
-            displayCmd._syncDisplayColor(this._displayedColor);
-            displayCmd._syncDisplayOpacity(this._displayedOpacity);
+            display.setColor(this._displayedColor);
+            display.setOpacity(this._displayedOpacity);
+            displayCmd._syncDisplayColor(node._tweenData);
+            displayCmd._syncDisplayOpacity(node._tweenData.a);
             displayCmd._updateColor();
         }
     }