added color boost, adds color constant onto color of a sprite in the shader

Author: Travis Gesslein

cocos2d/core/base-nodes/CCNode.js

@@ -171,6 +171,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
 
     _realOpacity: 255,
     _realColor: null,
+    _colorBoost: 0,
     _cascadeColorEnabled: false,
     _cascadeOpacityEnabled: false,
 
@@ -306,7 +307,17 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
     getSkewX: function () {
         return this._skewX;
     },
-
+    //adds a constant to every component of the displayed color of the entity
+    setColorBoost: function(value)
+    {
+        this._colorBoost = value;
+        this._renderCmd.setDirtyFlag(cc.Node._dirtyFlags.colorDirty);
+        this._renderCmd._updateDisplayColor();
+    },
+    getColorBoost: function()
+    {
+        return this._colorBoost;
+    },
     /**
      * <p>
      * Changes the X skew angle of the node in degrees.                                                    <br/>

cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js

@@ -70,6 +70,7 @@ cc.Node.RenderCmd = function(renderable){
 
     this._displayedOpacity = 255;
     this._displayedColor = cc.color(255, 255, 255, 255);
+    this._displayedColorBoost = 0;
     this._cascadeColorEnabledDirty = false;
     this._cascadeOpacityEnabledDirty = false;
     this._frame = -1;
@@ -132,20 +133,23 @@ cc.Node.RenderCmd.prototype = {
         return null;
     },
 
-    _updateDisplayColor: function (parentColor) {
+    _updateDisplayColor: function (parentColor, parentBoost) {
        var node = this._node;
        var locDispColor = this._displayedColor, locRealColor = node._realColor;
+       parentBoost = parentBoost || 0;
        var i, len, selChildren, item;
        if (this._cascadeColorEnabledDirty && !node._cascadeColorEnabled) {
            locDispColor.r = locRealColor.r;
            locDispColor.g = locRealColor.g;
            locDispColor.b = locRealColor.b;
+           this._displayedColorBoost = node._colorBoost;
+
            var whiteColor = new _cc.Color(255, 255, 255, 255);
            selChildren = node._children;
            for (i = 0, len = selChildren.length; i < len; i++) {
                item = selChildren[i];
                if (item && item._renderCmd)
-                   item._renderCmd._updateDisplayColor(whiteColor);
+                   item._renderCmd._updateDisplayColor(whiteColor, 0);
            }
            this._cascadeColorEnabledDirty = false;
        } else {
@@ -159,12 +163,14 @@ cc.Node.RenderCmd.prototype = {
            locDispColor.r = 0 | (locRealColor.r * parentColor.r / 255.0);
            locDispColor.g = 0 | (locRealColor.g * parentColor.g / 255.0);
            locDispColor.b = 0 | (locRealColor.b * parentColor.b / 255.0);
+           this._displayedColorBoost = node._colorBoost + parentBoost;
+
            if (node._cascadeColorEnabled) {
                selChildren = node._children;
                for (i = 0, len = selChildren.length; i < len; i++) {
                    item = selChildren[i];
                    if (item && item._renderCmd){
-                       item._renderCmd._updateDisplayColor(locDispColor);
+                       item._renderCmd._updateDisplayColor(locDispColor, this._displayedColorBoost);
                        item._renderCmd._updateColor();
                    }
                }
@@ -207,8 +213,9 @@ cc.Node.RenderCmd.prototype = {
         this._dirtyFlag = this._dirtyFlag & _cc.Node._dirtyFlags.opacityDirty ^ this._dirtyFlag;
     },
 
-    _syncDisplayColor : function (parentColor) {
+    _syncDisplayColor : function (parentColor, parentBoost) {
         var node = this._node, locDispColor = this._displayedColor, locRealColor = node._realColor;
+        parentBoost = parentBoost || 0;
         if (parentColor === undefined) {
             var locParent = node._parent;
             if (locParent && locParent._cascadeColorEnabled)
@@ -219,6 +226,7 @@ cc.Node.RenderCmd.prototype = {
         locDispColor.r = 0 | (locRealColor.r * parentColor.r / 255.0);
         locDispColor.g = 0 | (locRealColor.g * parentColor.g / 255.0);
         locDispColor.b = 0 | (locRealColor.b * parentColor.b / 255.0);
+        this._displayedColorBoost = node._colorBoost + parentBoost;
     },
 
     _syncDisplayOpacity : function (parentOpacity) {

cocos2d/core/platform/CCTypesWebGL.js

@@ -713,22 +713,21 @@ cc.makeVertexFormat = function(location, components, type, normalize, stride, of
     };
 }
 
-cc.flatQuadSetColor = function(u32View, r,g,b,a)
+cc.flatQuadSetColor = function(u32View, float32View, r,g,b, colorScale, a)
 {
+    
     var u8View = new Uint8Array(u32View.buffer)
-    /*
-    var offset = 3; //first 3 4byte sets are positions
-    var stride = cc.V3F_C4B_T2F.BYTES_PER_ELEMENT/4;
-
-    var value = (r << 24) | (g << 16) | (b << 8) | a;
-    u32View[offset] = value;
-    u32View[offset + stride] = value;
-    u32View[offset + stride * 2] = value;
-    u32View[offset + stride * 3] = value;*/
 
     var offset = 12; //first 3 4byte sets are positions
     var stride = cc.V3F_C4B_T2F.BYTES_PER_ELEMENT;
-
+    var stride4 = stride/4; 
+    //we squeeze the color scale into the z position of the u32 view!
+    float32View[2] = colorScale;
+    float32View[2 + stride4] = colorScale;
+    float32View[2 + stride4 * 2] = colorScale;
+    float32View[2 + stride4 * 3] = colorScale;
+    
+    //now the color data
     u8View[offset] = r;
     u8View[offset+1] = g;
     u8View[offset+2] = b;

cocos2d/core/renderer/RendererWebGL.js

@@ -66,9 +66,10 @@ cc.rendererWebGL = {
             formats: []
         };
 
-        vertexDataFormat.formats.push(cc.makeVertexFormat(0, 3, gl.FLOAT, false, 24, 0));
-        vertexDataFormat.formats.push(cc.makeVertexFormat(1, 4, gl.UNSIGNED_BYTE, true, 24, 12));
-        vertexDataFormat.formats.push(cc.makeVertexFormat(2, 2, gl.FLOAT, false, 24, 16));
+        var bytesPerVertex = 24;
+        vertexDataFormat.formats.push(cc.makeVertexFormat(0, 3, gl.FLOAT, false, bytesPerVertex, 0));
+        vertexDataFormat.formats.push(cc.makeVertexFormat(1, 4, gl.UNSIGNED_BYTE, true, bytesPerVertex, 12));
+        vertexDataFormat.formats.push(cc.makeVertexFormat(2, 2, gl.FLOAT, false, bytesPerVertex, 16));
         formats.push(vertexDataFormat);
 
         var matrixDataFormat = {

cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js

@@ -29,6 +29,7 @@
         cc.QuadRenderCmdBase.call(this, renderable);
         this._needDraw = true;
         this._quadU32View = new Uint32Array(cc.V3F_C4B_T2F_Quad.BYTES_PER_ELEMENT / 4);
+        this._float32View = new Float32Array(this._quadU32View.buffer);
         this._firstQuad = -1;
         this._batchedCount = 1;
     };
@@ -55,7 +56,7 @@
     };
 
     proto._init = function () {
-        cc.flatQuadSetColor(this._quadU32View, 255, 255, 255, 255);
+        cc.flatQuadSetColor(this._quadU32View,this._float32View, 255, 255, 255, 0, 255);
     };
 
     proto._updateQuadVertices = function()
@@ -193,7 +194,7 @@
             b *= locDisplayedOpacity / 255.0;
         }
 
-        cc.flatQuadSetColor(this._quadU32View, r, g, b, locDisplayedOpacity);
+        cc.flatQuadSetColor(this._quadU32View,this._float32View, r, g, b,this._displayedColorBoost, locDisplayedOpacity);
 
         this._quadDirty = true;
     };

cocos2d/shaders/CCShaders.js

@@ -217,9 +217,11 @@ cc.SHADER_POSITION_TEXTURE_COLOR_FRAG =
         "precision lowp float;\n"
         + "varying vec4 v_fragmentColor; \n"
         + "varying vec2 v_texCoord; \n"
+        + "varying float v_colorScale; \n"
         + "void main() \n"
         + "{ \n"
-        + "    gl_FragColor = v_fragmentColor * texture2D(CC_Texture0, v_texCoord); \n"
+        + "  vec4 colorBoost = vec4(v_colorScale,v_colorScale,v_colorScale,0); \n"
+        + "    gl_FragColor = v_fragmentColor * texture2D(CC_Texture0, v_texCoord) + colorBoost; \n"
         + "}";
 
 /* PITFOREST 
@@ -231,12 +233,14 @@ cc.SHADER_POSITION_TEXTURE_COLOR_VERT_BATCHED =
         + "attribute mat4 a_mvMatrix;"
         + "varying lowp vec4 v_fragmentColor; \n"
         + "varying mediump vec2 v_texCoord; \n"
+        + "varying float v_colorScale; \n"
         + "void main() \n"
         + "{ \n"
         //+ "    gl_Position = CC_MVPMatrix * a_position;  \n"
-        + "    gl_Position = (CC_PMatrix * a_mvMatrix) * a_position;  \n"
+        + "    gl_Position = (CC_PMatrix * a_mvMatrix) * vec4(a_position.xy,1.0,1.0);  \n"
         + "    v_fragmentColor = a_color; \n"
         + "    v_texCoord = a_texCoord; \n"
+        +"    v_colorScale = a_position.z; \n"
         + "}";
 
 /**
@@ -249,12 +253,14 @@ cc.SHADER_POSITION_TEXTURE_COLOR_VERT =
         + "attribute vec4 a_color;  \n"
         + "varying lowp vec4 v_fragmentColor; \n"
         + "varying mediump vec2 v_texCoord; \n"
+         + "varying float v_colorScale; \n"
         + "void main() \n"
         + "{ \n"
         //+ "    gl_Position = CC_MVPMatrix * a_position;  \n"
-        + "    gl_Position = (CC_PMatrix * CC_MVMatrix) * a_position;  \n"
+        + "    gl_Position = (CC_PMatrix * CC_MVMatrix) * vec4(a_position.xy,1.0,1.0);  \n"
         + "    v_fragmentColor = a_color; \n"
         + "    v_texCoord = a_texCoord; \n"
+         +"    v_colorScale = a_position.z; \n"
         + "}";
 
 //-----------------------Shader_PositionTextureColorAlphaTest_frag Shader Source----------------------------
@@ -266,10 +272,12 @@ cc.SHADER_POSITION_TEXTURE_COLOR_ALPHATEST_FRAG =
         "precision lowp float;   \n"
         + "varying vec4 v_fragmentColor; \n"
         + "varying vec2 v_texCoord;   \n"
+        + "varying float v_colorScale; \n"
         + "uniform float CC_alpha_value; \n"
         + "void main() \n"
         + "{  \n"
-        + "    vec4 texColor = texture2D(CC_Texture0, v_texCoord, mipmapBias);  \n"
+        + "  vec4 colorBoost = vec4(v_colorScale,v_colorScale,v_colorScale,0); \n"
+        + "    vec4 texColor = texture2D(CC_Texture0, v_texCoord, mipmapBias)  + colorBoost;  \n"
         // mimic: glAlphaFunc(GL_GREATER)
         //pass if ( incoming_pixel >= CC_alpha_value ) => fail if incoming_pixel < CC_alpha_value
         + "    if ( texColor.a <= CC_alpha_value )          \n"