Fixing rendering issues in CCAtlastNodeWebGLRenderCmd and CCGrid.

Author: David DeSimone

cocos2d/core/base-nodes/CCAtlasNodeWebGLRenderCmd.js

@@ -32,14 +32,12 @@
         this._textureAtlas = null;
         this._colorUnmodified = cc.color.WHITE;
         this._colorF32Array = null;
-        this._uniformColor = null;
 
         this._matrix = new cc.math.Matrix4();
         this._matrix.identity();
 
         //shader stuff
         this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURE_UCOLOR);
-        this._uniformColor = cc._renderContext.getUniformLocation(this._shaderProgram.getProgram(), "u_color");
     };
 
     var proto = cc.AtlasNode.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype);
@@ -71,8 +69,8 @@
         this._glProgramState.apply(this._matrix);
 
         cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
-        if (this._uniformColor && this._colorF32Array) {
-            context.uniform4fv(this._uniformColor, this._colorF32Array);
+        if (this._colorF32Array) {
+            this._glProgramState.setUniformVec4v("u_color", this._colorF32Array);
             this._textureAtlas.drawNumberOfQuads(node.quadsToDraw, 0);
         }
     };

cocos2d/effects/CCGrid.js

@@ -39,7 +39,7 @@ cc.GridBase = cc.Class.extend(/** @lends cc.GridBase# */{
     _step: null,
     _grabber: null,
     _isTextureFlipped: false,
-    _shaderProgram: null,
+    _glProgramState: null,
     _directorProjection: 0,
 
     _dirty: false,
@@ -62,7 +62,7 @@ cc.GridBase = cc.Class.extend(/** @lends cc.GridBase# */{
         this._step = cc.p(0, 0);
         this._grabber = null;
         this._isTextureFlipped = false;
-        this._shaderProgram = null;
+        this._glProgramState = null;
         this._directorProjection = 0;
         this._dirty = false;
 
@@ -227,7 +227,7 @@ cc.GridBase = cc.Class.extend(/** @lends cc.GridBase# */{
         if (!this._grabber)
             return false;
         this._grabber.grab(this._texture);
-        this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURE);
+        this._glProgramState = cc.GLProgramState.getOrCreateWithGLProgram(cc.shaderCache.programForKey(cc.SHADER_POSITION_TEXTURE));
         this.calculateVertexPoints();
         return true;
     },

cocos2d/shaders/CCGLProgramState.js

@@ -24,9 +24,6 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-// @TODO add floatv and intv methods, that take arrays
-// and float1..4 methods, which take arguments. 
-
 var types = 
 	{
 		GL_FLOAT: 0,
@@ -122,8 +119,8 @@ cc.UniformValue = cc.Class.extend({
 					this._value[1], this._value[2]);
 				break;
 			case types.GL_FLOAT_VEC4:
-				this._glprogram.setUniformLocationWith3f(this._uniform.location, this._value[0], 
-					this._value[1], this._value[2]);
+				this._glprogram.setUniformLocationWith4f(this._uniform.location, this._value[0], 
+					this._value[1], this._value[2], this._value[3]);
 				break;
 			case types.GL_FLOAT_MAT4:
 				this._glprogram.setUniformLocationWithMatrix4fv(this._uniform.location, this._value);
@@ -136,7 +133,7 @@ cc.UniformValue = cc.Class.extend({
 				cc.glBindTexture2DN(this._value, this._textureId);
 				break;
 			default:
-				cc.Assert(false, "Unsupported type");
+				;
 		}
 	},
 });