Merge pull request cocos2d#492 from ricardoquesada/blendfunc

Improves blending function

Author: SeanLin

cocos2d/base_nodes/CCAtlasNode.js

@@ -46,11 +46,11 @@ cc.AtlasNode = cc.Node.extend(/** @lends cc.AtlasNode# */{
     _itemWidth:0,
     //! height of each char
     _itemHeight:0,
-    _colorUnmodified:new cc.Color3B(0, 0, 0),
+    _colorUnmodified:cc.c3b(0, 0, 0),
     _textureAtlas:null,
     // protocol variables
     _isOpacityModifyRGB:false,
-    _blendFunc:new cc.BlendFunc(cc.BLEND_SRC, cc.BLEND_DST),
+    _blendFunc: {src:cc.BLEND_SRC, dst:cc.BLEND_DST},
     _opacity:0,
     _color:null,
     _originalTexture:null,
@@ -216,8 +216,8 @@ cc.AtlasNode = cc.Node.extend(/** @lends cc.AtlasNode# */{
     /**
      * @param {cc.BlendFunc} blendFunc
      */
-    setBlendFunc:function (blendFunc) {
-        this._blendFunc = blendFunc;
+    setBlendFunc:function (src, dst) {
+        this._blendFunc = {src:src, dst:dst};
     },
 
     // cc.Texture protocol
@@ -280,8 +280,8 @@ cc.AtlasNode = cc.Node.extend(/** @lends cc.AtlasNode# */{
 
     _updateBlendFunc:function () {
         /* if (!this._textureAtlas.getTexture().hasPremultipliedAlpha()) {
-         this._blendFunc.src = cc.GL_SRC_ALPHA;
-         this._blendFunc.dst = cc.GL_ONE_MINUS_SRC_ALPHA;
+         this._blendFunc.src = gl.SRC_ALPHA;
+         this._blendFunc.dst = gl.ONE_MINUS_SRC_ALPHA;
          }*/
     },
 

cocos2d/base_nodes/CCdomNode.js

@@ -598,4 +598,4 @@ cc.DOM.convert = function () {
     }
 
 
-};
+};

cocos2d/layers_scenes_transitions_nodes/CCLayer.js

@@ -381,10 +381,11 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
 
     /**
      * blendFunc setter
-     * @param {cc.BlendFunc} Var
-     */
-    setBlendFunc:function (Var) {
-        this._blendFunc = Var;
+     * @param {Number} src
+     * @param {Number} dst
+    */
+    setBlendFunc:function (src, dst) {
+        this._blendFunc = {src:src, dst:dst};
     },
 
     /**

cocos2d/layers_scenes_transitions_nodes/CCTransition.js

@@ -1405,14 +1405,10 @@ cc.TransitionCrossFade = cc.TransitionScene.extend(/** @lends cc.TransitionCross
         this._outScene.visit();
         outTexture.end();
 
-        // create blend functions
-
-        var blend1 = new cc.BlendFunc(cc.GL_ONE, cc.GL_ONE); // inScene will lay on background and will not be used with alpha
-        var blend2 = cc.BlendFunc(cc.GL_SRC_ALPHA, cc.GL_ONE_MINUS_SRC_ALPHA); // we are going to blend outScene via alpha
-
-        // set blendfunctions
-        inTexture.getSprite().setBlendFunc(blend1);
-        outTexture.getSprite().setBlendFunc(blend2);
+        // inScene will lay on background and will not be used with alpha
+        inTexture.getSprite().setBlendFunc(gl.ONE, gl.ONE);
+        // we are going to blend outScene via alpha
+        outTexture.getSprite().setBlendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
 
         // add render textures to the layer
         layer.addChild(inTexture);

cocos2d/misc_nodes/CCMotionStreak.js

@@ -76,10 +76,11 @@ cc.MotionStreak = cc.Node.extend(/** @lends cc.MotionStreak# */{
     },
 
     /**
-     * @param {cc.BlendFunc} blendFunc
+     * @param {Number} src
+     * @param {Number} dst
      */
-    setBlendFunc:function (blendFunc) {
-        this._ribbon.setBlendFunc(blendFunc);
+    setBlendFunc:function (src, dst) {
+        this._ribbon.setBlendFunc(src, dst);
     },
 
     /**

cocos2d/misc_nodes/CCRenderTexture.js

@@ -168,7 +168,7 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
                 width *= cc.CONTENT_SCALE_FACTOR();
                 height *= cc.CONTENT_SCALE_FACTOR();
 
-                glGetIntegerv(cc.GL_FRAMEBUFFER_BINDING, this._oldFBO);
+                glGetIntegerv(gl.FRAMEBUFFER_BINDING, this._oldFBO);
 
                 // textures must be power of two squared
                 var powW = 0;
@@ -206,7 +206,7 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
                 glBindFramebuffer(GL_FRAMEBUFFER, this._fBO);
 
                 // associate texture with FBO
-                glFramebufferTexture2D(cc.GL_FRAMEBUFFER, cc.GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, this._texture.getName(), 0);
+                glFramebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, GL_TEXTURE_2D, this._texture.getName(), 0);
 
                 if (this._depthRenderBuffer != 0) {
                     //create and attach depth buffer
@@ -216,7 +216,7 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
                     glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, this._depthRenderBuffer);
 
                     // if depth format is the one with stencil part, bind same render buffer as stencil attachment
-                    if (depthStencilFormat == cc.GL_DEPTH24_STENCIL8)
+                    if (depthStencilFormat == gl.DEPTH24_STENCIL8)
                         glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, this._depthRenderBuffer);
                 }
 
@@ -230,8 +230,7 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
                 this._sprite.setScaleY(-1);
                 this.addChild(this._sprite);
 
-                var tBlendFunc = new cc.BlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-                this._sprite.setBlendFunc(tBlendFunc);
+                this._sprite.setBlendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
 
                 glBindRenderbuffer(GL_RENDERBUFFER, oldRBO);
                 glBindFramebuffer(GL_FRAMEBUFFER, this._oldFBO);
@@ -265,8 +264,8 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
             -1.0 / heightRatio, 1.0 / heightRatio, -1, 1);
         kmGLMultMatrix(orthoMatrix);
 
-        glGetIntegerv(cc.GL_FRAMEBUFFER_BINDING, this._oldFBO);
-        glBindFramebuffer(cc.GL_FRAMEBUFFER, this._fBO);//Will direct drawing to the frame buffer created above
+        glGetIntegerv(gl.FRAMEBUFFER_BINDING, this._oldFBO);
+        glBindFramebuffer(gl.FRAMEBUFFER, this._fBO);//Will direct drawing to the frame buffer created above
     },
 
     /**

cocos2d/particle_nodes/CCParticleBatchNode.js

@@ -58,7 +58,7 @@ cc.PARTICLE_DEFAULT_CAPACITY = 100;
 cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{
     TextureProtocol:true,
     //the blend function used for drawing the quads
-    _blendFunc:new cc.BlendFunc(cc.BLEND_SRC, cc.BLEND_DST),
+    _blendFunc:{src:cc.BLEND_SRC, dst:cc.BLEND_DST},
     _textureAtlas:null,
 
     ctor:function () {
@@ -116,7 +116,8 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{
                 cc.Assert(child.getTexture() == this._textureAtlas.getTexture(), "cc.ParticleSystem is not using the same texture id");
                 // If this is the 1st children, then copy blending function
                 if (this._children.length == 0) {
-                    this.setBlendFunc(child.getBlendFunc());
+                    var blend = child.getBlendFunc();
+                    this.setBlendFunc(blend.src, blend.dst);
                 }
 
                 cc.Assert(this._blendFunc.src == child.getBlendFunc().src && this._blendFunc.dst == pChild.getBlendFunc().dst,
@@ -307,14 +308,14 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{
         this._textureAtlas.setTexture(texture);
 
         // If the new texture has No premultiplied alpha, AND the blendFunc hasn't been changed, then update it
-        if (texture && !texture.hasPremultipliedAlpha() && ( m_tBlendFunc.src == CC_BLEND_SRC && m_tBlendFunc.dst == CC_BLEND_DST )) {
-            m_tBlendFunc.src = GL_SRC_ALPHA;
-            m_tBlendFunc.dst = GL_ONE_MINUS_SRC_ALPHA;
+        if (texture && !texture.hasPremultipliedAlpha() && ( m_tBlendFunc.src == gl.BLEND_SRC && m_tBlendFunc.dst == gl.BLEND_DST )) {
+            this._blendFunc.src = gl.SRC_ALPHA;
+            this._blendFunc.dst = gl.ONE_MINUS_SRC_ALPHA;
         }
     },
 
-    setBlendFunc:function (blendFunc) {
-        m_tBlendFunc = blendFunc;
+    setBlendFunc:function (src, dst) {
+        this._blendFunc = {src:src, dst:dst};
     },
 
     /**
@@ -457,8 +458,8 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{
 
     _updateBlendFunc:function () {
         if (!this._textureAtlas.getTexture().hasPremultipliedAlpha()) {
-            m_tBlendFunc.src = GL_SRC_ALPHA;
-            m_tBlendFunc.dst = GL_ONE_MINUS_SRC_ALPHA;
+            this._blendFunc.src = gl.SRC_ALPHA;
+            this._blendFunc.dst = gl.ONE_MINUS_SRC_ALPHA;
         }
     },
 

cocos2d/particle_nodes/CCParticleSystem.js

@@ -1029,7 +1029,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
     },
 
     /** conforms to CocosNodeTexture protocol */
-    _blendFunc:new cc.BlendFunc(0, 0),
+    _blendFunc: {src:gl.ONE, dst:gl.ONE},
     /**
      * get BlendFunc of Particle System
      * @return {cc.BlendFunc}
@@ -1040,11 +1040,12 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
 
     /**
      * set BlendFunc of Particle System
-     * @param {cc.BlendFunc} blendFunc
+     * @param {Number} src
+     * @param {Number} dst
      */
-    setBlendFunc:function (blendFunc) {
-        if (this._blendFunc.src != blendFunc.src || this._blendFunc.dst != blendFunc.dst) {
-            this._blendFunc = blendFunc;
+    setBlendFunc:function (src, dst) {
+        if (this._blendFunc.src != src || this._blendFunc.dst != dst) {
+            this._blendFunc = {src:src, dst:dst};
             this._updateBlendFunc();
         }
     },
@@ -1078,7 +1079,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
      */
     isBlendAdditive:function () {
         //return this._isBlendAdditive;
-        return( this._blendFunc.src == cc.GL_SRC_ALPHA && this._blendFunc.dst == cc.GL_ONE);
+        return( this._blendFunc.src == gl.SRC_ALPHA && this._blendFunc.dst == gl.ONE);
     },
 
     /**
@@ -1091,14 +1092,14 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
         //TODO
         this._isBlendAdditive = isBlendAdditive;
         if (isBlendAdditive) {
-            this._blendFunc.src = cc.GL_SRC_ALPHA;
-            this._blendFunc.dst = cc.GL_ONE;
+            this._blendFunc.src = gl.SRC_ALPHA;
+            this._blendFunc.dst = gl.ONE;
         } else {
             this._blendFunc.src = cc.BLEND_SRC;
             this._blendFunc.dst = cc.BLEND_DST;
             /*if (this._texture && !this._texture.hasPremultipliedAlpha()) {
-             this._blendFunc.src = GL_SRC_ALPHA;
-             this._blendFunc.dst = GL_ONE_MINUS_SRC_ALPHA;
+             this._blendFunc.src = gl.SRC_ALPHA;
+             this._blendFunc.dst = gl.ONE_MINUS_SRC_ALPHA;
              } else {
              this._blendFunc.src = cc.BLEND_SRC;
              this._blendFunc.dst = cc.BLEND_DST;
@@ -1173,7 +1174,7 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
         this._emitterMode = cc.PARTICLE_MODE_GRAVITY;
         this.modeA = new cc.ParticleSystem.ModeA();
         this.modeB = new cc.ParticleSystem.ModeB();
-        this._blendFunc = new cc.BlendFunc(cc.BLEND_SRC, cc.BLEND_DST);
+        this._blendFunc = {src:cc.BLEND_SRC, dst:cc.BLEND_DST};
     },
 
     /**
@@ -1764,8 +1765,8 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
                     if (premultiplied) {
                         this._opacityModifyRGB = true;
                     } else {
-                        this._blendFunc.src = cc.GL_SRC_ALPHA;
-                        this._blendFunc.dst = cc.GL_ONE_MINUS_SRC_ALPHA;
+                        this._blendFunc.src = gl.SRC_ALPHA;
+                        this._blendFunc.dst = gl.ONE_MINUS_SRC_ALPHA;
                     }
                 }
             }

cocos2d/platform/CCMacro.js

@@ -136,9 +136,6 @@ cc.BLEND_SRC = cc.OPTIMIZE_BLEND_FUNC_FOR_PREMULTIPLIED_ALPHA ? 1 : 0x0302;
  */
 cc.BLEND_DST = 0x0303;
 
-cc.GL_ONE = 1;
-cc.GL_SRC_ALPHA = 0x0302;
-
 /**
  * Helpful macro that setups the GL server state, the correct GL program and sets the Model View Projection matrix
  * @param {cc.Node} node setup node
@@ -285,3 +282,101 @@ cc.RECT_POINTS_TO_PIXELS = cc.IS_RETINA_DISPLAY_SUPPORTED ? function (point) {
 } : function (p) {
     return p;
 };
+
+
+//
+// WebGL constants
+//
+var gl = gl || {};
+/**
+ * @constant
+ * @type Number
+ */
+gl.NEAREST                      = 0x2600;
+
+/**
+ * @constant
+ * @type Number
+ */
+gl.LINEAR                       = 0x2601;
+/**
+ * @constant
+ * @type Number
+ */
+gl.REPEAT                       = 0x2901;
+/**
+ * @constant
+ * @type Number
+ */
+gl.CLAMP_TO_EDGE                = 0x812F;
+/**
+ * @constant
+ * @type Number
+ */
+gl.CLAMP_TO_BORDER              = 0x812D;
+/**
+ * @constant
+ * @type Number
+ */
+gl.LINEAR_MIPMAP_NEAREST        = 0x2701;
+/**
+ * @constant
+ * @type Number
+ */
+gl.NEAREST_MIPMAP_NEAREST       = 0x2700;
+/**
+ * @constant
+ * @type Number
+ */
+gl.ZERO                         = 0;
+/**
+ * @constant
+ * @type Number
+ */
+gl.ONE                          = 1;
+/**
+ * @constant
+ * @type Number
+ */
+gl.SRC_COLOR                    = 0x0300;
+/**
+ * @constant
+ * @type Number
+ */
+gl.ONE_MINUS_SRC_COLOR          = 0x0301;
+/**
+ * @constant
+ * @type Number
+ */
+gl.SRC_ALPHA                    = 0x0302;
+/**
+ * @constant
+ * @type Number
+ */
+gl.ONE_MINUS_SRC_ALPHA          = 0x0303;
+/**
+ * @constant
+ * @type Number
+ */
+gl.DST_ALPHA                    = 0x0304;
+/**
+ * @constant
+ * @type Number
+ */
+gl.ONE_MINUS_DST_ALPHA          = 0x0305;
+/**
+ * @constant
+ * @type Number
+ */
+gl.DST_COLOR                    = 0x0306;
+/**
+ * @constant
+ * @type Number
+ */
+gl.ONE_MINUS_DST_COLOR          = 0x0307;
+/**
+ * @constant
+ * @type Number
+ */
+gl.SRC_ALPHA_SATURATE           = 0x0308;
+