Issue cocos2d#2698: corrected a mistake of cc.math.Matrix in constructor.

Author: dingpinglv

cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js

@@ -144,17 +144,29 @@
 
     proto._drawFullScreenQuadClearStencil = function () {
         // draw a fullscreen solid rectangle to clear the stencil buffer
-        cc.kmGLMatrixMode(cc.KM_GL_PROJECTION);
-        cc.kmGLPushMatrix();
-        cc.kmGLLoadIdentity();
-        cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW);
-        cc.kmGLPushMatrix();
-        cc.kmGLLoadIdentity();
+        var projStack = cc.projection_matrix_stack;
+        //cc.kmGLMatrixMode(cc.KM_GL_PROJECTION);
+        //cc.kmGLPushMatrix();
+        //cc.kmGLLoadIdentity();
+        projStack.push();
+        projStack.top.identity();
+
+        //cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW);
+        //cc.kmGLPushMatrix();
+        //cc.kmGLLoadIdentity();
+        var modelViewStack = cc.modelview_matrix_stack;
+        modelViewStack.push();
+        modelViewStack.top.identity();
+
         cc._drawingUtil.drawSolidRect(cc.p(-1, -1), cc.p(1, 1), cc.color(255, 255, 255, 255));
-        cc.kmGLMatrixMode(cc.KM_GL_PROJECTION);
-        cc.kmGLPopMatrix();
-        cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW);
-        cc.kmGLPopMatrix();
+
+        //cc.kmGLMatrixMode(cc.KM_GL_PROJECTION);
+        //cc.kmGLPopMatrix();
+        projStack.pop();
+
+        //cc.kmGLMatrixMode(cc.KM_GL_MODELVIEW);
+        //cc.kmGLPopMatrix();
+        modelViewStack.pop();
     };
 
     proto._onBeforeVisit = function(ctx){

cocos2d/kazmath/gl/mat4stack.js

@@ -36,6 +36,7 @@
     cc.math.Matrix4Stack = function(top, stack) {
         this.top = top;
         this.stack = stack || [];
+        //this._matrixPool = [];            // use pool in next version
     };
     cc.km_mat4_stack = cc.math.Matrix4Stack;
     var proto = cc.math.Matrix4Stack.prototype;
@@ -61,17 +62,34 @@
     };
 
     proto.push = function(item) {
+        item = item || this.top;
         this.stack.push(this.top);
         this.top = new cc.math.Matrix4(item);
+        //this.top = this._getFromPool(item);
     };
 
     proto.pop = function() {
+        //this._putInPool(this.top);
         this.top = this.stack.pop();
     };
 
     proto.release = function(){
         this.stack = null;
         this.top = null;
+        this._matrixPool = null;
+    };
+
+    proto._getFromPool = function (item) {
+        var pool = this._matrixPool;
+        if (pool.length === 0)
+            return new cc.math.Matrix4(item);
+        var ret = pool.pop();
+        ret.assignFrom(item);
+        return ret;
+    };
+
+    proto._putInPool = function(matrix){
+        this._matrixPool.push(matrix);
     };
 })(cc);
 

cocos2d/kazmath/mat3.js

@@ -29,12 +29,10 @@
 var Float32Array = Float32Array || Array;
 (function(cc){
     cc.math.Matrix3 = function(mat3) {
-        if (mat3) {
-            this.mat = new Float32Array(mat3);
+        if (mat3 && mat3.mat) {
+            this.mat = new Float32Array(mat3.mat);
         } else {
-            this.mat = new Float32Array([0, 0, 0,
-                0, 0, 0,
-                0, 0, 0]);
+            this.mat = new Float32Array(9);
         }
     };
     cc.kmMat3 = cc.math.Matrix3;

cocos2d/kazmath/mat4.js

@@ -40,13 +40,10 @@
      * @param {cc.math.Matrix4} [mat4]
      */
     cc.math.Matrix4 = function (mat4) {
-        if(mat4){
+        if(mat4 && mat4.mat){
             this.mat = new Float32Array(mat4.mat);
         } else {
-            this.mat = new Float32Array([0, 0, 0, 0,
-                0, 0, 0, 0,
-                0, 0, 0, 0,
-                0, 0, 0, 0]);
+            this.mat = new Float32Array(16);
         }
     };
     cc.kmMat4 = cc.math.Matrix4;