Merge pull request #1 from cocos2d/develop

Merge from trunk

Author: WanderWang

AUTHORS.txt

@@ -25,7 +25,7 @@ Chris               @hannon235	added node.js api for box2d
 
 Jason Aeschliman    @jaeschliman  fixed cc.Node setposition
 
-Sun Zhuoshi(Intel)  @sunzhuoshi	engine loader fixed
+Zhuoshi Sun(Intel)  @sunzhuoshi	engine loader fixed
 
 Alejandro Reyero    @KaTXi      fixed error message
 
@@ -50,15 +50,14 @@ Ivo Wetzel(Zynga Germany) @BonsaiDen Fixes for Audio Support Detection,
                                      Texture Support in Particle System,
                                      and Performance improvements
 
-
 Mario Adrian        @many20        Code review, multi touch improvements,
                                    ccbi bugs fixed
 
 keisuke hata(Square)  @Seasons7    Code review, bug fix
 
 Marat Yakupov	    @moadib        Various bug fixes
 
-Wu Liang            @akira-cn      Touch location fix for designResolution
+Liang Wu            @akira-cn      Touch location fix for designResolution
 
 Jimmy Sambuo        @jsambuo       AudioEngine improvements
 
@@ -74,14 +73,28 @@ Szymon Piłkowski     @ardcore      CCTexture Bug fix
 
 Tomasz Tunik         @tomasztunik   CCNode Memory leak fix
 
-Lin Xuankang(Intel)  @AndriyLin     cc.WebAudioEngine implements
+Xuankang Lin(Intel)  @AndriyLin     cc.WebAudioEngine implements
 
 Kang-Hao Lu(Opera/Oupeng) @kennyluck    Optimize John Resig's inheritance pattern
                                         cc.clone improvements
 
 Mark Henderson       @MarkEHenderson    Code review, LabelTTF and Scale9Sprite bug fix
 
-06wj                 @06wj         CCScheduler improvements
+Jing Wang             @06wj         CCScheduler improvements
+                                   Js file loading image add
+                                   cc.RectApplyAffineTransform improvements
+
+Ze Wang               @WanderWang   Fix crash when BrowserTypes match nothing from navigator.userAgent
+                                    LabelTTF improvements
+
+Christian Schwartz   @cschwartz    SpriteFrame.initWithTextureFilename converted fix
+
+XiaoJun Zheng        @SmallAiTT    _getResType error fix
+                                   cc.ScrollView bug fix
+
+Guozhu Cheng         @bengol       cc.SimpleAudioEngine bug fix
+
+Jing Xiao            @xbruce       cc.SAXParser bug fix
 
 Cocos2d-x and cocos2d-html5 can not grow so fast without the active community.
 

CHANGELOG.txt

@@ -1,3 +1,33 @@
+Cocos2d-html5-v2.1.6 @ Sep.19, 2013
+* Improved Sprite, Node, LabelTTF class define from separated code to combined code for maintainability, now it is clean and clear
+* cc.Sprite and its subClasses's texture has been replaced from DOM element to cc.Texture2D on Canvas mode
+* Improved cc.Texture2d for direct using without pre-loading image resources, you don't need to wait resources loading when create a new scene or layers
+* Migrated CCBReader and GUI to Cocos2d-x 2.1.4
+* Improved update function of Action, and avoid using temporary object, it is good for GC and performance
+* Modified LabelTTF's rendering from direct drawing to pre-rendering for performance, 100% faster than before on mobile browser
+* Fixed APIs of HTML5 according to JSB for compatibility, e.g. cc.ParticleSystemQuad has merged into cc.ParticleSystem, please check it on upgrade guide v2.1.5 to v2.1.6(http://www.cocos2d-x.org/wiki/Upgrade_Guide_from_Cocos2d-html5_v215_to_v216)
+* Added Hiding url address bar for mobile browser, please check the template and hello world
+* Re-writed Canvas Mode of RenderTexture to adapt WebGL interface
+* Added frame event, collider and blend type supporting for Armature. Now Armature supports two tools:1.CocoStudio(windows,http://www.cocostudio.org),2.DragonBones v2.3(flash,http://dragonbones.github.io)
+* Set auto render mode default value to canvas in mobile browsers and WebGL in desktop browsers
+
+* Bug fix:
+1. Fixed cc.Sprite's displayFrame returns wrong value on Canvas mode.
+2. Fixed cc.LabelBMFont is very slow when calling setString
+3. Fixed a bug of CCBReader that cc.ControlButton doesn't work when its controller is _jsControlled
+4. Fixed a bug of cc.TextureCache that the status of texture is wrong in callback
+5. Fixed a bug of cc.Scale9Sprite that its contentSize is wrong when call setCapInsets
+6. Fixed a bug of cc.TableView's that contentSize is wrong when change datasource
+7. Fixed a bug of cc.Sprite that its children also follow fliped when it was fliped
+8. Fixed cc.Node's nodeToWorldTransform returns wrong value on Canvas Mode
+9. Fixed a bug of cc.LayerColor that represent incorrect opacity passed into init method
+10. Stop listening and remove the event for HtmlImageElement object onload
+11. Fixed cc.ProgressTimer display wrong when its sprite was flipped
+
+* Known Issues:
+     1. Effect Advanced Lens3D doesn't work
+     2. ClipNodeTest effects varies in different browsers
+
 Cocos2d-html5-v2.1.5 @ July.24, 2013
 * Ported engine API to keep the same as Cocos2d-x v2.1.4 API
 * Optimized John Resig's inheritance pattern (cc.Class.extend) with advanced property initialization.
@@ -8,7 +38,7 @@ Cocos2d-html5-v2.1.5 @ July.24, 2013
 * Optimized performance for MoonWarriors and CocosDragonJS
 
 * Bug fix:
-  1. Fixed cc.EditBox Dom Element position issue when EGLView is setted
+  1. Fixed cc.EditBox Dom Element position issue when EGLView is set
   2. Fixed cc.EGLView adjustSize bug
   3. Fixed the bug of cc.ParticleBatchNode that it doesn't hide particles after particle life has expired when calling stopSystem()
   4. Fixed a bug that LabelTTF dimension behavior doesn't support height=0
@@ -17,6 +47,7 @@ Cocos2d-html5-v2.1.5 @ July.24, 2013
 * Known Issues:
      1. Effect Advanced Lens3D doesn't work
      2. ClipNodeTest effects varies in different browsers
+     3. nodeToParentTransform in cc.Node returns wrong value on Canvas mode
 
 Cocos2d-html5-v2.1.4 @ Jun.12, 2013
 * Added support for multiple resources loading. This mechanic is the same as cocos2d-x now

CocosDenshion/SimpleAudioEngine.js

@@ -158,6 +158,22 @@ cc.SimpleAudioEngine = cc.AudioEngine.extend(/** @lends cc.SimpleAudioEngine# */
         return this._soundSupported;
     },
 
+    /**
+     * Preload music resource.
+     * @param {String} path
+     */
+    preloadMusic:function(path){
+        this.preloadSound(path);
+    },
+
+    /**
+     * Preload effect resource.
+     * @param {String} path
+     */
+    preloadEffect:function(path){
+        this.preloadSound(path);
+    },
+
     /**
      * Preload music resource.<br />
      * This method is called when cc.Loader preload  resources.
@@ -766,6 +782,22 @@ cc.WebAudioEngine = cc.AudioEngine.extend(/** @lends cc.WebAudioEngine# */{
         req.send();
     },
 
+    /**
+     * Preload music resource.
+     * @param {String} path
+     */
+    preloadMusic:function(path){
+        this.preloadSound(path);
+    },
+
+    /**
+     * Preload effect resource.
+     * @param {String} path
+     */
+    preloadEffect:function(path){
+        this.preloadSound(path);
+    },
+
     /**
      * Preload music resource.<br />
      * This method is called when cc.Loader preload  resources.

HelloHTML5World/build.xml

@@ -95,7 +95,6 @@
                 <file name="label_nodes/CCLabelBMFont.js"/>
                 <file name="particle_nodes/CCParticleSystem.js"/>
                 <file name="particle_nodes/CCParticleBatchNode.js"/>
-                <file name="particle_nodes/CCParticleSystemQuad.js"/>
                 <file name="particle_nodes/CCParticleExamples.js"/>
                 <file name="touch_dispatcher/CCTouchDelegateProtocol.js"/>
                 <file name="touch_dispatcher/CCTouchHandler.js"/>
@@ -158,27 +157,25 @@
                 <file name="GUI/CCScrollView/CCScrollView.js"/>
                 <file name="GUI/CCScrollView/CCTableView.js"/>
                 <file name="CCEditBox.js"/>
-                <file name="CCArmature/utils/CCArmatureDefine.js"/>
-                <file name="CCArmature/utils/CCDataReaderHelper.js"/>
-                <file name="CCArmature/utils/CCSpriteFrameCacheHelper.js"/>
-                <file name="CCArmature/utils/CCTransformHelp.js"/>
-                <file name="CCArmature/utils/CCTweenFunction.js"/>
-                <file name="CCArmature/utils/CCUtilMath.js"/>
-                <file name="CCArmature/utils/CSArmatureDataManager.js"/>
-                <file name="CCArmature/datas/CCDatas.js"/>
-                <file name="CCArmature/display/CCBatchNode.js"/>
-                <file name="CCArmature/display/CCDecorativeDisplay.js"/>
-                <file name="CCArmature/display/CCDisplayFactory.js"/>
-                <file name="CCArmature/display/CCDisplayManager.js"/>
-                <file name="CCArmature/display/CCShaderNode.js"/>
-                <file name="CCArmature/display/CCSkin.js"/>
-                <file name="CCArmature/animation/CCProcessBase.js"/>
-                <file name="CCArmature/animation/CCArmatureAnimation.js"/>
-                <file name="CCArmature/animation/CCTween.js"/>
-                <file name="CCArmature/physics/CCColliderDetector.js"/>
-                <file name="CCArmature/physics/CCPhysicsWorld.js"/>
-                <file name="CCArmature/CCArmature.js"/>
-                <file name="CCArmature/CCBone.js"/>
+                <file name="CocoStudio/Armature/utils/CCArmatureDefine.js"/>
+                <file name="CocoStudio/Armature/utils/CCDataReaderHelper.js"/>
+                <file name="CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.js"/>
+                <file name="CocoStudio/Armature/utils/CCTransformHelp.js"/>
+                <file name="CocoStudio/Armature/utils/CCTweenFunction.js"/>
+                <file name="CocoStudio/Armature/utils/CCUtilMath.js"/>
+                <file name="CocoStudio/Armature/utils/CSArmatureDataManager.js"/>
+                <file name="CocoStudio/Armature/datas/CCDatas.js"/>
+                <file name="CocoStudio/Armature/display/CCBatchNode.js"/>
+                <file name="CocoStudio/Armature/display/CCDecorativeDisplay.js"/>
+                <file name="CocoStudio/Armature/display/CCDisplayFactory.js"/>
+                <file name="CocoStudio/Armature/display/CCDisplayManager.js"/>
+                <file name="CocoStudio/Armature/display/CCSkin.js"/>
+                <file name="CocoStudio/Armature/animation/CCProcessBase.js"/>
+                <file name="CocoStudio/Armature/animation/CCArmatureAnimation.js"/>
+                <file name="CocoStudio/Armature/animation/CCTween.js"/>
+                <file name="CocoStudio/Armature/physics/CCColliderDetector.js"/>
+                <file name="CocoStudio/Armature/CCArmature.js"/>
+                <file name="CocoStudio/Armature/CCBone.js"/>
             </sources>
             <sources dir="${basedir}">
                 <file name="src/resource.js"/>

HelloHTML5World/index.html

@@ -4,11 +4,12 @@
     <meta charset="utf-8">
     <title>Cocos2d-html5 Hello World test</title>
     <link rel="icon" type="image/GIF" href="res/favicon.ico"/>
-    <meta name="viewport" content="width=800,user-scalable=no"/>
-    <meta name="screen-orientation" content="portrait"/>
+    <meta name="viewport" content="width=800,target-densitydpi=device-dpi,user-scalable=no" />
     <meta name="apple-mobile-web-app-capable" content="yes"/>
     <meta name="full-screen" content="yes"/>
+    <meta name="screen-orientation" content="portrait"/>
     <meta name="x5-fullscreen" content="true"/>
+    <meta name="360-fullscreen" content="true"/>
     <style>
         body, canvas, div {
             -moz-user-select: none;
@@ -20,9 +21,7 @@
     </style>
 </head>
 <body style="padding:0; margin: 0; background: #000;">
-<div style="text-align: center;">
-    <canvas id="gameCanvas" width="800" height="450"></canvas>
-</div>
+<canvas id="gameCanvas" width="800" height="450"></canvas>
+<script src="cocos2d.js"></script>
 </body>
-</html>
-<script src="cocos2d.js"></script>
+</html>

HelloHTML5World/main.js

@@ -43,8 +43,7 @@ var cocos2dApp = cc.Application.extend({
         // initialize director
         var director = cc.Director.getInstance();
 
-        // enable High Resource Mode(2x, such as iphone4) and maintains low resource on other devices.
-        //director.enableRetinaDisplay(true);
+        cc.EGLView.getInstance().setDesignResolutionSize(800, 450, cc.RESOLUTION_POLICY.SHOW_ALL);
 
         // turn on display FPS
         director.setDisplayStats(this.config['showFPS']);

cocos2d/CCDirector.js

@@ -282,7 +282,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
      *     converts a UIKit coordinate to an OpenGL coordinate<br/>
      *     Useful to convert (multi) touches coordinates to the current layout (portrait or landscape)
      * </p>
-     * @param {cc.Point} point
+     * @param {cc.Point} uiPoint
      * @return {cc.Point}
      */
     convertToGL:function (uiPoint) {
@@ -326,31 +326,16 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
     /**
      *  Draw the scene. This method is called every frame. Don't call it manually.
      */
-    drawScene:function () {
+    drawScene: null,
+
+    _drawSceneForCanvas: function () {
         // calculate "global" dt
         this.calculateDeltaTime();
 
         //tick before glClear: issue #533
         if (!this._paused)
             this._scheduler.update(this._deltaTime);
 
-        if (cc.renderContextType === cc.CANVAS)
-            this._drawSceneForCanvas();
-        else
-            this._drawSceneForWebGL();
-
-        this._totalFrames++;
-
-        // swap buffers
-        /*        if (this._openGLView) {
-         this._openGLView.swapBuffers();
-         }*/
-
-        if (this._displayStats)
-            this._calculateMPF();
-    },
-
-    _drawSceneForCanvas:function () {
         cc.renderContext.clearRect(0, 0, cc.canvas.width, -cc.canvas.height);
 
         /* to avoid flickr, nextScene MUST be here: after tick and before draw.
@@ -368,9 +353,21 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
 
         if (this._displayStats)
             this._showStats();
+
+        this._totalFrames++;
+
+        if (this._displayStats)
+            this._calculateMPF();
     },
 
-    _drawSceneForWebGL:function () {
+    _drawSceneForWebGL: function () {
+        // calculate "global" dt
+        this.calculateDeltaTime();
+
+        //tick before glClear: issue #533
+        if (!this._paused)
+            this._scheduler.update(this._deltaTime);
+
         var gl = cc.renderContext;
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
 
@@ -393,6 +390,11 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
             this._showStats();
 
         cc.kmGLPopMatrix();
+
+        this._totalFrames++;
+
+        if (this._displayStats)
+            this._calculateMPF();
     },
 
     /**
@@ -1089,12 +1091,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
             this._mouseDispatcher = mouseDispatcher;
     },
 
-    _createStatsLabel:function () {
-         if(cc.renderContextType === cc.CANVAS)
-            this._createStatsLabelForCanvas();
-        else
-            this._createStatsLabelForWebGL();
-    },
+    _createStatsLabel: null,
 
     _createStatsLabelForWebGL:function(){
         if((cc.Director._fpsImageLoaded == null) || (cc.Director._fpsImageLoaded == false))
@@ -1171,6 +1168,14 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
     }
 });
 
+if (cc.Browser.supportWebGL) {
+    cc.Director.prototype.drawScene = cc.Director.prototype._drawSceneForWebGL;
+    cc.Director.prototype._createStatsLabel = cc.Director.prototype._createStatsLabelForWebGL;
+} else {
+    cc.Director.prototype.drawScene = cc.Director.prototype._drawSceneForCanvas;
+    cc.Director.prototype._createStatsLabel = cc.Director.prototype._createStatsLabelForCanvas;
+}
+
 /***************************************************
  * implementation of DisplayLinkDirector
  **************************************************/