Merge pull request cocos2d#3179 from pandamicro/develop

Fix BLEND_SRC and ScrollView issues

Author: pandamicro

cocos2d/core/platform/CCMacro.js

@@ -447,13 +447,11 @@ cc.MIRRORED_REPEAT   = 0x8370;
  * @name cc.BLEND_SRC
  * @type Number
  */
-cc.defineGetterSetter(cc, "BLEND_SRC", function (){
+cc.BLEND_SRC = cc.SRC_ALPHA;
+cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
     if (cc._renderType === cc.game.RENDER_TYPE_WEBGL
          && cc.OPTIMIZE_BLEND_FUNC_FOR_PREMULTIPLIED_ALPHA) {
-        return cc.ONE;
-    }
-    else {
-        return cc.SRC_ALPHA;
+        cc.BLEND_SRC = cc.ONE;
     }
 });
 

extensions/ccui/uiwidgets/scroll-widget/UIScrollView.js

@@ -180,10 +180,12 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{
      * @param {cc.Size} size inner container size.
      */
     setInnerContainerSize: function (size) {
-        var innerContainer = this._innerContainer;
-        var locSize = this._contentSize;
-        var innerSizeWidth = locSize.width, innerSizeHeight = locSize.height;
-        var originalInnerSize = innerContainer.getContentSize();
+        var innerContainer = this._innerContainer,
+            locSize = this._contentSize,
+            innerSizeWidth = locSize.width, innerSizeHeight = locSize.height,
+            originalInnerSize = innerContainer.getContentSize(),
+            renderCmd = this._renderCmd,
+            newInnerSize, offset;
         if (size.width < locSize.width)
             cc.log("Inner width <= ScrollView width, it will be force sized!");
         else
@@ -195,24 +197,29 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{
             innerSizeHeight = size.height;
 
         innerContainer.setContentSize(cc.size(innerSizeWidth, innerSizeHeight));
-        var newInnerSize, offset;
         switch (this.direction) {
             case ccui.ScrollView.DIR_VERTICAL:
                 newInnerSize = innerContainer.getContentSize();
                 offset = originalInnerSize.height - newInnerSize.height;
+                // Made child nodes transform available for scroll
+                renderCmd.transform(renderCmd.getParentRenderCmd(), true);
                 this._scrollChildren(0, offset);
                 break;
             case ccui.ScrollView.DIR_HORIZONTAL:
                 if (innerContainer.getRightBoundary() <= locSize.width) {
                     newInnerSize = innerContainer.getContentSize();
                     offset = originalInnerSize.width - newInnerSize.width;
+                    // Made child nodes transform available for scroll
+                    renderCmd.transform(renderCmd.getParentRenderCmd(), true);
                     this._scrollChildren(offset, 0);
                 }
                 break;
             case ccui.ScrollView.DIR_BOTH:
                 newInnerSize = innerContainer.getContentSize();
                 var offsetY = originalInnerSize.height - newInnerSize.height;
                 var offsetX = (innerContainer.getRightBoundary() <= locSize.width) ? originalInnerSize.width - newInnerSize.width : 0;
+                // Made child nodes transform available for scroll
+                renderCmd.transform(renderCmd.getParentRenderCmd(), true);
                 this._scrollChildren(offsetX, offsetY);
                 break;
             default:
@@ -326,9 +333,9 @@ ccui.ScrollView = ccui.Layout.extend(/** @lends ccui.ScrollView# */{
     },
 
     updateChildren: function () {
-        var child;
+        var child, i, l;
         var childrenArray = this._innerContainer._children;
-        for(var i = 0; i < childrenArray.length; i++) {
+        for(i = 0, l = childrenArray.length; i < l; i++) {
             child = childrenArray[i];
             if(child._inViewRect === true && this._isInContainer(child) === false)
                 child._inViewRect = false;

extensions/ccui/uiwidgets/scroll-widget/UIScrollViewCanvasRenderCmd.js

@@ -14,28 +14,17 @@
         var node = this._node;
         if (!node._visible)
             return;
-        cc.renderer.pushRenderCommand(this);
         var currentID = node.__instanceId;
+        
+        cc.renderer.pushRenderCommand(this);
         cc.renderer._turnToCacheMode(currentID);
 
         ccui.Layout.CanvasRenderCmd.prototype.visit.call(this, parentCmd);
+
         this._dirtyFlag = 0;
         cc.renderer._turnToNormalMode();
     };
 
-    proto.transform = function(parentCmd) {
-        ccui.Layout.CanvasRenderCmd.prototype.transform.call(this,parentCmd);
-        var node = this._node;
-        var child;
-        var childrenArray = node._innerContainer._children;
-        for(var i = 0; i < childrenArray.length; i++) {
-            child = childrenArray[i];
-            if(child._renderCmd._dirtyFlag & cc.Node._dirtyFlags.transformDirty) {
-                child._inViewRect = node._isInContainer(child);
-            }
-        }
-    };
-
     proto.rendering = function (ctx) {
         var currentID = this._node.__instanceId;
         var locCmds = cc.renderer._cacheToCanvasCmds[currentID], i, len,
@@ -53,4 +42,4 @@
             locCmds[i].rendering(context, scaleX, scaleY);
         }
     };
-})();
+})();

extensions/ccui/uiwidgets/scroll-widget/UIScrollViewWebGLRenderCmd.js

@@ -11,18 +11,6 @@
     var proto = ccui.ScrollView.WebGLRenderCmd.prototype = Object.create(ccui.Layout.WebGLRenderCmd.prototype);
     proto.constructor = ccui.ScrollView.WebGLRenderCmd;
 
-    proto.transform = function(parentCmd) {
-        ccui.Layout.WebGLRenderCmd.prototype.transform.call(this,parentCmd);
-        var node = this._node;
-        var child;
-        var childrenArray = node._innerContainer._children;
-        for(var i = 0; i < childrenArray.length; i++) {
-            child = childrenArray[i];
-            if(child._renderCmd._dirtyFlag & cc.Node._dirtyFlags.transformDirty) {
-                child._inViewRect = node._isInContainer(child);
-            }
-        }
-    };
     proto.visit = function(parentCmd) {
         var node = this._node;
         if (!node._visible)
@@ -33,6 +21,8 @@
         cc.renderer._turnToCacheMode(currentID);
 
         ccui.Layout.WebGLRenderCmd.prototype.visit.call(this, parentCmd);
+        // Need to update children after do layout
+        node.updateChildren();
 
         this._dirtyFlag = 0;
         cc.renderer._turnToNormalMode();
@@ -53,4 +43,4 @@
             locCmds[i].rendering(context);
         }
     }
-})();
+})();