Merge pull request #2769 from dingpinglv/Iss2698_namespace

dingpinglv · dingpinglv · commit b7677e1b05f9 · 2015-03-24T10:22:53.000+08:00
Issue #2698: corrected a mistake of cc.math.Matrix in constructor.
diff --git a/cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js b/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){
diff --git a/cocos2d/core/CCScheduler.js b/cocos2d/core/CCScheduler.js
@@ -285,7 +285,7 @@ cc.TimerTargetCallback = cc.Timer.extend({
  *
  * @example
  * //register a schedule to scheduler
- * cc.director.getScheduler().scheduleSelector(callback, this, interval, !this._isRunning);
+ * cc.director.getScheduler().schedule(callback, this, interval, !this._isRunning);
  */
 cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
     _timeScale:1.0,
diff --git a/cocos2d/core/cocoa/CCAffineTransform.js b/cocos2d/core/cocoa/CCAffineTransform.js
@@ -66,17 +66,26 @@ cc.affineTransformMake = function (a, b, c, d, tx, ty) {
  * Apply the affine transformation on a point.
  * @function
  * 
- * @param {cc.Point} point
- * @param {cc.AffineTransform} t
+ * @param {cc.Point|Number} point or x
+ * @param {cc.AffineTransform|Number} transOrY transform matrix or y
+ * @param {cc.AffineTransform} t transform matrix or y
  * @return {cc.Point}
  */
-cc.pointApplyAffineTransform = function (point, t) {
-    return {x: t.a * point.x + t.c * point.y + t.tx, y: t.b * point.x + t.d * point.y + t.ty};
+cc.pointApplyAffineTransform = function (point, transOrY, t) {
+    var x, y;
+    if (t === undefined) {
+        t = transOrY;
+        x = point.x;
+        y = point.y;
+    } else {
+        x = point;
+        y = transOrY;
+    }
+    return {x: t.a * x + t.c * y + t.tx, y: t.b * x + t.d * y + t.ty};
 };
 
-cc._pointApplyAffineTransform = function (x, y, t) {
-    return {x: t.a * x + t.c * y + t.tx,
-        y: t.b * x + t.d * y + t.ty};
+cc._pointApplyAffineTransform = function (x, y, t) {   //it will remove.
+    return cc.pointApplyAffineTransform(x, y, t);
 };
 
 /**
@@ -131,10 +140,10 @@ cc.rectApplyAffineTransform = function (rect, anAffineTransform) {
     var right = cc.rectGetMaxX(rect);
     var bottom = cc.rectGetMaxY(rect);
 
-    var topLeft = cc._pointApplyAffineTransform(left, top, anAffineTransform);
-    var topRight = cc._pointApplyAffineTransform(right, top, anAffineTransform);
-    var bottomLeft = cc._pointApplyAffineTransform(left, bottom, anAffineTransform);
-    var bottomRight = cc._pointApplyAffineTransform(right, bottom, anAffineTransform);
+    var topLeft = cc.pointApplyAffineTransform(left, top, anAffineTransform);
+    var topRight = cc.pointApplyAffineTransform(right, top, anAffineTransform);
+    var bottomLeft = cc.pointApplyAffineTransform(left, bottom, anAffineTransform);
+    var bottomRight = cc.pointApplyAffineTransform(right, bottom, anAffineTransform);
 
     var minX = Math.min(topLeft.x, topRight.x, bottomLeft.x, bottomRight.x);
     var maxX = Math.max(topLeft.x, topRight.x, bottomLeft.x, bottomRight.x);
@@ -150,10 +159,10 @@ cc._rectApplyAffineTransformIn = function(rect, anAffineTransform){
     var right = cc.rectGetMaxX(rect);
     var bottom = cc.rectGetMaxY(rect);
 
-    var topLeft = cc._pointApplyAffineTransform(left, top, anAffineTransform);
-    var topRight = cc._pointApplyAffineTransform(right, top, anAffineTransform);
-    var bottomLeft = cc._pointApplyAffineTransform(left, bottom, anAffineTransform);
-    var bottomRight = cc._pointApplyAffineTransform(right, bottom, anAffineTransform);
+    var topLeft = cc.pointApplyAffineTransform(left, top, anAffineTransform);
+    var topRight = cc.pointApplyAffineTransform(right, top, anAffineTransform);
+    var bottomLeft = cc.pointApplyAffineTransform(left, bottom, anAffineTransform);
+    var bottomRight = cc.pointApplyAffineTransform(right, bottom, anAffineTransform);
 
     var minX = Math.min(topLeft.x, topRight.x, bottomLeft.x, bottomRight.x);
     var maxX = Math.max(topLeft.x, topRight.x, bottomLeft.x, bottomRight.x);
diff --git a/cocos2d/core/layers/CCLayer.js b/cocos2d/core/layers/CCLayer.js
@@ -313,7 +313,7 @@ cc.LayerColor.create = function (color, width, height) {
  * @property {Number}   startOpacity            - Start opacity of the color gradient
  * @property {Number}   endOpacity              - End opacity of the color gradient
  * @property {Number}   vector                  - Direction vector of the color gradient
- * @property {Number}   compresseInterpolation  - Indicate whether or not the interpolation will be compressed
+ * @property {Number}   compressedInterpolation  - Indicate whether or not the interpolation will be compressed
  */
 cc.LayerGradient = cc.LayerColor.extend(/** @lends cc.LayerGradient# */{
     _endColor: null,
diff --git a/cocos2d/core/layers/CCLayerWebGLRenderCmd.js b/cocos2d/core/layers/CCLayerWebGLRenderCmd.js
@@ -247,10 +247,10 @@
         transMat = cc.affineTransformScale(transMat, tx, ty);
         for (i = 0; i < stopsLen; i++) {
             var stop = stops[i], y = stop.p * contentSize.height ;
-            var p0 = cc._pointApplyAffineTransform(- locAnchor.x , y - locAnchor.y, transMat);
+            var p0 = cc.pointApplyAffineTransform(- locAnchor.x , y - locAnchor.y, transMat);
             locVertices[i * 2].x = p0.x;
             locVertices[i * 2].y = p0.y;
-            var p1 = cc._pointApplyAffineTransform(contentSize.width - locAnchor.x, y - locAnchor.y, transMat);
+            var p1 = cc.pointApplyAffineTransform(contentSize.width - locAnchor.x, y - locAnchor.y, transMat);
             locVertices[i * 2 + 1].x = p1.x;
             locVertices[i * 2 + 1].y = p1.y;
         }
diff --git a/cocos2d/kazmath/gl/mat4stack.js b/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);
 
diff --git a/cocos2d/kazmath/mat3.js b/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;
diff --git a/cocos2d/kazmath/mat4.js b/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;

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ cc.TimerTargetCallback = cc.Timer.extend({`
`285`	`285`	`*`
`286`	`286`	`* @example`
`287`	`287`	`* //register a schedule to scheduler`
`288`		`- * cc.director.getScheduler().scheduleSelector(callback, this, interval, !this._isRunning);`
	`288`	`+ * cc.director.getScheduler().schedule(callback, this, interval, !this._isRunning);`
`289`	`289`	`*/`
`290`	`290`	`cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{`
`291`	`291`	`_timeScale:1.0,`