Merge pull request #29 from cocoscodeide/master

update cocos2d-js

CHANGELOG

@@ -1,3 +1,67 @@
+
+Cocos2d-JS-v3.0 beta @ May.23, 2014
+* Refactored actions to make it more friendly and easy-to-use.
+* Integrated Spine skeleton animation feature.
+* Renamed constants of ProgressTimer, Scale9Sprite, TMXLayerInfo, Node, ParticleSystem for maintainability.
+* Modified mouseMove event behavior of cc.inputManager to compatible with Cocos2d-x
+* Modified cc.game.run to receive a canvas id as parameter.
+* Added local audio file playing from 'file://' origin.
+* Added local images file displaying from 'file://' origin.
+* Refactored cc.TMXLayer's setTileAt etc functions to support point or x,y as their parameters.
+* Added a check to cc.Sprite and cc.SpriteFrame to avoid its texture rect out of bounds.
+* Added a check to cc.SpriteFrame to avoid cc.loader release invalid sprite frame file.
+* Made cc.Touch return copies of point.
+* Made the default of cc.Color alpha value is 255 to avoid cc.Sprite's setColor is invalid.
+* Optimized cc.Node.sortAllChildren for better performance.
+* Added warning of cc.Texture2D if it has an invalid texture.
+* [JSB]Enabled baseline compiler of SpiderMonkey to boost the performance of JSB on Android, mostly it is really faster than Lua.
+* [JSB]Upgraded SpiderMonkey to v28.
+* [JSB]Re-enabled Plugin-X in JSB
+* [JSB]Added `cc.AssetsManager` for resources hot updating and bound all necessary classes in JSB.
+* [JSB]Upgraded jsc file compiler tool with SpiderMonkey v28.
+* [JSB]Android back button support.
+* [JSB]Added `setDebugBones` and `setDebugSolots` functions to `sp.Skeleton`
+* [JSB]Added `repeat`, `repeatForever`, `easing` functions to `cc.ActionInterval`
+* [JSB]Bound `ccui.RichText` in JSB.
+* [JSB]Added `getBlendFunc` and `setBlendFunc` bindings in JSB
+* [JSB]Added Spine, Cocosbuilder, websocket, socketio in templates by default.
+* [JSB]Added cc.Node's getBoudingBoxToWorld function.
+* [JSB]Support inheritance for gui components.
+* [JSB]Implemented reflexion from Javascript to JAVA static class functions.
+* [JSB]Support x, y parameter in position setting functions of cc.TMXLayer.
+* [JSB]Added `game_on_hide` and `game_on_show` events.
+
+
+* Bugs fix:
+    1. Fixed a bug of cc.winSize that it returns incorrect value when using setDesignResolution.
+    2. Added a check to cc._setup to avoid double invocation.
+    3. Fixed a bug of cc.TMXMapInfo that its tile's property id is incorrect.
+    4. Fixed a bug of cc.Scale9Sprite that its CascadeColor and CascadeOpacity are invalid.
+    5. Fixed a bug of ccs.UILoadingBar which its barRendererScaleChangedWithSize is incorrect.
+    6. Added some forgotten files to build.xml for minimize core.
+    7. Corrected a mistake of renderMode default value in CCBoot.js.
+    8. Fixed a bug of ccui.Layout's draw function that its scaleX, scaleY value is incorrect.
+    9. Fixed a bug of cc.Audio's stopMusic function.
+    10. Fixed a bug of TextureCache that it can't remove image's event handler.
+    11. Fixed ClippingNode's DrawNode stencil bug on Canvas.
+    12. Fixed a typo 'cc.radiansToDegress' function to 'cc.radiansToDegrees'.
+    13. Fixed a bug of ccui.ImageView that its setSize is invalid when the picture without pre-load.
+    14. Fixed a bug of cc.ParticleSystem that it throws a error when create from CocosBuilder.
+    15. Fixed a bug of cc.LabelAtlas that it can't display its children.
+    16. Fixed a bug of cc.fontLoader that it can't load custom font.
+    17. Fixed a bug of ccui.Widget that its setOpacity is invalid.
+    18. Fixed a bug of cc.Node that it transform value is incorrect when a node skew to a special value.
+    19. [JSB]Fixed an issue of jsb boot process that `cc._setup` get called twice.
+    20. [JSB]Fixed `cc.TextureCache`'s null check issue.
+    21. [JSB]Fixed an issue of `ccui.Widget`'s `getChildByTag` function.
+    22. [JSB]Fixed TileMapTests's graphic issue of Z vertex test.
+    23. [JSB]Fixed a bug of `cc.Animation.create`.
+    24. [JSB]Fixed behavior inconsistence of `cc.plistLoader`.
+    25. [JSB]Fixed a bug of `cc.view.setDesignResolutionSize`.
+    26. [JSB]Fixed API inconsistence for cc.view.
+    27. [JSB]Fixed API inconsistence for constants.
+    28. [JSB]Fixed API inconsistence of EventMouse and EventTouch.
+
 Cocos2d-JS-v3.0 alpha2 @ April.14, 2014
 * Minimize the size of core from 254k to 113k after google closure advanced compiling.
 * Make engine classes can be constructed via `new` with the same parameters as create functions.

README.md

@@ -1,4 +1,4 @@
-<img src="http://www.cocos2d-x.org/attachments/801/cocos2dx_portrait.png" width=200>
+<img src="http://www.cocos2d-x.org/attachments/1508/2dh5-logo.png" width=200>
 
 Cocos2d-JS
 ===========
@@ -11,10 +11,15 @@ Furthermore, javascript friendly API makes your game development experience a br
 
 ## API Reference
 
-[Online API reference](http://www.cocos2d-x.org/reference/html5-js/V3.0alpha2/index.html)
+- API Reference: [Online API reference](http://www.cocos2d-x.org/reference/html5-js/V3.0beta/index.html)
+
+- And you can download it from
+[Cocos2d-html5_v3.0_beta_API_Doc.zip](http://cdn.cocos2d-x.org/Cocos2d-html5_v3.0_beta_API_Doc.zip)
+
+## Online demo
+- [MoonWarriors](http://www.cocos2d-x.org/MoonWarriors/index.html)
+- [Testcase](http://www.cocos2d-x.org/js-tests/)
 
-And you can download it from
-[Cocos2d-html5_v3.0_Alpha2_API_Doc.zip](http://cdn.cocos2d-x.org/Cocos2d-html5_v3.0_Alpha2_API_Doc.zip)
 
 ##How to Start a New Game
 
@@ -118,3 +123,8 @@ And they share the same project file which located in `build` folder, there are
    * OpenGL ES 2.0 (mobile) / OpenGL 2.1 (desktop) based
    * Full WebGL support and auto canvas fallback
 
+## Documentation
+- [Getting Started with Cocos2d-JS](http://cocos2d-x.org/wiki/Getting_Started_Cocos2d-JS)
+
+
+

frameworks/js-bindings/bindings/auto/api/jsb_cocos2dx_extension_auto_api.js

@@ -2958,16 +2958,6 @@ EditBox : function (
  */
 cc.EventAssetsManager = {
 
-/**
- * @method getAssetsManager
- * @return {cc.AssetsManager}
- */
-getAssetsManager : function (
-)
-{
-    return cc.AssetsManager;
-},
-
 /**
  * @method getAssetId
  * @return {String}
@@ -2989,13 +2979,13 @@ getMessage : function (
 },
 
 /**
- * @method getEventCode
- * @return {cc.EventAssetsManager::EventCode}
+ * @method getAssetsManager
+ * @return {cc.AssetsManager}
  */
-getEventCode : function (
+getAssetsManager : function (
 )
 {
-    return 0;
+    return cc.AssetsManager;
 },
 
 /**
@@ -3009,24 +2999,13 @@ getPercent : function (
 },
 
 /**
- * @method EventAssetsManager
- * @constructor
- * @param {String} arg0
- * @param {cc.AssetsManager} arg1
- * @param {cc.EventAssetsManager::EventCode} arg2
- * @param {float} arg3
- * @param {String} arg4
- * @param {String} arg5
+ * @method getEventCode
+ * @return {cc.EventAssetsManager::EventCode}
  */
-EventAssetsManager : function (
-str, 
-assetsmanager, 
-eventcode, 
-float, 
-str, 
-str 
+getEventCode : function (
 )
 {
+    return 0;
 },
 
 };

frameworks/js-bindings/bindings/auto/jsb_cocos2dx_extension_auto.cpp

@@ -8138,30 +8138,6 @@ void js_register_cocos2dx_extension_EditBox(JSContext *cx, JSObject *global) {
 JSClass  *jsb_cocos2d_extension_EventAssetsManager_class;
 JSObject *jsb_cocos2d_extension_EventAssetsManager_prototype;
 
-bool js_cocos2dx_extension_EventAssetsManager_getAssetsManager(JSContext *cx, uint32_t argc, jsval *vp)
-{
-	JSObject *obj = JS_THIS_OBJECT(cx, vp);
-	js_proxy_t *proxy = jsb_get_js_proxy(obj);
-	cocos2d::extension::EventAssetsManager* cobj = (cocos2d::extension::EventAssetsManager *)(proxy ? proxy->ptr : NULL);
-	JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_extension_EventAssetsManager_getAssetsManager : Invalid Native Object");
-	if (argc == 0) {
-		cocos2d::extension::AssetsManager* ret = cobj->getAssetsManager();
-		jsval jsret = JSVAL_NULL;
-		do {
-			if (ret) {
-				js_proxy_t *jsProxy = js_get_or_create_proxy<cocos2d::extension::AssetsManager>(cx, (cocos2d::extension::AssetsManager*)ret);
-				jsret = OBJECT_TO_JSVAL(jsProxy->obj);
-			} else {
-				jsret = JSVAL_NULL;
-			}
-		} while (0);
-		JS_SET_RVAL(cx, vp, jsret);
-		return true;
-	}
-
-	JS_ReportError(cx, "js_cocos2dx_extension_EventAssetsManager_getAssetsManager : wrong number of arguments: %d, was expecting %d", argc, 0);
-	return false;
-}
 bool js_cocos2dx_extension_EventAssetsManager_getAssetId(JSContext *cx, uint32_t argc, jsval *vp)
 {
 	JSObject *obj = JS_THIS_OBJECT(cx, vp);
@@ -8196,21 +8172,28 @@ bool js_cocos2dx_extension_EventAssetsManager_getMessage(JSContext *cx, uint32_t
 	JS_ReportError(cx, "js_cocos2dx_extension_EventAssetsManager_getMessage : wrong number of arguments: %d, was expecting %d", argc, 0);
 	return false;
 }
-bool js_cocos2dx_extension_EventAssetsManager_getEventCode(JSContext *cx, uint32_t argc, jsval *vp)
+bool js_cocos2dx_extension_EventAssetsManager_getAssetsManager(JSContext *cx, uint32_t argc, jsval *vp)
 {
 	JSObject *obj = JS_THIS_OBJECT(cx, vp);
 	js_proxy_t *proxy = jsb_get_js_proxy(obj);
 	cocos2d::extension::EventAssetsManager* cobj = (cocos2d::extension::EventAssetsManager *)(proxy ? proxy->ptr : NULL);
-	JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_extension_EventAssetsManager_getEventCode : Invalid Native Object");
+	JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_extension_EventAssetsManager_getAssetsManager : Invalid Native Object");
 	if (argc == 0) {
-		int ret = (int)cobj->getEventCode();
+		cocos2d::extension::AssetsManager* ret = cobj->getAssetsManager();
 		jsval jsret = JSVAL_NULL;
-		jsret = int32_to_jsval(cx, ret);
+		do {
+			if (ret) {
+				js_proxy_t *jsProxy = js_get_or_create_proxy<cocos2d::extension::AssetsManager>(cx, (cocos2d::extension::AssetsManager*)ret);
+				jsret = OBJECT_TO_JSVAL(jsProxy->obj);
+			} else {
+				jsret = JSVAL_NULL;
+			}
+		} while (0);
 		JS_SET_RVAL(cx, vp, jsret);
 		return true;
 	}
 
-	JS_ReportError(cx, "js_cocos2dx_extension_EventAssetsManager_getEventCode : wrong number of arguments: %d, was expecting %d", argc, 0);
+	JS_ReportError(cx, "js_cocos2dx_extension_EventAssetsManager_getAssetsManager : wrong number of arguments: %d, was expecting %d", argc, 0);
 	return false;
 }
 bool js_cocos2dx_extension_EventAssetsManager_getPercent(JSContext *cx, uint32_t argc, jsval *vp)
@@ -8230,46 +8213,23 @@ bool js_cocos2dx_extension_EventAssetsManager_getPercent(JSContext *cx, uint32_t
 	JS_ReportError(cx, "js_cocos2dx_extension_EventAssetsManager_getPercent : wrong number of arguments: %d, was expecting %d", argc, 0);
 	return false;
 }
-bool js_cocos2dx_extension_EventAssetsManager_constructor(JSContext *cx, uint32_t argc, jsval *vp)
+bool js_cocos2dx_extension_EventAssetsManager_getEventCode(JSContext *cx, uint32_t argc, jsval *vp)
 {
-	jsval *argv = JS_ARGV(cx, vp);
-	bool ok = true;
-    std::string arg0;
-    cocos2d::extension::AssetsManager* arg1;
-    cocos2d::extension::EventAssetsManager::EventCode arg2;
-    ok &= jsval_to_std_string(cx, argv[0], &arg0);
-    do {
-			if (!argv[1].isObject()) { ok = false; break; }
-			js_proxy_t *jsProxy;
-			JSObject *tmpObj = JSVAL_TO_OBJECT(argv[1]);
-			jsProxy = jsb_get_js_proxy(tmpObj);
-			arg1 = (cocos2d::extension::AssetsManager*)(jsProxy ? jsProxy->ptr : NULL);
-			JSB_PRECONDITION2( arg1, cx, false, "Invalid Native Object");
-		} while (0);
-    ok &= jsval_to_int32(cx, argv[2], (int32_t *)&arg2);
-    JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_extension_EventAssetsManager_constructor : Error processing arguments");
-    cocos2d::extension::EventAssetsManager* cobj = new cocos2d::extension::EventAssetsManager(arg0, arg1, arg2);
-    cocos2d::Ref *_ccobj = dynamic_cast<cocos2d::Ref *>(cobj);
-    if (_ccobj) {
-        _ccobj->autorelease();
-    }
-    TypeTest<cocos2d::extension::EventAssetsManager> t;
-    js_type_class_t *typeClass = nullptr;
-    std::string typeName = t.s_name();
-    auto typeMapIter = _js_global_type_map.find(typeName);
-    CCASSERT(typeMapIter != _js_global_type_map.end(), "Can't find the class type!");
-    typeClass = typeMapIter->second;
-    CCASSERT(typeClass, "The value is null.");
-    JSObject *obj = JS_NewObject(cx, typeClass->jsclass, typeClass->proto, typeClass->parentProto);
-    JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(obj));
-    // link the native object with the javascript object
-    js_proxy_t* p = jsb_new_proxy(cobj, obj);
-    JS_AddNamedObjectRoot(cx, &p->obj, "cocos2d::extension::EventAssetsManager");
-    if (JS_HasProperty(cx, obj, "_ctor", &ok))
-        ScriptingCore::getInstance()->executeFunctionWithOwner(OBJECT_TO_JSVAL(obj), "_ctor", argc, argv);
-    return true;
-}
+	JSObject *obj = JS_THIS_OBJECT(cx, vp);
+	js_proxy_t *proxy = jsb_get_js_proxy(obj);
+	cocos2d::extension::EventAssetsManager* cobj = (cocos2d::extension::EventAssetsManager *)(proxy ? proxy->ptr : NULL);
+	JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_extension_EventAssetsManager_getEventCode : Invalid Native Object");
+	if (argc == 0) {
+		int ret = (int)cobj->getEventCode();
+		jsval jsret = JSVAL_NULL;
+		jsret = int32_to_jsval(cx, ret);
+		JS_SET_RVAL(cx, vp, jsret);
+		return true;
+	}
 
+	JS_ReportError(cx, "js_cocos2dx_extension_EventAssetsManager_getEventCode : wrong number of arguments: %d, was expecting %d", argc, 0);
+	return false;
+}
 
 extern JSObject *jsb_cocos2d_EventCustom_prototype;
 
@@ -8296,11 +8256,11 @@ void js_register_cocos2dx_extension_EventAssetsManager(JSContext *cx, JSObject *
 	};
 
 	static JSFunctionSpec funcs[] = {
-		JS_FN("getAssetsManager", js_cocos2dx_extension_EventAssetsManager_getAssetsManager, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
 		JS_FN("getAssetId", js_cocos2dx_extension_EventAssetsManager_getAssetId, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
 		JS_FN("getMessage", js_cocos2dx_extension_EventAssetsManager_getMessage, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
-		JS_FN("getEventCode", js_cocos2dx_extension_EventAssetsManager_getEventCode, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
+		JS_FN("getAssetsManager", js_cocos2dx_extension_EventAssetsManager_getAssetsManager, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
 		JS_FN("getPercent", js_cocos2dx_extension_EventAssetsManager_getPercent, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
+		JS_FN("getEventCode", js_cocos2dx_extension_EventAssetsManager_getEventCode, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FS_END
 	};
 
@@ -8310,7 +8270,7 @@ void js_register_cocos2dx_extension_EventAssetsManager(JSContext *cx, JSObject *
 		cx, global,
 		jsb_cocos2d_EventCustom_prototype,
 		jsb_cocos2d_extension_EventAssetsManager_class,
-		js_cocos2dx_extension_EventAssetsManager_constructor, 0, // constructor
+		dummy_constructor<cocos2d::extension::EventAssetsManager>, 0, // no constructor
 		properties,
 		funcs,
 		NULL, // no static properties

frameworks/js-bindings/bindings/auto/jsb_cocos2dx_extension_auto.hpp

@@ -388,12 +388,11 @@ bool js_cocos2dx_extension_EventAssetsManager_constructor(JSContext *cx, uint32_
 void js_cocos2dx_extension_EventAssetsManager_finalize(JSContext *cx, JSObject *obj);
 void js_register_cocos2dx_extension_EventAssetsManager(JSContext *cx, JSObject *global);
 void register_all_cocos2dx_extension(JSContext* cx, JSObject* obj);
-bool js_cocos2dx_extension_EventAssetsManager_getAssetsManager(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_extension_EventAssetsManager_getAssetId(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_extension_EventAssetsManager_getMessage(JSContext *cx, uint32_t argc, jsval *vp);
-bool js_cocos2dx_extension_EventAssetsManager_getEventCode(JSContext *cx, uint32_t argc, jsval *vp);
+bool js_cocos2dx_extension_EventAssetsManager_getAssetsManager(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_extension_EventAssetsManager_getPercent(JSContext *cx, uint32_t argc, jsval *vp);
-bool js_cocos2dx_extension_EventAssetsManager_EventAssetsManager(JSContext *cx, uint32_t argc, jsval *vp);
+bool js_cocos2dx_extension_EventAssetsManager_getEventCode(JSContext *cx, uint32_t argc, jsval *vp);
 
 extern JSClass  *jsb_cocos2d_extension_Manifest_class;
 extern JSObject *jsb_cocos2d_extension_Manifest_prototype;

frameworks/js-bindings/bindings/proj.win32/libJSBinding.vcxproj

@@ -50,6 +50,8 @@
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -58,6 +60,8 @@
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

frameworks/js-bindings/bindings/proj.win32/libJSBindingForBuilder.vcxproj

@@ -35,6 +35,8 @@
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -43,6 +45,8 @@
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">