Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2280_FixVideoMomeryBug

Author: dingpinglv

CHANGELOG.txt

@@ -1,18 +1,18 @@
 Cocos2d-html5-v2.1.4 @ Jun.12, 2013
-* Added support for Multi resources loading
-* Performance optimization for sprite performance tests 220%
-* Sync audio api to JSB
-* Added auto test for NodeTests
-* Changed textureKeyName to full path when removeTextureForKey
+* Added support for multiple resources loading. This mechanic is the same as cocos2d-x now
+* Optimised "Performance Tests -> Sprites Test", and increased its benchmark to 220%!
+* Migrated audio (CocosDenshion) API to keep the same as Cocos2d JS API
+* Added auto test for NodeTests and TilemapTests
+* Changed CCTextureCache member functions such as addImage(path), addImageAysnc(path), removeTextureForKey(key) from using relative path to absolute path
 * Added support for particle batch node
 
-*Bug fix:
-  1. PreLoading on iOS5.1.1
-  2. cc.Menu / cc.MenuItemImage remain touchable after replaceScene
-  3. Box2d and chipmunk path error for single file mode
-  4. cc.EditBox that position of Dom Element is wrong when cc.EditBox skewed
-  5. cc.ScrollView position  is wrong when it's parent node moved
-  6. cc.TouchDispatcher can't touch when WebPage has been scrolled on Firefox and IE
+* Bug fix:
+  1. Fixed preLoading issue on iOS 5.1.1
+  2. Fixed cc.Menu / cc.MenuItemImage remaining touchable issue after replaceScene
+  3. Fixed Box2d and chipmunk path error for single engine file mode
+  4. Fixed cc.EditBox Dom Element position issue when cc.EditBox skewed
+  5. Fixed cc.ScrollView position issue when it's parent node moved
+  6. Fixed cc.TouchDispatcher can't touch issue when WebPage has been scrolled on Firefox or IE
 * Known Issues:
      1. Effect Advanced Lens3D doesn't work
      2. ClipNodeTest effects varies in different browsers
@@ -27,7 +27,7 @@ Cocos2d-html5-v2.1.3 @ May.1, 2013
 * EGLView now works if canvas is placed inside another DOM element
 * Added a Simulator which can be found in MoonWarriors Directory
 
-*Bug fix:
+* Bug fix:
   1. Preloading on some mobile browsers
   2. CCLoader for WebGL
   3. ccNode memory leak

cocos2d/CCDirector.js

@@ -592,10 +592,15 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
         cc.Assert(scene != null, "the scene should not be null");
 
         var i = this._scenesStack.length;
-
-        this._sendCleanupToScene = true;
-        this._scenesStack[i - 1] = scene;
-        this._nextScene = scene;
+        if(i === 0){
+            this._sendCleanupToScene = true;
+            this._scenesStack[i] = scene;
+            this._nextScene = scene;
+        } else {
+            this._sendCleanupToScene = true;
+            this._scenesStack[i - 1] = scene;
+            this._nextScene = scene;
+        }
     },
 
     /**

cocos2d/label_nodes/CCLabelTTF.js

@@ -757,6 +757,13 @@ cc.LabelTTFWebGL = cc.Sprite.extend(/** @lends cc.LabelTTFWebGL# */{
     _updateTexture:function () {
         this._labelContext = this._getLabelContext();
 
+        if(this._string.length === 0){
+            this._labelCanvas.width = 1;
+            this._labelCanvas.height = this._contentSize.height;
+            this.setTextureRect(cc.rect(0, 0, 1, this._contentSize.height));
+            return true;
+        }
+
         //set size for labelCanvas
         this._labelContext.font = this._fontStyleStr;
         this._updateTTF();
@@ -774,7 +781,7 @@ cc.LabelTTFWebGL = cc.Sprite.extend(/** @lends cc.LabelTTFWebGL# */{
 
     _needUpdateTexture:false,
     visit:function(){
-        if(this._needUpdateTexture && this._string.length > 0){
+        if(this._needUpdateTexture ){
             this._needUpdateTexture = false;
             this._updateTexture();
         }

cocos2d/particle_nodes/CCParticleSystem.js

@@ -1404,7 +1404,6 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
                             this.setTexture(canvasObj);
                         else
                             this.setTexture(addTexture);
-
                     }
                 }
 
@@ -1477,11 +1476,20 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
      * Add a particle to the emitter
      * @return {Boolean}
      */
-    addParticle:function () {
+    addParticle: function () {
         if (this.isFull())
             return false;
-
-        var particle =this._particles[this._particleCount];
+        var particle, particles = this._particles;
+        if (cc.renderContextType === cc.CANVAS) {
+            if (this._particleCount < particles.length) {
+                particle = particles[this._particleCount];
+            } else {
+                particle = new cc.Particle();
+                particles.push(particle);
+            }
+        } else {
+            particle = particles[this._particleCount];
+        }
         this.initParticle(particle);
         ++this._particleCount;
         return true;

cocos2d/sprite_nodes/CCSprite.js

@@ -2114,7 +2114,6 @@ cc.SpriteWebGL = cc.Node.extend(/** @lends cc.SpriteWebGL# */{
         this._quad.tl.colors = new cc.Color4B(255, 255, 255, 255);
         this._quad.tr.colors = new cc.Color4B(255, 255, 255, 255);
         this._quadDirty = true;
-        this.setShaderProgram(cc.ShaderCache.getInstance().programForKey(cc.SHADER_POSITION_TEXTURECOLOR));
 
         // updated in "useSelfRender"
         // Atlas: TexCoords
@@ -2517,6 +2516,11 @@ cc.SpriteWebGL = cc.Node.extend(/** @lends cc.SpriteWebGL# */{
         // If batchnode, then texture id should be the same
         cc.Assert(!this._batchNode, "cc.Sprite: Batched sprites should use the same texture as the batchnode");
 
+        if(texture)
+            this.setShaderProgram(cc.ShaderCache.getInstance().programForKey(cc.SHADER_POSITION_TEXTURECOLOR));
+        else
+            this.setShaderProgram(cc.ShaderCache.getInstance().programForKey(cc.SHADER_POSITION_COLOR));
+
         if (!this._batchNode && this._texture != texture) {
             this._texture = texture;
             this._updateBlendFunc();
@@ -2647,9 +2651,8 @@ cc.SpriteWebGL = cc.Node.extend(/** @lends cc.SpriteWebGL# */{
                 gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
             }
         } else {
-            var shaderProgram = cc.ShaderCache.getInstance().programForKey(cc.SHADER_POSITION_COLOR);
-            shaderProgram.use();
-            shaderProgram.setUniformForModelViewAndProjectionMatrixWithMat4();
+            this._shaderProgram.use();
+            this._shaderProgram.setUniformForModelViewAndProjectionMatrixWithMat4();
 
             cc.glBlendFunc(this._blendFunc.src, this._blendFunc.dst);
             cc.glBindTexture2D(null);