fixed cocos2d#2288 Re-write CCGrid, CCMotionStreak , CCProgressTimer with TypeArray

Author: dingpinglv

cocos2d/effects/CCGrid.js

@@ -362,8 +362,14 @@ cc.Grid3D = cc.GridBase.extend(/** @lends cc.Grid3D# */{
         this._texCoordinates = new Float32Array(numOfPoints * 2);
         this._indices = new Uint16Array(this._gridSize.width * this._gridSize.height * 6);
 
+        if(this._verticesBuffer)
+            gl.deleteBuffer(this._verticesBuffer);
         this._verticesBuffer = gl.createBuffer();
+        if(this._texCoordinateBuffer)
+            gl.deleteBuffer(this._texCoordinateBuffer);
         this._texCoordinateBuffer = gl.createBuffer();
+        if(this._indicesBuffer)
+            gl.deleteBuffer(this._indicesBuffer);
         this._indicesBuffer = gl.createBuffer();
 
         var x, y, i;
@@ -388,10 +394,10 @@ cc.Grid3D = cc.GridBase.extend(/** @lends cc.Grid3D# */{
                 this._indices[idx * 6 + 5] = d;
 
                 var l1 = [a * 3, b * 3, c * 3, d * 3];
-                var e = new cc.Vertex3F(x1, y1, 0);
-                var f = new cc.Vertex3F(x2, y1, 0);
-                var g = new cc.Vertex3F(x2, y2, 0);
-                var h = new cc.Vertex3F(x1, y2, 0);
+                var e = {x:x1, y:y1, z:0};   //new cc.Vertex3F(x1, y1, 0);
+                var f = {x:x2, y:y1, z:0};   //new cc.Vertex3F(x2, y1, 0);
+                var g = {x:x2, y:y2, z:0};   // new cc.Vertex3F(x2, y2, 0);
+                var h = {x:x1, y:y2, z:0};   //new cc.Vertex3F(x1, y2, 0);
 
                 var l2 = [e, f, g, h];
                 var tex1 = [a * 2, b * 2, c * 2, d * 2];
@@ -555,8 +561,14 @@ cc.TiledGrid3D = cc.GridBase.extend(/** @lends cc.TiledGrid3D# */{
         this._indices = new Uint16Array(numQuads * 6);
 
         var gl = cc.renderContext;
+        if(this._verticesBuffer)
+            gl.deleteBuffer(this._verticesBuffer);
         this._verticesBuffer = gl.createBuffer();
+        if(this._texCoordinateBuffer)
+            gl.deleteBuffer(this._texCoordinateBuffer);
         this._texCoordinateBuffer = gl.createBuffer();
+        if(this._indicesBuffer)
+            gl.deleteBuffer(this._indicesBuffer);
         this._indicesBuffer = gl.createBuffer();
 
         var x, y, i = 0;

cocos2d/misc_nodes/CCMotionStreak.js

@@ -62,6 +62,7 @@ cc.MotionStreak = cc.Node.extend(/** @lends cc.MotionStreak# */{
     _vertices:null,
     _colorPointer:null,
     _texCoords:null,
+
     _verticesBuffer:null,
     _colorPointerBuffer:null,
     _texCoordsBuffer:null,
@@ -133,6 +134,17 @@ cc.MotionStreak = cc.Node.extend(/** @lends cc.MotionStreak# */{
         this._positionR = cc.PointZero();
         this._color = cc.c3(0, 0, 0);
         this._blendFunc = new cc.BlendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
+        this._vertexWebGLBuffer = cc.renderContext.createBuffer();
+    },
+
+    onExit:function(){
+        cc.Node.prototype.onExit.call(this);
+        if(this._verticesBuffer)
+            cc.renderContext.deleteBuffer(this._verticesBuffer);
+        if(this._texCoordsBuffer)
+            cc.renderContext.deleteBuffer(this._texCoordsBuffer);
+        if(this._colorPointerBuffer)
+            cc.renderContext.deleteBuffer(this._colorPointerBuffer);
     },
 
     isFastMode:function () {
@@ -216,7 +228,6 @@ cc.MotionStreak = cc.Node.extend(/** @lends cc.MotionStreak# */{
         gl.bufferData(gl.ARRAY_BUFFER, this._texCoords, gl.DYNAMIC_DRAW);
         gl.bindBuffer(gl.ARRAY_BUFFER, this._colorPointerBuffer);
         gl.bufferData(gl.ARRAY_BUFFER, this._colorPointer, gl.DYNAMIC_DRAW);
-        this._isDirty = true;
 
         return true;
     },
@@ -234,7 +245,6 @@ cc.MotionStreak = cc.Node.extend(/** @lends cc.MotionStreak# */{
             this._colorPointer[i * 4 + 1] = colors.g;
             this._colorPointer[i * 4 + 2] = colors.b;
         }
-        this._isDirty = true;
     },
 
     /**
@@ -285,7 +295,7 @@ cc.MotionStreak = cc.Node.extend(/** @lends cc.MotionStreak# */{
             ctx.vertexAttribPointer(cc.VERTEX_ATTRIB_COLOR, 4, ctx.UNSIGNED_BYTE, true, 0, 0);
 
             ctx.drawArrays(ctx.TRIANGLE_STRIP, 0, this._nuPoints * 2);
-            cc.INCREMENT_GL_DRAWS(1);
+            cc.g_NumberOfDraws ++;
         }
     },