Merge pull request #3260 from 1scaR1/fix_clipping

Fix nested clipping node

Author: pandamicro

cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js

@@ -180,11 +180,22 @@
 
     proto._onAfterVisit = function(ctx){
         var gl = ctx || cc._renderContext;
-        
-        if (!this._currentStencilEnabled)
-            gl.disable(gl.STENCIL_TEST);
 
-        // we are done using this layer, decrement
         cc.ClippingNode.WebGLRenderCmd._layer--;
-    }
+
+        if (this._currentStencilEnabled)
+        {
+            var mask_layer = 0x1 << ccui.Layout.WebGLRenderCmd._layer;
+            var mask_layer_l = mask_layer - 1;
+            var mask_layer_le = mask_layer | mask_layer_l;
+
+            gl.stencilMask(mask_layer);
+            gl.stencilFunc(gl.EQUAL, mask_layer_le, mask_layer_le);
+        }
+        else
+        {
+            gl.disable(gl.STENCIL_TEST);
+
+        }
+    };
 })();

extensions/ccui/layouts/UILayoutWebGLRenderCmd.js

@@ -108,9 +108,21 @@
     proto._onAfterVisitStencil = function(ctx){
         var gl = ctx || cc._renderContext;
 
-        if (!this._currentStencilEnabled)
-            gl.disable(gl.STENCIL_TEST);
         ccui.Layout.WebGLRenderCmd._layer--;
+
+        if (this._currentStencilEnabled)
+        {
+            var mask_layer = 0x1 << ccui.Layout.WebGLRenderCmd._layer;
+            var mask_layer_l = mask_layer - 1;
+            var mask_layer_le = mask_layer | mask_layer_l;
+
+            gl.stencilMask(mask_layer);
+            gl.stencilFunc(gl.EQUAL, mask_layer_le, mask_layer_le);
+        }
+        else
+        {
+            gl.disable(gl.STENCIL_TEST);
+        }
     };
 
     proto._onBeforeVisitScissor = function(ctx){