Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into browser_version

VisualSJ · VisualSJ · commit fc7350dba80e · 2014-11-17T17:55:47.000+08:00
diff --git a/cocos2d/audio/CCAudio.js b/cocos2d/audio/CCAudio.js
@@ -346,6 +346,9 @@ cc.AudioEngine = cc.Class.extend(/** @lends cc.audioEngine# */{
         self._soundSupported = cc._audioLoader._supportedAudioTypes.length > 0;
         if (self._effectPauseCb)
             self._effectPauseCb = self._effectPauseCb.bind(self);
+        if(cc.sys.isMobile){
+            self._addTouchStartEvent();
+        }
     },
 
     /**
@@ -769,6 +772,45 @@ cc.AudioEngine = cc.Class.extend(/** @lends cc.audioEngine# */{
             self._resumeAudio(playings[i]);
         }
         playings.length = 0;
+    },
+    /**
+     * show music and effect info
+     */
+    dumpAudioInfo: function () {
+        var self = this;
+        cc.log("--------------------------------------");
+        if(self._currMusic){
+            cc.log("Current music: ");
+            self._printAudioInfo(this._currMusic);
+        }
+        if(self._effects){
+            cc.log("Current effect: ");
+            for(var key in self._effects){
+                self._printAudioInfo(self._effects[key]);
+            }
+        }
+        cc.log("--------------------------------------");
+    },
+    _printAudioInfo: function (audio) {
+        cc.log("    url:" + audio.src);
+        cc.log("    played:" + (audio.played).toString());
+        cc.log("    paused:" + audio.paused);
+        cc.log("    ended:" + audio.ended);
+        cc.log("    loop:" + audio.loop);
+        cc.log("    volume:" + audio.volume);
+        cc.log("------------------------------");
+    },
+    /**
+     * add touch event
+     * @private
+     */
+    _addTouchStartEvent: function () {
+        var self = this;
+        cc._addEventListener(document.getElementById(cc.game.config[cc.game.CONFIG_KEY.id]),"touchstart", function (event) {
+            if(self._currMusic && (self._currMusic._sourceNode["playbackState"] == 1 || self._currMusic.played == null)){
+                self._playMusic(self._currMusic);
+            }
+        },false);
     }
 
 });
diff --git a/cocos2d/core/renderer/RendererCanvas.js b/cocos2d/core/renderer/RendererCanvas.js
@@ -54,15 +54,19 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
          * drawing all renderer command to cache canvas' context
          * @param {CanvasRenderingContext2D} ctx
          * @param {Number} [instanceID]
+         * @param {Number} [scaleX]
+         * @param {Number} [scaleY]
          */
-        _renderingToCacheCanvas: function (ctx, instanceID) {
+        _renderingToCacheCanvas: function (ctx, instanceID, scaleX, scaleY) {
             if (!ctx)
                 cc.log("The context of RenderTexture is invalid.");
 
+            scaleX = cc.isUndefined(scaleX) ? 1 : scaleX;
+            scaleY = cc.isUndefined(scaleY) ? 1 : scaleY;
             instanceID = instanceID || this._currentID;
             var locCmds = this._cacheToCanvasCmds[instanceID], i, len;
             for (i = 0, len = locCmds.length; i < len; i++) {
-                locCmds[i].rendering(ctx, 1, 1);
+                locCmds[i].rendering(ctx, scaleX, scaleY);
             }
             locCmds.length = 0;
             var locIDs = this._cacheInstanceIds;
@@ -530,15 +534,27 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
 
         //draw sprite
         var image = locSprite._texture.getHtmlElementObj();
-        context.drawImage(image,
-            locTextureCoord.renderX,
-            locTextureCoord.renderY,
-            locTextureCoord.width,
-            locTextureCoord.height,
-            flipXOffset, flipYOffset,
-            locDrawSizeCanvas.width,
-            locDrawSizeCanvas.height
-        );
+        if (locSprite._colorized) {
+            context.drawImage(image,
+                0,
+                0,
+                locTextureCoord.width,
+                locTextureCoord.height,
+                flipXOffset, flipYOffset,
+                locDrawSizeCanvas.width,
+                locDrawSizeCanvas.height
+            );
+        } else {
+            context.drawImage(image,
+                locTextureCoord.renderX,
+                locTextureCoord.renderY,
+                locTextureCoord.width,
+                locTextureCoord.height,
+                flipXOffset, flipYOffset,
+                locDrawSizeCanvas.width,
+                locDrawSizeCanvas.height
+            );
+        }
 
         context.restore();
         cc.g_NumberOfDraws++;
diff --git a/cocos2d/core/sprites/CCSprite.js b/cocos2d/core/sprites/CCSprite.js
@@ -546,7 +546,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
             }
 
             if (this._batchNode) {
-                this._arrayMakeObjectsPerformSelector(_children, cc.Node._StateCallbackType.sortAllChildren);
+                this._arrayMakeObjectsPerformSelector(_children, cc.Node._stateCallbackType.sortAllChildren);
             }
 
             //don't need to check children recursively, that's done in visit of each child
@@ -1458,7 +1458,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
 
         // recursively iterate over children
         if (_t._hasChildren)
-            _t._arrayMakeObjectsPerformSelector(_t._children, cc.Node._StateCallbackType.updateTransform);
+            _t._arrayMakeObjectsPerformSelector(_t._children, cc.Node._stateCallbackType.updateTransform);
     };
 
     _p.addChild = function (child, localZOrder, tag) {
diff --git a/cocos2d/render-texture/CCRenderTexture.js b/cocos2d/render-texture/CCRenderTexture.js
@@ -495,7 +495,8 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
         //cc._renderContext = cc._mainRenderContextBackup;
         //cc.view._resetScale();
 
-        cc.renderer._renderingToCacheCanvas(this._cacheContext, this.__instanceId);
+        var scale = cc.contentScaleFactor();
+        cc.renderer._renderingToCacheCanvas(this._cacheContext, this.__instanceId, scale, scale);
 
         //TODO
         /*//restore viewport
diff --git a/extensions/ccui/base-classes/UIScale9Sprite.js b/extensions/ccui/base-classes/UIScale9Sprite.js
@@ -203,12 +203,17 @@ ccui.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprite# */{
     _cacheScale9Sprite: function(){
         if(!this._scale9Image)
             return;
-        var size = this._contentSize, locCanvas = this._cacheCanvas;
+
+        var locScaleFactor = cc.contentScaleFactor();
+        var size = this._contentSize;
+        var sizeInPixels = cc.size(size.width * locScaleFactor, size.height * locScaleFactor);
+
+        var locCanvas = this._cacheCanvas;
         var contentSizeChanged = false;
-        if(locCanvas.width != size.width || locCanvas.height != size.height){
-            locCanvas.width = size.width;
-            locCanvas.height = size.height;
-            this._cacheContext.translate(0, size.height);
+        if(locCanvas.width != sizeInPixels.width || locCanvas.height != sizeInPixels.height){
+            locCanvas.width = sizeInPixels.width;
+            locCanvas.height = sizeInPixels.height;
+            this._cacheContext.translate(0, sizeInPixels.height);
             contentSizeChanged = true;
         }
 
@@ -217,8 +222,8 @@ ccui.Scale9Sprite = cc.Node.extend(/** @lends ccui.Scale9Sprite# */{
         this._scale9Image.visit();
 
         //draw to cache canvas
-        this._cacheContext.clearRect(0, 0, size.width, -size.height);
-        cc.renderer._renderingToCacheCanvas(this._cacheContext, this.__instanceId);
+        this._cacheContext.clearRect(0, 0, sizeInPixels.width, -sizeInPixels.height);
+        cc.renderer._renderingToCacheCanvas(this._cacheContext, this.__instanceId, locScaleFactor, locScaleFactor);
 
         if(contentSizeChanged)
             this._cacheSprite.setTextureRect(cc.rect(0,0, size.width, size.height));
diff --git a/extensions/ccui/uiwidgets/UICheckBox.js b/extensions/ccui/uiwidgets/UICheckBox.js
@@ -96,8 +96,7 @@ ccui.CheckBox = ccui.Widget.extend(/** @lends ccui.CheckBox# */{
         if (ccui.Widget.prototype.init.call(this)) {
             this._isSelected = true;
             this.setSelected(false);
-            if(backGround === undefined)
-                this.loadTextures(backGround, backGroundSelected, cross, backGroundDisabled, frontCrossDisabled, texType);
+            this.loadTextures(backGround, backGroundSelected, cross, backGroundDisabled, frontCrossDisabled, texType);
             return true;
         }
         return false;
diff --git a/extensions/cocostudio/reader/timeline/CSLoader.js b/extensions/cocostudio/reader/timeline/CSLoader.js
@@ -335,7 +335,7 @@ ccs.csLoader = {
             var nodeOptions = nodetree["widgetOptions"];
             var options = nodetree["projectNodeOptions"];
     
-            var filePath = options["filename"];
+            var filePath = options["fileName"];
             //cc.log("filePath = %s", filePath);
     		if(filePath != "")
     		{
diff --git a/extensions/gui/control-extension/CCScale9Sprite.js b/extensions/gui/control-extension/CCScale9Sprite.js
@@ -218,7 +218,7 @@ cc.Scale9Sprite = cc.Node.extend(/** @lends cc.Scale9Sprite# */{
 
         //draw to cache canvas
         this._cacheContext.clearRect(0, 0, sizeInPixels.width, -sizeInPixels.height);
-        cc.renderer._renderingToCacheCanvas(this._cacheContext, this.__instanceId);
+        cc.renderer._renderingToCacheCanvas(this._cacheContext, this.__instanceId, locScaleFactor, locScaleFactor);
 
         if(contentSizeChanged)
             this._cacheSprite.setTextureRect(cc.rect(0,0, size.width, size.height));

Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{`
`546`	`546`	`}`
`547`	`547`
`548`	`548`	`if (this._batchNode) {`
`549`		`- this._arrayMakeObjectsPerformSelector(_children, cc.Node._StateCallbackType.sortAllChildren);`
	`549`	`+ this._arrayMakeObjectsPerformSelector(_children, cc.Node._stateCallbackType.sortAllChildren);`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`//don't need to check children recursively, that's done in visit of each child`
`@@ -1458,7 +1458,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {`
`1458`	`1458`
`1459`	`1459`	`// recursively iterate over children`
`1460`	`1460`	`if (_t._hasChildren)`
`1461`		`- _t._arrayMakeObjectsPerformSelector(_t._children, cc.Node._StateCallbackType.updateTransform);`
	`1461`	`+ _t._arrayMakeObjectsPerformSelector(_t._children, cc.Node._stateCallbackType.updateTransform);`
`1462`	`1462`	`};`
`1463`	`1463`
`1464`	`1464`	`_p.addChild = function (child, localZOrder, tag) {`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ ccs.csLoader = {`
`335`	`335`	`var nodeOptions = nodetree["widgetOptions"];`
`336`	`336`	`var options = nodetree["projectNodeOptions"];`
`337`	`337`
`338`		`- var filePath = options["filename"];`
	`338`	`+ var filePath = options["fileName"];`
`339`	`339`	`//cc.log("filePath = %s", filePath);`
`340`	`340`	`if(filePath != "")`
`341`	`341`	`{`