Fixing color/opacity rendering issue with CCAtlastNodeWebGLRendering. Fixing missing function call to setUniformsForBuiltins in TextureWebGL

Author: David DeSimone

cocos2d/core/base-nodes/CCAtlasNodeWebGLRenderCmd.js

@@ -32,12 +32,14 @@
         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);
@@ -69,8 +71,8 @@
         this._glProgramState.apply(this._matrix);
 
         cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
-        if (this._colorF32Array) {
-            this._glProgramState.setUniformVec4v("u_color", this._colorF32Array);
+        if (this._uniformColor && this._colorF32Array) {
+            context.uniform4fv(this._uniformColor, this._colorF32Array);
             this._textureAtlas.drawNumberOfQuads(node.quadsToDraw, 0);
         }
     };

cocos2d/core/textures/TexturesWebGL.js

@@ -340,6 +340,7 @@ cc._tmp.WebGLTexture2D = function () {
                 width + point.x, height + point.y, 0.0];
 
             self._glProgramState.apply();
+            self._glProgramState._glprogram.setUniformsForBuiltins();
 
             cc.glBindTexture2D(self);
 
@@ -369,6 +370,7 @@ cc._tmp.WebGLTexture2D = function () {
                 rect.x + rect.width, rect.y + rect.height        /*0.0*/];
 
             self._glProgramState.apply();
+            self._glProgramState._glprogram.setUniformsForBuiltins();
 
             cc.glBindTexture2D(self);