Gotta batch them all

CCBoot.js

@@ -23,12 +23,45 @@
  THE SOFTWARE.
  ****************************************************************************/
 
+
+
 /**
  * The main namespace of Cocos2d-JS, all engine core classes, functions, properties and constants are defined in this namespace
  * @namespace
  * @name cc
  */
 var cc = cc || {};
+
+cc.create3DContext = function (canvas, opt_attribs) {
+    var names = ["webgl", "experimental-webgl", "webkit-3d", "moz-webgl"];
+    var context = null;
+    for (var ii = 0; ii < names.length; ++ii) {
+        try {
+            context = canvas.getContext(names[ii], opt_attribs);
+        } catch (e) {
+        }
+        if (context) {
+            break;
+        }
+    }
+    return context;
+};
+
+/*
+(function () {
+    var canvas = document.getElementById("gameCanvas");
+    if (canvas) {
+        var ctx = cc.create3DContext(canvas);
+
+        if(!ctx)
+        {
+            throw new Error("LOL!");
+        }
+    }
+}
+)();
+*/
+
 cc._tmp = cc._tmp || {};
 cc._LogInfos = {};
 
@@ -1184,20 +1217,7 @@ cc.formatStr = function(){
 var _tmpCanvas1 = document.createElement("canvas"),
     _tmpCanvas2 = document.createElement("canvas");
 
-cc.create3DContext = function (canvas, opt_attribs) {
-    var names = ["webgl", "experimental-webgl", "webkit-3d", "moz-webgl"];
-    var context = null;
-    for (var ii = 0; ii < names.length; ++ii) {
-        try {
-            context = canvas.getContext(names[ii], opt_attribs);
-        } catch (e) {
-        }
-        if (context) {
-            break;
-        }
-    }
-    return context;
-};
+
 
 var _initSys = function () {
     /**
@@ -2210,6 +2230,11 @@ cc.game = /** @lends cc.game# */{
             config = self.config, 
             CONFIG_KEY = self.CONFIG_KEY;
 
+        if(window["gli"]) //if webinspector is installed, we have to hook iterator
+        {
+            gli.setupContext();
+        }
+
         this._loadConfig();
 
         // Already prepared
@@ -2497,6 +2522,9 @@ cc.game = /** @lends cc.game# */{
             cc.shaderCache._init();
             cc._drawingUtil = new cc.DrawingPrimitiveWebGL(this._renderContext);
             cc.textureCache._initializingRenderer();
+            cc.glExt = {};
+            cc.glExt.instanced_arrays = gl.getExtension("ANGLE_instanced_arrays");
+            cc.glExt.element_uint = gl.getExtension("OES_element_index_uint");
         } else {
             cc.renderer = cc.rendererCanvas;
             this._renderContext = cc._renderContext = new cc.CanvasContextWrapper(localCanvas.getContext("2d"));

cocos2d/clipping-nodes/CCClippingNode.js

@@ -195,9 +195,6 @@ cc.ClippingNode = cc.Node.extend(/** @lends cc.ClippingNode# */{
     },
 
     _createRenderCmd: function(){
-        if(cc._renderType === cc.game.RENDER_TYPE_CANVAS)
-            return new cc.ClippingNode.CanvasRenderCmd(this);
-        else
             return new cc.ClippingNode.WebGLRenderCmd(this);
     }
 });

cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js

@@ -1,215 +0,0 @@
-/****************************************************************************
- Copyright (c) 2013-2014 Chukong Technologies Inc.
-
- http://www.cocos2d-x.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-//-------------------------- ClippingNode's canvas render cmd --------------------------------
-(function(){
-    cc.ClippingNode.CanvasRenderCmd = function(renderable){
-        cc.Node.CanvasRenderCmd.call(this, renderable);
-        this._needDraw = false;
-
-        this._godhelpme = false;
-        this._clipElemType = false;
-
-        this._rendererSaveCmd = new cc.CustomRenderCmd(this, this._saveCmdCallback);
-        this._rendererClipCmd = new cc.CustomRenderCmd(this, this._clipCmdCallback);
-        this._rendererRestoreCmd = new cc.CustomRenderCmd(this, this._restoreCmdCallback);
-    };
-    var proto = cc.ClippingNode.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype);
-    proto.constructor = cc.ClippingNode.CanvasRenderCmd;
-
-    proto.initStencilBits = function(){};
-
-    proto.setStencil = function(stencil){
-        if(stencil == null)
-            return;
-
-        this._node._stencil = stencil;
-
-        // For shape stencil, rewrite the draw of stencil ,only init the clip path and draw nothing.
-        //else
-        if (stencil instanceof cc.DrawNode) {
-            if(stencil._buffer){
-                for(var i=0; i<stencil._buffer.length; i++){
-                    stencil._buffer[i].isFill = false;
-                    stencil._buffer[i].isStroke = false;
-                }
-            }
-
-            stencil._renderCmd.rendering = function (ctx, scaleX, scaleY) {
-                scaleX = scaleX || cc.view.getScaleX();
-                scaleY = scaleY ||cc.view.getScaleY();
-                var wrapper = ctx || cc._renderContext, context = wrapper.getContext();
-
-                var t = this._transform;
-                context.transform(t.a, t.b, t.c, t.d, t.tx * scaleX, -t.ty * scaleY);
-                for (var i = 0; i < stencil._buffer.length; i++) {
-                    var vertices = stencil._buffer[i].verts;
-                    //TODO: need support circle etc
-                    //cc.assert(cc.vertexListIsClockwise(vertices),
-                    //    "Only clockwise polygons should be used as stencil");
-
-                    var firstPoint = vertices[0];
-                    context.moveTo(firstPoint.x * scaleX, -firstPoint.y * scaleY);
-                    for (var j = vertices.length - 1; j > 0; j--)
-                        context.lineTo(vertices[j].x * scaleX, -vertices[j].y * scaleY);
-                }
-            };
-        }else{
-            stencil._parent = this._node;
-        }
-    };
-
-    proto._saveCmdCallback  = function(ctx, scaleX, scaleY) {
-        var wrapper = ctx || cc._renderContext, context = wrapper.getContext();
-
-        if (this._clipElemType) {
-            var locCache = cc.ClippingNode.CanvasRenderCmd._getSharedCache();
-            var canvas = context.canvas;
-            locCache.width = canvas.width;
-            locCache.height = canvas.height;                     //note: on some browser, it can't clear the canvas, e.g. baidu
-            var locCacheCtx = locCache.getContext("2d");
-            locCacheCtx.drawImage(canvas, 0, 0);                //save the result to shareCache canvas
-        } else {
-            wrapper.save();
-            context.beginPath();                                                         //save for clip
-            //Because drawNode's content size is zero
-            wrapper.setTransform(this._worldTransform, scaleX, scaleY);
-
-            if (this._node.inverted) {
-                context.rect(0, 0, context.canvas.width, -context.canvas.height);
-                context.clip();
-            }
-        }
-    };
-
-    proto._setStencilCompositionOperation = function(stencil){
-         if(!stencil)
-            return;
-        var node = this._node;
-        if(stencil._renderCmd && stencil._renderCmd._blendFuncStr)          //it is a hack way.
-            stencil._renderCmd._blendFuncStr = (node.inverted ? "destination-out" : "destination-in");
-
-        if(!stencil._children)
-            return;
-        var children = stencil._children;
-        for(var i = 0, len = children.length; i < len; i++){
-             this._setStencilCompositionOperation(children[i]);
-        }
-    };
-
-    proto._clipCmdCallback = function(ctx) {
-        var node = this._node;
-        var wrapper = ctx || cc._renderContext, context = wrapper.getContext();
-
-        if (this._clipElemType) {
-            //hack
-            this._setStencilCompositionOperation(node._stencil);
-        } else {
-            context.clip();
-        }
-    };
-
-    proto._restoreCmdCallback = function (ctx) {
-        var locCache = cc.ClippingNode.CanvasRenderCmd._getSharedCache();
-        var wrapper = ctx || cc._renderContext, context = wrapper.getContext();
-        if (this._clipElemType) {
-            // Redraw the cached canvas, so that the clipped area shows the background etc.
-            context.save();
-            context.setTransform(1, 0, 0, 1, 0, 0);
-            context.globalCompositeOperation = "destination-over";
-            context.drawImage(locCache, 0, 0);
-            context.restore();
-            this._dirtyFlag = 0;
-        } else {
-            wrapper.restore();                             //use for restore clip operation
-        }
-    };
-
-    proto.transform = function(parentCmd, recursive){
-        cc.Node.CanvasRenderCmd.prototype.transform.call(this, parentCmd, recursive);
-        var node = this._node;
-        if(node._stencil && node._stencil._renderCmd)
-            node._stencil._renderCmd.transform(this, recursive);
-    };
-
-    proto._cangodhelpme = function (godhelpme) {
-        if (godhelpme === true || godhelpme === false)
-            cc.ClippingNode.CanvasRenderCmd.prototype._godhelpme = godhelpme;
-        return cc.ClippingNode.CanvasRenderCmd.prototype._godhelpme;
-    };
-
-    proto.visit = function(parentCmd){
-        var node = this._node;
-        // quick return if not visible
-        if (!node._visible)
-            return;
-
-        parentCmd = parentCmd || this.getParentRenderCmd();
-        if( parentCmd)
-            this._curLevel = parentCmd._curLevel + 1;
-        var transformRenderCmd = this;
-
-        // Composition mode, costy but support texture stencil
-        this._clipElemType = !(!this._cangodhelpme() && node._stencil instanceof cc.DrawNode);
-        if (!node._stencil || !node._stencil.visible) {
-            if (this.inverted)
-                cc.Node.CanvasRenderCmd.prototype.visit.call(this, parentCmd);   // draw everything
-            return;
-        }
-
-        this._syncStatus(parentCmd);
-        cc.renderer.pushRenderCommand(this._rendererSaveCmd);
-        if(this._clipElemType){
-            // Draw everything first using node visit function
-            cc.Node.CanvasRenderCmd.prototype.visit.call(this, parentCmd);
-        }else{
-            node._stencil.visit(this);
-        }
-        cc.renderer.pushRenderCommand(this._rendererClipCmd);
-
-        if(this._clipElemType){
-            node._stencil.visit(transformRenderCmd);
-        }else{
-            var i, children = node._children;
-            // Clip mode doesn't support recursive stencil, so once we used a clip stencil,
-            // so if it has ClippingNode as a child, the child must uses composition stencil.
-            this._cangodhelpme(true);
-            var len = children.length;
-            if (len > 0) {
-                node.sortAllChildren();
-                for (i = 0; i < len; i++)
-                    children[i]._renderCmd.visit(this);
-            }
-            this._cangodhelpme(false);
-        }
-
-        cc.renderer.pushRenderCommand(this._rendererRestoreCmd);
-        this._dirtyFlag = 0;
-    };
-
-    cc.ClippingNode.CanvasRenderCmd._sharedCache = null;
-    cc.ClippingNode.CanvasRenderCmd._getSharedCache = function () {
-        return (cc.ClippingNode.CanvasRenderCmd._sharedCache) || (cc.ClippingNode.CanvasRenderCmd._sharedCache = document.createElement("canvas"));
-    };
-})();

cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js

@@ -173,14 +173,11 @@
         var gl = ctx || cc._renderContext, node = this._node;
         cc.ClippingNode.WebGLRenderCmd._layer++;
 
-        // mask of the current layer (ie: for layer 3: 00000100)
+
         var mask_layer = 0x1 << cc.ClippingNode.WebGLRenderCmd._layer;
-        // mask of all layers less than the current (ie: for layer 3: 00000011)
         var mask_layer_l = mask_layer - 1;
-        // mask of all layers less than or equal to the current (ie: for layer 3: 00000111)
-        //var mask_layer_le = mask_layer | mask_layer_l;
         this._mask_layer_le = mask_layer | mask_layer_l;
-        // manually save the stencil state
+
         this._currentStencilEnabled = gl.isEnabled(gl.STENCIL_TEST);
         this._currentStencilWriteMask = gl.getParameter(gl.STENCIL_WRITEMASK);
         this._currentStencilFunc = gl.getParameter(gl.STENCIL_FUNC);