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

linshun · linshun · commit b523263fa826 · 2013-06-09T16:31:27.000+08:00
diff --git a/CocosDenshion/SimpleAudioEngine.js b/CocosDenshion/SimpleAudioEngine.js
@@ -33,7 +33,11 @@ var cc = cc || {};
  * @extends   cc.Class
  */
 cc.AudioEngine = cc.Class.extend(/** @lends cc.AudioEngine# */{
-
+    _audioID:0,
+    _audioIDList:null,
+    ctor:function(){
+        this._audioIDList = {};
+    },
     /**
      * Check each type to see if it can be played by current browser
      * @param {Object} capabilities The results are filled into this dict
@@ -129,8 +133,9 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
      * Constructor
      */
     ctor:function () {
-        this._supportedFormat = [];
+        cc.AudioEngine.prototype.ctor.call(this);
 
+        this._supportedFormat = [];
         this._checkCanPlay(this._capabilities);
 
         // enable sound if any of the audio format is supported
@@ -399,8 +404,10 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
             au.loop = loop;
         }
         au.play();
+        var audioID = this._audioID++;
+        this._audioIDList[audioID] = au;
 
-        return path;
+        return audioID;
     },
 
     /**
@@ -446,21 +453,18 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
 
     /**
      * Pause playing sound effect.
-     * @param {String} path The return value of function playEffect.
+     * @param {Number} audioID The return value of function playEffect.
      * @example
      * //example
-     * cc.AudioEngine.getInstance().pauseEffect(path);
+     * cc.AudioEngine.getInstance().pauseEffect(audioID);
      */
-    pauseEffect:function (path) {
-        if (!path) return;
-        var keyname = this._getPathWithoutExt(path);
-        if (this._effectList.hasOwnProperty(keyname)) {
-            var tmpArr = this._effectList[keyname], au;
-            for (var i = tmpArr.length - 1; i >= 0; i--) {
-                au = tmpArr[i];
-                if (!au.ended) {
-                    au.pause();
-                }
+    pauseEffect:function (audioID) {
+        if (audioID == null) return;
+
+        if (this._audioIDList.hasOwnProperty(audioID)) {
+            var au = this._audioIDList[audioID];
+            if (!au.ended) {
+                au.pause();
             }
         }
     },
@@ -486,24 +490,18 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
 
     /**
      * Resume playing sound effect.
-     * @param {String} path The return value of function playEffect.
-     * @example
+     * @param {Number} audioID The return value of function playEffect.
+     * @audioID
      * //example
-     * cc.AudioEngine.getInstance().resumeEffect(path);
+     * cc.AudioEngine.getInstance().resumeEffect(audioID);
      */
-    resumeEffect:function (path) {
-        if (!path) return;
-        var tmpArr, au;
-        var keyname = this._getPathWithoutExt(path);
-        if (this._effectList.hasOwnProperty(keyname)) {
-            tmpArr = this._effectList[keyname];
-            if (tmpArr.length > 0) {
-                for (var i = 0; i < tmpArr.length; i++) {
-                    au = tmpArr[i];
-                    if (!au.ended) {
-                        au.play();
-                    }
-                }
+    resumeEffect:function (audioID) {
+        if (audioID == null) return;
+
+        if (this._audioIDList.hasOwnProperty(audioID)) {
+            var au = this._audioIDList[audioID];
+            if (!au.ended) {
+                au.play();
             }
         }
     },
@@ -531,25 +529,19 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
 
     /**
      * Stop playing sound effect.
-     * @param {String} path The return value of function playEffect.
+     * @param {Number} audioID The return value of function playEffect.
      * @example
      * //example
-     * cc.AudioEngine.getInstance().stopEffect(path);
+     * cc.AudioEngine.getInstance().stopEffect(audioID);
      */
-    stopEffect:function (path) {
-        if (!path) return;
-        var tmpArr, au;
-        var keyname = this._getPathWithoutExt(path);
-        if (this._effectList.hasOwnProperty(keyname)) {
-            tmpArr = this._effectList[keyname];
-            if (tmpArr.length > 0) {
-                for (var i = 0; i < tmpArr.length; i++) {
-                    au = tmpArr[i];
-                    if (!au.ended) {
-                        au.loop = false;
-                        au.currentTime = au.duration;
-                    }
-                }
+    stopEffect:function (audioID) {
+        if (audioID == null) return;
+
+        if (this._audioIDList.hasOwnProperty(audioID)) {
+            var au = this._audioIDList[audioID];
+            if (!au.ended) {
+                au.loop = false;
+                au.currentTime = au.duration;
             }
         }
     },
@@ -588,6 +580,15 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
             this.stopEffect(path);
             delete this._effectList[keyname];
         }
+
+        var au,pathName;
+        for (var k in this._audioIDList) {
+            au = this._audioIDList[k];
+            pathName  = this._getPathWithoutExt(au.src);
+            if(pathName == keyname){
+                delete this._audioIDList[k];
+            }
+        }
     },
 
     _getEffectList:function (elt) {
@@ -701,7 +702,9 @@ cc.WebAudioEngine = cc.AudioEngine.extend(/** @lends cc.WebAudioEngine# */{
     /**
      * Constructor
      */
-    ctor: function() {},
+    ctor: function() {
+        cc.AudioEngine.prototype.ctor.call(this);
+    },
 
     /**
      * Initialization
@@ -1165,8 +1168,12 @@ cc.WebAudioEngine = cc.AudioEngine.extend(/** @lends cc.WebAudioEngine# */{
                  */
             });
         }
+
         // cc.SimpleAudioEngine returns path, just do the same for backward compatibility. DO NOT rely on this, though!
-        return path;
+        var audioID = this._audioID++;
+        this._audioIDList[audioID] = this._effects[keyName];
+
+        return audioID;
     },
 
     /**
@@ -1223,23 +1230,19 @@ cc.WebAudioEngine = cc.AudioEngine.extend(/** @lends cc.WebAudioEngine# */{
 
     /**
      * Pause playing sound effect.
-     * @param {String} path The return value of function playEffect.
+     * @param {Number} audioID The return value of function playEffect.
      * @example
      * //example
-     * cc.AudioEngine.getInstance().pauseEffect(path);
+     * cc.AudioEngine.getInstance().pauseEffect(audioID);
      */
-    pauseEffect: function(path) {
-        if (!path) {
+    pauseEffect: function(audioID) {
+        if (audioID == null) {
             return;
         }
 
-        var keyName = this._getPathWithoutExt(path);
-        if (!(keyName in this._effects)) {
-            // the effect is not even in the playing list
-            return;
+        if (this._audioIDList.hasOwnProperty(audioID)) {
+            this._pauseSoundList(this._audioIDList[audioID]);
         }
-
-        this._pauseSoundList(this._effects[keyName]);
     },
 
     /**
@@ -1270,23 +1273,19 @@ cc.WebAudioEngine = cc.AudioEngine.extend(/** @lends cc.WebAudioEngine# */{
 
     /**
      * Resume playing sound effect.
-     * @param {String} path The return value of function playEffect.
+     * @param {Number} audioID The return value of function playEffect.
      * @example
      * //example
-     * cc.AudioEngine.getInstance().resumeEffect(path);
+     * cc.AudioEngine.getInstance().resumeEffect(audioID);
      */
-    resumeEffect: function(path) {
-        if (!path) {
+    resumeEffect: function(audioID) {
+        if (audioID == null) {
             return;
         }
 
-        var keyName = this._getPathWithoutExt(path);
-        if (!(keyName in this._effects)) {
-            // the effect is not even in the playing list
-            return;
+        if (this._audioIDList.hasOwnProperty(audioID)) {
+            this._resumeSoundList(this._audioIDList[audioID], this.getEffectsVolume());
         }
-
-        this._resumeSoundList(this._effects[keyName], this.getEffectsVolume());
     },
 
     /**
@@ -1303,27 +1302,19 @@ cc.WebAudioEngine = cc.AudioEngine.extend(/** @lends cc.WebAudioEngine# */{
 
     /**
      * Stop playing sound effect.
-     * @param {String} path The return value of function playEffect.
+     * @param {Number} audioID The return value of function playEffect.
      * @example
      * //example
-     * cc.AudioEngine.getInstance().stopEffect(path);
+     * cc.AudioEngine.getInstance().stopEffect(audioID);
      */
-    stopEffect: function(path) {
-        if (!path) {
+    stopEffect: function(audioID) {
+        if (audioID == null) {
             return;
         }
 
-        var keyName = this._getPathWithoutExt(path);
-        if (!(keyName in this._effects)) {
-            // can stop only when it's playing/paused, in other words, when it's on the list
-            return;
-        }
-
-        var effectList = this._effects[keyName];
-        for (var idx in effectList) {
-            this._endSound(effectList[idx]);
+        if (this._audioIDList.hasOwnProperty(audioID)) {
+            this._endSound(this._audioIDList[audioID]);
         }
-        delete this._effects[keyName];
     },
 
     /**
@@ -1383,7 +1374,8 @@ cc.AudioEngine.isMusicPlaying = false;
  */
 cc.AudioEngine.getInstance = function () {
     if (!this._instance) {
-        if (cc.Browser.supportWebAudio) {
+        var ua = navigator.userAgent;
+        if (cc.Browser.supportWebAudio && (/iPhone OS/.test(ua)||/iPad/.test(ua))) {
             this._instance = new cc.WebAudioEngine();
         } else {
             this._instance = new cc.SimpleAudioEngine();
diff --git a/cocos2d/label_nodes/CCLabelTTF.js b/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();
         }
diff --git a/cocos2d/particle_nodes/CCParticleSystem.js b/cocos2d/particle_nodes/CCParticleSystem.js
@@ -1404,7 +1404,6 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
                             this.setTexture(canvasObj);
                         else
                             this.setTexture(addTexture);
-
                     }
                 }
 
@@ -1480,8 +1479,13 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
     addParticle:function () {
         if (this.isFull())
             return false;
-
-        var particle =this._particles[this._particleCount];
+        var particle, particles = this._particles;
+        if(cc.renderContextType === cc.CANVAS && this._particleCount < particles.length){
+            particle =particles[this._particleCount];
+        }else{
+            particle = new cc.Particle();
+            particles.push(particle);
+        }
         this.initParticle(particle);
         ++this._particleCount;
         return true;
diff --git a/cocos2d/platform/miniFramework.js b/cocos2d/platform/miniFramework.js
@@ -84,12 +84,6 @@ cc.Browser = {};
 
     // check if browser supports Web Audio
     cc.Browser.supportWebAudio = (function(){
-        // check <audio> tag first
-        var ele = document.createElement('audio');
-        if (!ele) {
-            return false;
-        }
-
         // check Web Audio's context
         try {
             var ctx = new (window.AudioContext || window.webkitAudioContext || window.mozAudioContext)();
diff --git a/cocos2d/sprite_nodes/CCSprite.js b/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);
diff --git a/extensions/CCBReader/CCSpriteLoader.js b/extensions/CCBReader/CCSpriteLoader.js
