Merge pull request #3425 from zilongshanren/fix-uislider-gray-state

Fix uislider gray state

Author: pandamicro

cocos2d/core/platform/CCMacro.js

@@ -620,6 +620,11 @@ cc.SHADER_POSITION_TEXTURECOLOR = "ShaderPositionTextureColor";
  * @type {String}
  */
 cc.SHADER_SPRITE_POSITION_TEXTURECOLOR = "ShaderSpritePositionTextureColor";
+/**
+ * @constant
+ * @type {String}
+ */
+cc.SHADER_SPRITE_POSITION_TEXTURECOLOR_GRAY = "ShaderSpritePositionTextureColorGray";
 /**
  * @constant
  * @type {String}

cocos2d/shaders/CCShaderCache.js

@@ -102,7 +102,13 @@ cc.shaderCache = /** @lends cc.shaderCache# */{
      * @constant
      * @type {Number}
      */
-    TYPE_MAX: 10,
+    TYPE_SPRITE_POSITION_TEXTURECOLOR_GRAY: 11,
+    /**
+     * @public
+     * @constant
+     * @type {Number}
+     */
+    TYPE_MAX: 11,
 
     _programs: {},
 
@@ -124,7 +130,13 @@ cc.shaderCache = /** @lends cc.shaderCache# */{
                 program.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION);
                 program.addAttribute(cc.ATTRIBUTE_NAME_COLOR, cc.VERTEX_ATTRIB_COLOR);
                 program.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS);
-                break;
+              break;
+            case cc.SHADER_SPRITE_POSITION_TEXTURECOLOR_GRAY:
+              program.initWithVertexShaderByteArray(cc.SHADER_SPRITE_POSITION_TEXTURE_COLOR_VERT, cc.SHADER_SPRITE_POSITION_TEXTURE_COLOR_GRAY_FRAG);
+              program.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION);
+              program.addAttribute(cc.ATTRIBUTE_NAME_COLOR, cc.VERTEX_ATTRIB_COLOR);
+              program.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS);
+              break;
             case cc.SHADER_POSITION_TEXTURECOLORALPHATEST:
                 program.initWithVertexShaderByteArray(cc.SHADER_POSITION_TEXTURE_COLOR_VERT, cc.SHADER_POSITION_TEXTURE_COLOR_ALPHATEST_FRAG);
                 program.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION);
@@ -230,6 +242,11 @@ cc.shaderCache = /** @lends cc.shaderCache# */{
         program.reset();
         this._loadDefaultShader(program, this.TYPE_POSITION_TEXTURE);
 
+        //Position Texture Gray shader
+        program = this.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURE_COLOR_GRAY_FRAG);
+        program.reset();
+        this._loadDefaultShader(program, this.TYPE_SPRITE_POSITION_TEXTURECOLOR_GRAY);
+
         //
         // Position, Texture attribs, 1 Color as uniform shader
         //
@@ -283,4 +300,4 @@ cc.shaderCache = /** @lends cc.shaderCache# */{
     addProgram: function (program, key) {
         this._programs[key] = program;
     }
-};
+};

cocos2d/shaders/CCShaders.js

@@ -262,8 +262,18 @@ cc.SHADER_SPRITE_POSITION_TEXTURE_COLOR_VERT =
         + "    gl_Position = CC_PMatrix * a_position;  \n"
         + "    v_fragmentColor = a_color; \n"
         + "    v_texCoord = a_texCoord; \n"
-        + "}";
+    + "}";
 
+cc.SHADER_SPRITE_POSITION_TEXTURE_COLOR_GRAY_FRAG =
+        "precision lowp float;\n"
+        + "varying vec4 v_fragmentColor; \n"
+        + "varying vec2 v_texCoord; \n"
+        + "void main() \n"
+        + "{ \n"
+        + "    vec4 c = texture2D(CC_Texture0, v_texCoord); \n"
+        + "    gl_FragColor.xyz = vec3(0.2126*c.r + 0.7152*c.g + 0.0722*c.b); \n"
+        +"     gl_FragColor.w = c.w ; \n"
+        + "}";
 //-----------------------Shader_PositionTextureColorAlphaTest_frag Shader Source----------------------------
 /**
  * @constant
@@ -301,4 +311,4 @@ cc.SHADEREX_SWITCHMASK_FRAG =
         + "    vec4 maskColor  = texture2D(u_mask, v_texCoord); \n"
         + "    vec4 finalColor = vec4(texColor.r, texColor.g, texColor.b, maskColor.a * texColor.a);        \n"
         + "    gl_FragColor    = v_fragmentColor * finalColor; \n"
-        + "}";
+        + "}";

extensions/ccui/base-classes/UIScale9SpriteWebGLRenderCmd.js

@@ -151,39 +151,9 @@
         if (state === Scale9Sprite.state.NORMAL) {
             this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLOR);
         } else if (state === Scale9Sprite.state.GRAY) {
-            this._shaderProgram = Scale9Sprite.WebGLRenderCmd._getGrayShaderProgram();
+            this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLOR_GRAY);
         }
     };
 
-    Scale9Sprite.WebGLRenderCmd._grayShaderProgram = null;
-    Scale9Sprite.WebGLRenderCmd._getGrayShaderProgram = function(){
-        var grayShader = Scale9Sprite.WebGLRenderCmd._grayShaderProgram;
-        if (grayShader)
-            return grayShader;
-
-        grayShader = new cc.GLProgram();
-        grayShader.initWithVertexShaderByteArray(cc.SHADER_SPRITE_POSITION_TEXTURE_COLOR_VERT,
-                                                 ccui.Scale9Sprite.WebGLRenderCmd._grayShaderFragment);
-        grayShader.addAttribute(cc.ATTRIBUTE_NAME_POSITION, cc.VERTEX_ATTRIB_POSITION);
-        grayShader.addAttribute(cc.ATTRIBUTE_NAME_COLOR, cc.VERTEX_ATTRIB_COLOR);
-        grayShader.addAttribute(cc.ATTRIBUTE_NAME_TEX_COORD, cc.VERTEX_ATTRIB_TEX_COORDS);
-        grayShader.link();
-        grayShader.updateUniforms();
-
-        Scale9Sprite.WebGLRenderCmd._grayShaderProgram = grayShader;
-        return grayShader;
-    };
-
-    Scale9Sprite.WebGLRenderCmd._grayShaderFragment =
-        "precision lowp float;\n"
-        + "varying vec4 v_fragmentColor; \n"
-        + "varying vec2 v_texCoord; \n"
-        + "void main() \n"
-        + "{ \n"
-        + "    vec4 c = texture2D(CC_Texture0, v_texCoord); \n"
-        + "    gl_FragColor.xyz = vec3(0.2126*c.r + 0.7152*c.g + 0.0722*c.b); \n"
-        +"     gl_FragColor.w = c.w ; \n"
-        + "}";
-
 
 })();

extensions/ccui/base-classes/UIWidget.js

@@ -1692,6 +1692,14 @@ ccui.Widget = ccui.ProtectedNode.extend(/** @lends ccui.Widget# */{
         cc.arrayRemoveObject(this._nodes, node);
     },
 
+    _getNormalGLProgram: function () {
+        return cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLOR);
+    },
+
+    _getGrayGLProgram: function () {
+        return cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLOR_GRAY);
+    },
+
     /**
      * Removes node by tag
      * @deprecated since v3.0, please use removeChildByTag instead.

extensions/ccui/uiwidgets/UIButton.js

@@ -460,9 +460,7 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
     _onPressStateChangedToNormal: function () {
         this._buttonScale9Renderer.setSpriteFrame(this._buttonNormalSpriteFrame);
 
-        if (this._scale9Enabled) {
-            this._buttonScale9Renderer.setState( ccui.Scale9Sprite.state.NORMAL);
-        }
+        this._buttonScale9Renderer.setState( ccui.Scale9Sprite.state.NORMAL);
 
         if (this._pressedTextureLoaded) {
             if (this.pressedActionEnabled){
@@ -500,9 +498,7 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
     },
 
     _onPressStateChangedToPressed: function () {
-        if (this._scale9Enabled) {
-            this._buttonScale9Renderer.setState(ccui.Scale9Sprite.state.NORMAL);
-        }
+        this._buttonScale9Renderer.setState(ccui.Scale9Sprite.state.NORMAL);
 
         if (this._pressedTextureLoaded) {
             this._buttonScale9Renderer.setSpriteFrame(this._buttonClickedSpriteFrame);
@@ -539,7 +535,7 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{
     _onPressStateChangedToDisabled: function () {
         //if disable resource is null
         if (!this._disabledTextureLoaded){
-            if (this._normalTextureLoaded && this._scale9Enabled) {
+            if (this._normalTextureLoaded) {
                 this._buttonScale9Renderer.setState(ccui.Scale9Sprite.state.GRAY);
             }
         }else{

extensions/ccui/uiwidgets/UISlider.js

@@ -648,6 +648,7 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
         this._slidBallDisabledRenderer.setVisible(false);
 
         this._slidBallNormalRenderer.setScale(this._sliderBallNormalTextureScaleX, this._sliderBallNormalTextureScaleY);
+        this._slidBallNormalRenderer._renderCmd._shaderProgram = this._getNormalGLProgram();
     },
 
     _onPressStateChangedToPressed: function () {
@@ -658,12 +659,16 @@ ccui.Slider = ccui.Widget.extend(/** @lends ccui.Slider# */{
             this._slidBallPressedRenderer.setVisible(true);
             this._slidBallDisabledRenderer.setVisible(false);
         }
+        this._slidBallNormalRenderer._renderCmd._shaderProgram = this._getNormalGLProgram();
     },
 
     _onPressStateChangedToDisabled: function () {
         if (this._slidBallDisabledTextureFile) {
             this._slidBallNormalRenderer.setVisible(false);
             this._slidBallDisabledRenderer.setVisible(true);
+        } else {
+            this._slidBallNormalRenderer.setVisible(true);
+            this._slidBallNormalRenderer._renderCmd._shaderProgram = this._getGrayGLProgram();
         }
         this._slidBallNormalRenderer.setScale(this._sliderBallNormalTextureScaleX, this._sliderBallNormalTextureScaleY);
         this._slidBallPressedRenderer.setVisible(false);