Merge branch 'v3' into v3-winrt-ogg

cocos/2d/CCActionInterval.cpp

@@ -2106,7 +2106,7 @@ TintBy* TintBy::clone() const
 {
     // no copy constructor
     auto a = new (std::nothrow) TintBy();
-    a->initWithDuration(_duration, (GLubyte)_deltaR, (GLubyte)_deltaG, (GLubyte)_deltaB);
+    a->initWithDuration(_duration, _deltaR, _deltaG, _deltaB);
     a->autorelease();
     return a;
 }

cocos/2d/CCComponent.cpp

@@ -74,8 +74,7 @@ void Component::onEnter()
 #if CC_ENABLE_SCRIPT_BINDING
     if (_scriptType == kScriptTypeJavascript)
     {
-        if (sendComponentEventToJS(this, kComponentOnEnter))
+        sendComponentEventToJS(this, kComponentOnEnter);
-            return;
     }
 #endif
 }
@@ -85,8 +84,27 @@ void Component::onExit()
 #if CC_ENABLE_SCRIPT_BINDING
     if (_scriptType == kScriptTypeJavascript)
     {
-        if (sendComponentEventToJS(this, kComponentOnExit))
+        sendComponentEventToJS(this, kComponentOnExit);
-            return;
+    }
+#endif
+}
+
+void Component::onAdd()
+{
+#if CC_ENABLE_SCRIPT_BINDING
+    if (_scriptType == kScriptTypeJavascript)
+    {
+        sendComponentEventToJS(this, kComponentOnAdd);
+    }
+#endif
+}
+
+void Component::onRemove()
+{
+#if CC_ENABLE_SCRIPT_BINDING
+    if (_scriptType == kScriptTypeJavascript)
+    {
+        sendComponentEventToJS(this, kComponentOnRemove);
     }
 #endif
 }
@@ -96,8 +114,7 @@ void Component::update(float delta)
 #if CC_ENABLE_SCRIPT_BINDING
     if (_scriptType == kScriptTypeJavascript)
     {
-        if (sendComponentEventToJS(this, kComponentOnUpdate))
+        sendComponentEventToJS(this, kComponentOnUpdate);
-            return;
     }
 #endif
 }

cocos/2d/CCComponent.h

@@ -38,6 +38,8 @@ class Node;
 enum {
     kComponentOnEnter,
     kComponentOnExit,
+    kComponentOnAdd,
+    kComponentOnRemove,
     kComponentOnUpdate
 };
 
@@ -58,6 +60,8 @@ public:
 
     virtual void onEnter();
     virtual void onExit();
+    virtual void onAdd();
+    virtual void onRemove();
     virtual void update(float delta);
     virtual bool serialize(void* r);
     virtual bool isEnabled() const;

cocos/2d/CCComponentContainer.cpp

@@ -68,7 +68,7 @@ bool ComponentContainer::add(Component *com)
         CC_BREAK_IF(component);
         com->setOwner(_owner);
         _components->insert(com->getName(), com);
-        com->onEnter();
+        com->onAdd();
         ret = true;
     } while(0);
     return ret;
@@ -85,7 +85,7 @@ bool ComponentContainer::remove(const std::string& name)
         CC_BREAK_IF(iter == _components->end());
         
         auto com = iter->second;
-        com->onExit();
+        com->onRemove();
         com->setOwner(nullptr);
         
         _components->erase(iter);
@@ -105,7 +105,7 @@ bool ComponentContainer::remove(Component *com)
         {
             if (iter->second == com)
             {
-                com->onExit();
+                com->onRemove();
                 com->setOwner(nullptr);
                 _components->erase(iter);
                 break;
@@ -122,7 +122,7 @@ void ComponentContainer::removeAll()
     {
         for (auto iter = _components->begin(); iter != _components->end(); ++iter)
         {
-            iter->second->onExit();
+            iter->second->onRemove();
             iter->second->setOwner(nullptr);
         }
         

cocos/2d/CCNode.cpp

@@ -1419,6 +1419,11 @@ void Node::onEnter()
     if (_onEnterCallback)
         _onEnterCallback();
 
+    if (_componentContainer && !_componentContainer->isEmpty())
+    {
+        _componentContainer->onEnter();
+    }
+
 #if CC_ENABLE_SCRIPT_BINDING
     if (_scriptType == kScriptTypeJavascript)
     {
@@ -1498,6 +1503,11 @@ void Node::onExit()
     if (_onExitCallback)
         _onExitCallback();
     
+    if (_componentContainer && !_componentContainer->isEmpty())
+    {
+        _componentContainer->onExit();
+    }
+
 #if CC_ENABLE_SCRIPT_BINDING
     if (_scriptType == kScriptTypeJavascript)
     {

cocos/base/CCData.cpp

@@ -24,6 +24,7 @@
  ****************************************************************************/
 
 #include "base/CCData.h"
+#include "base/CCConsole.h"
 
 NS_CC_BEGIN
 

cocos/base/CCEventListener.cpp

@@ -23,6 +23,7 @@
  ****************************************************************************/
 
 #include "base/CCEventListener.h"
+#include "base/CCConsole.h"
 
 NS_CC_BEGIN
 

cocos/base/CCEventListenerAcceleration.cpp

@@ -24,6 +24,7 @@
 
 #include "base/CCEventListenerAcceleration.h"
 #include "base/CCEventAcceleration.h"
+#include "base/CCConsole.h"
 
 NS_CC_BEGIN
 

cocos/editor-support/cocostudio/CCComAudio.cpp

@@ -56,6 +56,16 @@ void ComAudio::onExit()
     stopAllEffects();
 }
 
+void ComAudio::onAdd()
+{
+}
+
+void ComAudio::onRemove()
+{
+    stopBackgroundMusic(true);
+    stopAllEffects();
+}
+
 bool ComAudio::isEnabled() const
 {
     return _enabled;

cocos/editor-support/cocostudio/CCComAudio.h

@@ -59,6 +59,16 @@ public:
      * @lua NA
      */
     virtual void onExit() override;
+	/**
+	* @js NA
+	* @lua NA
+	*/
+	virtual void onAdd() override;
+	/**
+	* @js NA
+	* @lua NA
+	*/
+	virtual void onRemove() override;
     virtual bool isEnabled() const override;
     virtual void setEnabled(bool b) override;
     virtual bool serialize(void* r) override;

cocos/editor-support/cocostudio/CCComController.cpp

@@ -54,6 +54,18 @@ void ComController::onExit()
 {
 }
 
+void ComController::onAdd()
+{
+    if (_owner != nullptr)
+    {
+       _owner->scheduleUpdate();
+    }
+}
+
+void ComController::onRemove()
+{
+}
+
 void ComController::update(float delta)
 {
 }

cocos/editor-support/cocostudio/CCComController.h

@@ -59,6 +59,16 @@ public:
      * @lua NA
      */
     virtual void onExit() override;
+    /**
+    * @js NA
+    * @lua NA
+    */
+    virtual void onAdd() override;
+    /**
+    * @js NA
+    * @lua NA
+    */
+    virtual void onRemove() override;
     virtual void update(float delta) override;
     virtual bool isEnabled() const override;
     virtual void setEnabled(bool b) override;

cocos/editor-support/cocostudio/CCComRender.cpp

@@ -68,6 +68,22 @@ void ComRender::onExit()
     }
 }
 
+void ComRender::onAdd()
+{
+    if (_owner != nullptr)
+    {
+        _owner->addChild(_render);
+    }
+}
+
+void ComRender::onRemove()
+{
+    if (_owner != nullptr)
+    {
+        _owner->removeChild(_render, true);
+    }
+}
+
 cocos2d::Node* ComRender::getNode()
 {
     return _render;

cocos/editor-support/cocostudio/CCComRender.h

@@ -57,6 +57,16 @@ public:
      * @lua NA
      */
     virtual void onExit() override;
+    /**
+    * @js NA
+    * @lua NA
+    */
+    virtual void onAdd() override;
+    /**
+    * @js NA
+    * @lua NA
+    */
+    virtual void onRemove() override;
     virtual bool serialize(void* r) override;
     virtual cocos2d::Node* getNode();
     virtual void setNode(cocos2d::Node *node);

cocos/network/HttpClient.cpp

@@ -202,6 +202,8 @@ static bool configureCURL(HttpClient* client, CURL* handle, char* errorBuffer)
     // Document is here: http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTNOSIGNAL 
     curl_easy_setopt(handle, CURLOPT_NOSIGNAL, 1L);
 
+    curl_easy_setopt(handle, CURLOPT_ACCEPT_ENCODING, "");
+
     return true;
 }
 

cocos/physics3d/CCPhysics3DComponent.cpp

@@ -147,7 +147,7 @@ void Physics3DComponent::preSimulate()
 {
     if (((int)_syncFlag & (int)Physics3DComponent::PhysicsSyncFlag::NODE_TO_PHYSICS) && _physics3DObj && _owner)
     {
-        syncToNode();
+        syncNodeToPhysics();
     }
 }
 
@@ -155,7 +155,7 @@ void Physics3DComponent::postSimulate()
 {
     if (((int)_syncFlag & (int)Physics3DComponent::PhysicsSyncFlag::PHYSICS_TO_NODE) && _physics3DObj && _owner)
     {
-        syncToPhysics();
+        syncPhysicsToNode();
     }
 }
 
@@ -174,7 +174,7 @@ void Physics3DComponent::setSyncFlag(PhysicsSyncFlag syncFlag)
     _syncFlag = syncFlag;
 }
 
-void Physics3DComponent::syncToPhysics()
+void Physics3DComponent::syncPhysicsToNode()
 {
     if (_physics3DObj->getObjType() == Physics3DObject::PhysicsObjType::RIGID_BODY)
     {
@@ -207,7 +207,7 @@ void Physics3DComponent::syncToPhysics()
     }
 }
 
-void Physics3DComponent::syncToNode()
+void Physics3DComponent::syncNodeToPhysics()
 {
     if (_physics3DObj->getObjType() == Physics3DObject::PhysicsObjType::RIGID_BODY)
     {

cocos/physics3d/CCPhysics3DComponent.h

@@ -110,14 +110,14 @@ public:
     void setSyncFlag(PhysicsSyncFlag syncFlag);
     
     /**
-     * align node and physics according to physics object
+     * synchronize node transformation to physics
      */
-    void syncToPhysics();
+    void syncNodeToPhysics();
     
     /**
-     * align node and physics according to node
+     * synchronize physics transformation to node
      */
-    void syncToNode();
+    void syncPhysicsToNode();
     
 CC_CONSTRUCTOR_ACCESS:
     Physics3DComponent();

cocos/physics3d/CCPhysicsSprite3D.cpp

@@ -57,16 +57,16 @@ void PhysicsSprite3D::setSyncFlag(Physics3DComponent::PhysicsSyncFlag syncFlag)
         _physicsComponent->setSyncFlag(syncFlag);
 }
 
-void PhysicsSprite3D::syncToPhysics()
+void PhysicsSprite3D::syncNodeToPhysics()
 {
     if (_physicsComponent)
-        _physicsComponent->syncToPhysics();
+        _physicsComponent->syncNodeToPhysics();
 }
 
-void PhysicsSprite3D::syncToNode()
+void PhysicsSprite3D::syncPhysicsToNode()
 {
     if (_physicsComponent)
-        _physicsComponent->syncToNode();
+        _physicsComponent->syncPhysicsToNode();
 }
 
 PhysicsSprite3D::PhysicsSprite3D()

cocos/physics3d/CCPhysicsSprite3D.h

@@ -56,11 +56,11 @@ public:
     /** Set synchronization flag, see Physics3DComponent. */
     void setSyncFlag(Physics3DComponent::PhysicsSyncFlag syncFlag);
     
-    /** Physics synchronize rendering. */
+    /** synchronize node transformation to physics. */
-    void syncToPhysics();
+    void syncNodeToPhysics();
     
-    /** Rendering synchronize physics. */
+    /** synchronize physics transformation to node. */
-    void syncToNode();
+    void syncPhysicsToNode();
     
 CC_CONSTRUCTOR_ACCESS:
     PhysicsSprite3D();

cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHttpURLConnection.java

@@ -28,6 +28,8 @@ import java.io.DataInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.InflaterInputStream;
 import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -260,11 +262,20 @@ public class Cocos2dxHttpURLConnection
     }
 
     static byte[] getResponseContent(HttpURLConnection http) {
-        DataInputStream in;
+        InputStream in;
-        try {
+        try {            
-            in = new DataInputStream(http.getInputStream());
+            in = http.getInputStream();
+            String contentEncoding = http.getContentEncoding();
+            if (contentEncoding != null) {
+                if(contentEncoding.equalsIgnoreCase("gzip")){
+                    in = new GZIPInputStream(http.getInputStream()); //reads 2 bytes to determine GZIP stream!
+                }
+                else if(contentEncoding.equalsIgnoreCase("deflate")){
+                    in = new InflaterInputStream(http.getInputStream());
+                }
+            }       
         } catch (IOException e) {
-            in = new DataInputStream(http.getErrorStream());
+            in = http.getErrorStream();
         } catch (Exception e) {
             Log.e("Cocos2dxHttpURLConnection exception", e.toString());
             return null;

cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js

@@ -22213,16 +22213,6 @@ isEnabled : function (
     return false;
 },
 
-/**
- * @method update
- * @param {float} arg0
- */
-update : function (
-float 
-)
-{
-},
-
 /**
  * @method getOwner
  * @return {cc.Node}
@@ -22243,16 +22233,6 @@ init : function (
     return false;
 },
 
-/**
- * @method setOwner
- * @param {cc.Node} arg0
- */
-setOwner : function (
-node 
-)
-{
-},
-
 /**
  * @method getName
  * @return {String}
@@ -22263,6 +22243,16 @@ getName : function (
     return ;
 },
 
+/**
+ * @method setOwner
+ * @param {cc.Node} arg0
+ */
+setOwner : function (
+node 
+)
+{
+},
+
 /**
  * @method create
  * @return {cc.Component}

cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_physics3d_auto_api.js

@@ -726,6 +726,14 @@ Physics3DRigidBody : function (
  */
 cc.Physics3DComponent = {
 
+/**
+ * @method syncNodeToPhysics
+ */
+syncNodeToPhysics : function (
+)
+{
+},
+
 /**
  * @method addToPhysicsWorld
  * @param {cc.Physics3DWorld} arg0
@@ -737,17 +745,9 @@ physics3dworld
 },
 
 /**
- * @method syncToPhysics
+ * @method syncPhysicsToNode
  */
-syncToPhysics : function (
+syncPhysicsToNode : function (
-)
-{
-},
-
-/**
- * @method syncToNode
- */
-syncToNode : function (
 )
 {
 },
@@ -837,17 +837,17 @@ Physics3DComponent : function (
 cc.PhysicsSprite3D = {
 
 /**
- * @method syncToPhysics
+ * @method syncNodeToPhysics
  */
-syncToPhysics : function (
+syncNodeToPhysics : function (
 )
 {
 },
 
 /**
- * @method syncToNode
+ * @method syncPhysicsToNode
  */
-syncToNode : function (
+syncPhysicsToNode : function (
 )
 {
 },

cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp

@@ -67823,26 +67823,6 @@ bool js_cocos2dx_Component_isEnabled(JSContext *cx, uint32_t argc, jsval *vp)
     JS_ReportError(cx, "js_cocos2dx_Component_isEnabled : wrong number of arguments: %d, was expecting %d", argc, 0);
     return false;
 }
-bool js_cocos2dx_Component_update(JSContext *cx, uint32_t argc, jsval *vp)
-{
-    JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
-    bool ok = true;
-    JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
-    js_proxy_t *proxy = jsb_get_js_proxy(obj);
-    cocos2d::Component* cobj = (cocos2d::Component *)(proxy ? proxy->ptr : NULL);
-    JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Component_update : Invalid Native Object");
-    if (argc == 1) {
-        double arg0;
-        ok &= JS::ToNumber( cx, args.get(0), &arg0) && !isnan(arg0);
-        JSB_PRECONDITION2(ok, cx, false, "js_cocos2dx_Component_update : Error processing arguments");
-        cobj->update(arg0);
-        args.rval().setUndefined();
-        return true;
-    }
-
-    JS_ReportError(cx, "js_cocos2dx_Component_update : wrong number of arguments: %d, was expecting %d", argc, 1);
-    return false;
-}
 bool js_cocos2dx_Component_getOwner(JSContext *cx, uint32_t argc, jsval *vp)
 {
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -67886,6 +67866,24 @@ bool js_cocos2dx_Component_init(JSContext *cx, uint32_t argc, jsval *vp)
     JS_ReportError(cx, "js_cocos2dx_Component_init : wrong number of arguments: %d, was expecting %d", argc, 0);
     return false;
 }
+bool js_cocos2dx_Component_getName(JSContext *cx, uint32_t argc, jsval *vp)
+{
+    JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+    JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
+    js_proxy_t *proxy = jsb_get_js_proxy(obj);
+    cocos2d::Component* cobj = (cocos2d::Component *)(proxy ? proxy->ptr : NULL);
+    JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Component_getName : Invalid Native Object");
+    if (argc == 0) {
+        const std::string& ret = cobj->getName();
+        jsval jsret = JSVAL_NULL;
+        jsret = std_string_to_jsval(cx, ret);
+        args.rval().set(jsret);
+        return true;
+    }
+
+    JS_ReportError(cx, "js_cocos2dx_Component_getName : wrong number of arguments: %d, was expecting %d", argc, 0);
+    return false;
+}
 bool js_cocos2dx_Component_setOwner(JSContext *cx, uint32_t argc, jsval *vp)
 {
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -67914,24 +67912,6 @@ bool js_cocos2dx_Component_setOwner(JSContext *cx, uint32_t argc, jsval *vp)
     JS_ReportError(cx, "js_cocos2dx_Component_setOwner : wrong number of arguments: %d, was expecting %d", argc, 1);
     return false;
 }
-bool js_cocos2dx_Component_getName(JSContext *cx, uint32_t argc, jsval *vp)
-{
-    JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
-    JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
-    js_proxy_t *proxy = jsb_get_js_proxy(obj);
-    cocos2d::Component* cobj = (cocos2d::Component *)(proxy ? proxy->ptr : NULL);
-    JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Component_getName : Invalid Native Object");
-    if (argc == 0) {
-        const std::string& ret = cobj->getName();
-        jsval jsret = JSVAL_NULL;
-        jsret = std_string_to_jsval(cx, ret);
-        args.rval().set(jsret);
-        return true;
-    }
-
-    JS_ReportError(cx, "js_cocos2dx_Component_getName : wrong number of arguments: %d, was expecting %d", argc, 0);
-    return false;
-}
 bool js_cocos2dx_Component_create(JSContext *cx, uint32_t argc, jsval *vp)
 {
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -68026,11 +68006,10 @@ void js_register_cocos2dx_Component(JSContext *cx, JS::HandleObject global) {
         JS_FN("setEnabled", js_cocos2dx_Component_setEnabled, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("setName", js_cocos2dx_Component_setName, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("isEnabled", js_cocos2dx_Component_isEnabled, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
-        JS_FN("update", js_cocos2dx_Component_update, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("getOwner", js_cocos2dx_Component_getOwner, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("init", js_cocos2dx_Component_init, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
-        JS_FN("setOwner", js_cocos2dx_Component_setOwner, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("getName", js_cocos2dx_Component_getName, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
+        JS_FN("setOwner", js_cocos2dx_Component_setOwner, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("ctor", js_cocos2d_Component_ctor, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FS_END
     };

cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp

@@ -3922,11 +3922,10 @@ void register_all_cocos2dx(JSContext* cx, JS::HandleObject obj);
 bool js_cocos2dx_Component_setEnabled(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_Component_setName(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_Component_isEnabled(JSContext *cx, uint32_t argc, jsval *vp);
-bool js_cocos2dx_Component_update(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_Component_getOwner(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_Component_init(JSContext *cx, uint32_t argc, jsval *vp);
-bool js_cocos2dx_Component_setOwner(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_Component_getName(JSContext *cx, uint32_t argc, jsval *vp);
+bool js_cocos2dx_Component_setOwner(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_Component_create(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_Component_Component(JSContext *cx, uint32_t argc, jsval *vp);
 

cocos/scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.cpp

@@ -1722,6 +1722,22 @@ void js_register_cocos2dx_physics3d_Physics3DRigidBody(JSContext *cx, JS::Handle
 JSClass  *jsb_cocos2d_Physics3DComponent_class;
 JSObject *jsb_cocos2d_Physics3DComponent_prototype;
 
+bool js_cocos2dx_physics3d_Physics3DComponent_syncNodeToPhysics(JSContext *cx, uint32_t argc, jsval *vp)
+{
+    JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+    JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
+    js_proxy_t *proxy = jsb_get_js_proxy(obj);
+    cocos2d::Physics3DComponent* cobj = (cocos2d::Physics3DComponent *)(proxy ? proxy->ptr : NULL);
+    JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_physics3d_Physics3DComponent_syncNodeToPhysics : Invalid Native Object");
+    if (argc == 0) {
+        cobj->syncNodeToPhysics();
+        args.rval().setUndefined();
+        return true;
+    }
+
+    JS_ReportError(cx, "js_cocos2dx_physics3d_Physics3DComponent_syncNodeToPhysics : wrong number of arguments: %d, was expecting %d", argc, 0);
+    return false;
+}
 bool js_cocos2dx_physics3d_Physics3DComponent_addToPhysicsWorld(JSContext *cx, uint32_t argc, jsval *vp)
 {
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -1750,36 +1766,20 @@ bool js_cocos2dx_physics3d_Physics3DComponent_addToPhysicsWorld(JSContext *cx, u
     JS_ReportError(cx, "js_cocos2dx_physics3d_Physics3DComponent_addToPhysicsWorld : wrong number of arguments: %d, was expecting %d", argc, 1);
     return false;
 }
-bool js_cocos2dx_physics3d_Physics3DComponent_syncToPhysics(JSContext *cx, uint32_t argc, jsval *vp)
+bool js_cocos2dx_physics3d_Physics3DComponent_syncPhysicsToNode(JSContext *cx, uint32_t argc, jsval *vp)
 {
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
     JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
     js_proxy_t *proxy = jsb_get_js_proxy(obj);
     cocos2d::Physics3DComponent* cobj = (cocos2d::Physics3DComponent *)(proxy ? proxy->ptr : NULL);
-    JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_physics3d_Physics3DComponent_syncToPhysics : Invalid Native Object");
+    JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_physics3d_Physics3DComponent_syncPhysicsToNode : Invalid Native Object");
     if (argc == 0) {
-        cobj->syncToPhysics();
+        cobj->syncPhysicsToNode();
         args.rval().setUndefined();
         return true;
     }
 
-    JS_ReportError(cx, "js_cocos2dx_physics3d_Physics3DComponent_syncToPhysics : wrong number of arguments: %d, was expecting %d", argc, 0);
+    JS_ReportError(cx, "js_cocos2dx_physics3d_Physics3DComponent_syncPhysicsToNode : wrong number of arguments: %d, was expecting %d", argc, 0);
-    return false;
-}
-bool js_cocos2dx_physics3d_Physics3DComponent_syncToNode(JSContext *cx, uint32_t argc, jsval *vp)
-{
-    JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
-    JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
-    js_proxy_t *proxy = jsb_get_js_proxy(obj);
-    cocos2d::Physics3DComponent* cobj = (cocos2d::Physics3DComponent *)(proxy ? proxy->ptr : NULL);
-    JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_physics3d_Physics3DComponent_syncToNode : Invalid Native Object");
-    if (argc == 0) {
-        cobj->syncToNode();
-        args.rval().setUndefined();
-        return true;
-    }
-
-    JS_ReportError(cx, "js_cocos2dx_physics3d_Physics3DComponent_syncToNode : wrong number of arguments: %d, was expecting %d", argc, 0);
     return false;
 }
 bool js_cocos2dx_physics3d_Physics3DComponent_getPhysics3DObject(JSContext *cx, uint32_t argc, jsval *vp)
@@ -2061,9 +2061,9 @@ void js_register_cocos2dx_physics3d_Physics3DComponent(JSContext *cx, JS::Handle
     };
 
     static JSFunctionSpec funcs[] = {
+        JS_FN("syncNodeToPhysics", js_cocos2dx_physics3d_Physics3DComponent_syncNodeToPhysics, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("addToPhysicsWorld", js_cocos2dx_physics3d_Physics3DComponent_addToPhysicsWorld, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
-        JS_FN("syncToPhysics", js_cocos2dx_physics3d_Physics3DComponent_syncToPhysics, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
+        JS_FN("syncPhysicsToNode", js_cocos2dx_physics3d_Physics3DComponent_syncPhysicsToNode, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
-        JS_FN("syncToNode", js_cocos2dx_physics3d_Physics3DComponent_syncToNode, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("getPhysics3DObject", js_cocos2dx_physics3d_Physics3DComponent_getPhysics3DObject, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("setPhysics3DObject", js_cocos2dx_physics3d_Physics3DComponent_setPhysics3DObject, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("setSyncFlag", js_cocos2dx_physics3d_Physics3DComponent_setSyncFlag, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
@@ -2108,36 +2108,36 @@ void js_register_cocos2dx_physics3d_Physics3DComponent(JSContext *cx, JS::Handle
 JSClass  *jsb_cocos2d_PhysicsSprite3D_class;
 JSObject *jsb_cocos2d_PhysicsSprite3D_prototype;
 
-bool js_cocos2dx_physics3d_PhysicsSprite3D_syncToPhysics(JSContext *cx, uint32_t argc, jsval *vp)
+bool js_cocos2dx_physics3d_PhysicsSprite3D_syncNodeToPhysics(JSContext *cx, uint32_t argc, jsval *vp)
 {
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
     JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
     js_proxy_t *proxy = jsb_get_js_proxy(obj);
     cocos2d::PhysicsSprite3D* cobj = (cocos2d::PhysicsSprite3D *)(proxy ? proxy->ptr : NULL);
-    JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_physics3d_PhysicsSprite3D_syncToPhysics : Invalid Native Object");
+    JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_physics3d_PhysicsSprite3D_syncNodeToPhysics : Invalid Native Object");
     if (argc == 0) {
-        cobj->syncToPhysics();
+        cobj->syncNodeToPhysics();
         args.rval().setUndefined();
         return true;
     }
 
-    JS_ReportError(cx, "js_cocos2dx_physics3d_PhysicsSprite3D_syncToPhysics : wrong number of arguments: %d, was expecting %d", argc, 0);
+    JS_ReportError(cx, "js_cocos2dx_physics3d_PhysicsSprite3D_syncNodeToPhysics : wrong number of arguments: %d, was expecting %d", argc, 0);
     return false;
 }
-bool js_cocos2dx_physics3d_PhysicsSprite3D_syncToNode(JSContext *cx, uint32_t argc, jsval *vp)
+bool js_cocos2dx_physics3d_PhysicsSprite3D_syncPhysicsToNode(JSContext *cx, uint32_t argc, jsval *vp)
 {
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
     JS::RootedObject obj(cx, args.thisv().toObjectOrNull());
     js_proxy_t *proxy = jsb_get_js_proxy(obj);
     cocos2d::PhysicsSprite3D* cobj = (cocos2d::PhysicsSprite3D *)(proxy ? proxy->ptr : NULL);
-    JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_physics3d_PhysicsSprite3D_syncToNode : Invalid Native Object");
+    JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_physics3d_PhysicsSprite3D_syncPhysicsToNode : Invalid Native Object");
     if (argc == 0) {
-        cobj->syncToNode();
+        cobj->syncPhysicsToNode();
         args.rval().setUndefined();
         return true;
     }
 
-    JS_ReportError(cx, "js_cocos2dx_physics3d_PhysicsSprite3D_syncToNode : wrong number of arguments: %d, was expecting %d", argc, 0);
+    JS_ReportError(cx, "js_cocos2dx_physics3d_PhysicsSprite3D_syncPhysicsToNode : wrong number of arguments: %d, was expecting %d", argc, 0);
     return false;
 }
 bool js_cocos2dx_physics3d_PhysicsSprite3D_getPhysicsObj(JSContext *cx, uint32_t argc, jsval *vp)
@@ -2240,8 +2240,8 @@ void js_register_cocos2dx_physics3d_PhysicsSprite3D(JSContext *cx, JS::HandleObj
     };
 
     static JSFunctionSpec funcs[] = {
-        JS_FN("syncToPhysics", js_cocos2dx_physics3d_PhysicsSprite3D_syncToPhysics, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
+        JS_FN("syncNodeToPhysics", js_cocos2dx_physics3d_PhysicsSprite3D_syncNodeToPhysics, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
-        JS_FN("syncToNode", js_cocos2dx_physics3d_PhysicsSprite3D_syncToNode, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
+        JS_FN("syncPhysicsToNode", js_cocos2dx_physics3d_PhysicsSprite3D_syncPhysicsToNode, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("getPhysicsObj", js_cocos2dx_physics3d_PhysicsSprite3D_getPhysicsObj, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FN("setSyncFlag", js_cocos2dx_physics3d_PhysicsSprite3D_setSyncFlag, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE),
         JS_FS_END

cocos/scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.hpp

@@ -103,9 +103,9 @@ bool js_cocos2dx_physics3d_Physics3DComponent_constructor(JSContext *cx, uint32_
 void js_cocos2dx_physics3d_Physics3DComponent_finalize(JSContext *cx, JSObject *obj);
 void js_register_cocos2dx_physics3d_Physics3DComponent(JSContext *cx, JS::HandleObject global);
 void register_all_cocos2dx_physics3d(JSContext* cx, JS::HandleObject obj);
+bool js_cocos2dx_physics3d_Physics3DComponent_syncNodeToPhysics(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_physics3d_Physics3DComponent_addToPhysicsWorld(JSContext *cx, uint32_t argc, jsval *vp);
-bool js_cocos2dx_physics3d_Physics3DComponent_syncToPhysics(JSContext *cx, uint32_t argc, jsval *vp);
+bool js_cocos2dx_physics3d_Physics3DComponent_syncPhysicsToNode(JSContext *cx, uint32_t argc, jsval *vp);
-bool js_cocos2dx_physics3d_Physics3DComponent_syncToNode(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_physics3d_Physics3DComponent_getPhysics3DObject(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_physics3d_Physics3DComponent_setPhysics3DObject(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_physics3d_Physics3DComponent_setSyncFlag(JSContext *cx, uint32_t argc, jsval *vp);
@@ -121,8 +121,8 @@ bool js_cocos2dx_physics3d_PhysicsSprite3D_constructor(JSContext *cx, uint32_t a
 void js_cocos2dx_physics3d_PhysicsSprite3D_finalize(JSContext *cx, JSObject *obj);
 void js_register_cocos2dx_physics3d_PhysicsSprite3D(JSContext *cx, JS::HandleObject global);
 void register_all_cocos2dx_physics3d(JSContext* cx, JS::HandleObject obj);
-bool js_cocos2dx_physics3d_PhysicsSprite3D_syncToPhysics(JSContext *cx, uint32_t argc, jsval *vp);
+bool js_cocos2dx_physics3d_PhysicsSprite3D_syncNodeToPhysics(JSContext *cx, uint32_t argc, jsval *vp);
-bool js_cocos2dx_physics3d_PhysicsSprite3D_syncToNode(JSContext *cx, uint32_t argc, jsval *vp);
+bool js_cocos2dx_physics3d_PhysicsSprite3D_syncPhysicsToNode(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_physics3d_PhysicsSprite3D_getPhysicsObj(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_physics3d_PhysicsSprite3D_setSyncFlag(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_physics3d_PhysicsSprite3D_PhysicsSprite3D(JSContext *cx, uint32_t argc, jsval *vp);

cocos/scripting/js-bindings/manual/ScriptingCore.cpp

@@ -1058,28 +1058,29 @@ int ScriptingCore::handleComponentEvent(void* data)
     JS::RootedValue retval(_cx);
     jsval dataVal = INT_TO_JSVAL(1);
     
-    if (action == kComponentOnEnter)
+    JS::RootedValue nodeValue(_cx, OBJECT_TO_JSVAL(p->obj.get()));
+    
+    if (action == kComponentOnAdd)
     {
-        if (isFunctionOverridedInJS(JS::RootedObject(_cx, p->obj.get()), "onEnter", js_cocos2dx_Component_onEnter))
+        ret = executeFunctionWithOwner(nodeValue, "onAdd", 1, &dataVal, &retval);
-        {
+    }
-            ret = executeFunctionWithOwner(OBJECT_TO_JSVAL(p->obj), "onEnter", 1, &dataVal, &retval);
+    else if (action == kComponentOnRemove)
-        }
+    {
+        ret = executeFunctionWithOwner(nodeValue, "onRemove", 1, &dataVal, &retval);
+    }
+    else if (action == kComponentOnEnter)
+    {
+        ret = executeFunctionWithOwner(nodeValue, "onEnter", 1, &dataVal, &retval);
         resumeSchedulesAndActions(p);
     }
     else if (action == kComponentOnExit)
     {
-        if (isFunctionOverridedInJS(JS::RootedObject(_cx, p->obj.get()), "onExit", js_cocos2dx_Component_onExit))
+        ret = executeFunctionWithOwner(nodeValue, "onExit", 1, &dataVal, &retval);
-        {
-            ret = executeFunctionWithOwner(OBJECT_TO_JSVAL(p->obj), "onExit", 1, &dataVal, &retval);
-        }
         pauseSchedulesAndActions(p);
     }
     else if (action == kComponentOnUpdate)
     {
-        if (isFunctionOverridedInJS(JS::RootedObject(_cx, p->obj.get()), "update", js_cocos2dx_Component_update))
+        ret = executeFunctionWithOwner(nodeValue, "update", 1, &dataVal, &retval);
-        {
-            ret = executeFunctionWithOwner(OBJECT_TO_JSVAL(p->obj), "update", 1, &dataVal, &retval);
-        }
     }
     
     return ret;

cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp

@@ -2693,36 +2693,6 @@ bool js_cocos2dx_CCNode_convertToWorldSpaceAR(JSContext *cx, uint32_t argc, jsva
     return true;
 }
 
-bool js_cocos2dx_Component_onEnter(JSContext *cx, uint32_t argc, jsval *vp)
-{
-    JSObject *thisObj = JS_THIS_OBJECT(cx, vp);
-    if (thisObj) {
-        js_proxy_t *proxy = jsb_get_js_proxy(thisObj);
-        if (proxy) {
-            ScriptingCore::getInstance()->setCalledFromScript(true);
-            static_cast<Component*>(proxy->ptr)->onEnter();
-            return true;
-        }
-    }
-    JS_ReportError(cx, "Invalid Native Object.");
-    return false;
-}
-
-bool js_cocos2dx_Component_onExit(JSContext *cx, uint32_t argc, jsval *vp)
-{
-    JSObject *thisObj = JS_THIS_OBJECT(cx, vp);
-    if (thisObj) {
-        js_proxy_t *proxy = jsb_get_js_proxy(thisObj);
-        if (proxy) {
-            ScriptingCore::getInstance()->setCalledFromScript(true);
-            static_cast<Component*>(proxy->ptr)->onExit();
-            return true;
-        }
-    }
-    JS_ReportError(cx, "Invalid Native Object.");
-    return false;
-}
-
 bool js_cocos2dx_CCTMXLayer_tileFlagsAt(JSContext *cx, uint32_t argc, jsval *vp)
 {
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
@@ -5490,10 +5460,6 @@ void register_cocos2dx_js_core(JSContext* cx, JS::HandleObject global)
     tmpObj.set(jsb_cocos2d_GLProgramState_prototype);
     JS_DefineFunction(cx, tmpObj, "setVertexAttribPointer", js_cocos2dx_GLProgramState_setVertexAttribPointer, 6, JSPROP_ENUMERATE | JSPROP_PERMANENT);
     JS_DefineFunction(cx, tmpObj, "setUniformVec4", js_cocos2dx_GLProgramState_setUniformVec4, 2, JSPROP_ENUMERATE | JSPROP_PERMANENT);
-    
-    tmpObj.set(jsb_cocos2d_Component_prototype);
-    JS_DefineFunction(cx, tmpObj, "onEnter", js_cocos2dx_Component_onEnter, 0, JSPROP_ENUMERATE  | JSPROP_PERMANENT);
-    JS_DefineFunction(cx, tmpObj, "onExit", js_cocos2dx_Component_onExit, 0, JSPROP_ENUMERATE  | JSPROP_PERMANENT);
 
     tmpObj.set(jsb_cocos2d_Scheduler_prototype);
     JS_DefineFunction(cx, tmpObj, "retain", js_cocos2dx_retain, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT);

cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp

@@ -908,7 +908,7 @@ bool js_cocos2dx_ext_release(JSContext *cx, uint32_t argc, jsval *vp)
 }
 
 
-__JSDownloaderDelegator::__JSDownloaderDelegator(JSContext *cx, JS::HandleObject obj, const std::string &url, JS::HandleValue callback)
+__JSDownloaderDelegator::__JSDownloaderDelegator(JSContext *cx, JS::HandleObject obj, const std::string &url, JS::HandleObject callback)
 : _cx(cx)
 , _url(url)
 , _buffer(nullptr)
@@ -917,7 +917,27 @@ __JSDownloaderDelegator::__JSDownloaderDelegator(JSContext *cx, JS::HandleObject
     _obj.ref().set(obj);
     _jsCallback.construct(_cx);
     _jsCallback.ref().set(callback);
-    
+}
+
+__JSDownloaderDelegator::~__JSDownloaderDelegator()
+{
+    _obj.destroyIfConstructed();
+    _jsCallback.destroyIfConstructed();
+    if (_buffer != nullptr)
+        free(_buffer);
+    _downloader->setErrorCallback(nullptr);
+    _downloader->setSuccessCallback(nullptr);
+}
+
+__JSDownloaderDelegator *__JSDownloaderDelegator::create(JSContext *cx, JS::HandleObject obj, const std::string &url, JS::HandleObject callback)
+{
+    __JSDownloaderDelegator *delegate = new (std::nothrow) __JSDownloaderDelegator(cx, obj, url, callback);
+    delegate->autorelease();
+    return delegate;
+}
+
+void __JSDownloaderDelegator::startDownload()
+{
     if (Director::getInstance()->getTextureCache()->getTextureForKey(_url))
     {
         onSuccess(nullptr, nullptr, nullptr);
@@ -929,12 +949,9 @@ __JSDownloaderDelegator::__JSDownloaderDelegator(JSContext *cx, JS::HandleObject
         _downloader->setErrorCallback( std::bind(&__JSDownloaderDelegator::onError, this, std::placeholders::_1) );
         _downloader->setSuccessCallback( std::bind(&__JSDownloaderDelegator::onSuccess, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3) );
         
-        long contentSize = _downloader->getContentSize(_url);
+        cocos2d::extension::Downloader::HeaderInfo info = _downloader->getHeader(_url);
-        if (contentSize == -1) {
+        long contentSize = info.contentSize;
-            cocos2d::extension::Downloader::Error err;
+        if (contentSize > 0 && info.responseCode < 400) {
-            onError(err);
-        }
-        else {
             _size = contentSize / sizeof(unsigned char);
             _buffer = (unsigned char*)malloc(contentSize);
             _downloader->downloadToBufferSync(_url, _buffer, _size);
@@ -942,79 +959,85 @@ __JSDownloaderDelegator::__JSDownloaderDelegator(JSContext *cx, JS::HandleObject
     }
 }
 
-__JSDownloaderDelegator::~__JSDownloaderDelegator()
+void __JSDownloaderDelegator::download()
 {
-    if (_buffer != nullptr)
+    retain();
-        free(_buffer);
+    startDownload();
-    _downloader->setErrorCallback(nullptr);
+}
-    _downloader->setSuccessCallback(nullptr);
+
+void __JSDownloaderDelegator::downloadAsync()
+{
+    retain();
+    auto t = std::thread(&__JSDownloaderDelegator::startDownload, this);
+    t.detach();
 }
 
 void __JSDownloaderDelegator::onError(const cocos2d::extension::Downloader::Error &error)
 {
-    if (!_jsCallback.ref().isNull()) {
+    Director::getInstance()->getScheduler()->performFunctionInCocosThread([this]
-        JSContext *cx = ScriptingCore::getInstance()->getGlobalContext();
+    {
-        JS::RootedObject global(cx, ScriptingCore::getInstance()->getGlobalObject());
+        JS::RootedValue callback(_cx, OBJECT_TO_JSVAL(_jsCallback.ref()));
-        
+        if (!callback.isNull()) {
-        JSAutoCompartment ac(_cx, _obj.ref());
+            JS::RootedObject global(_cx, ScriptingCore::getInstance()->getGlobalObject());
-        
+            JSAutoCompartment ac(_cx, global);
-        jsval succeed = BOOLEAN_TO_JSVAL(false);
+            
-        JS::RootedValue retval(cx);
+            jsval succeed = BOOLEAN_TO_JSVAL(false);
-        JS_CallFunctionValue(cx, global, _jsCallback.ref(), JS::HandleValueArray::fromMarkedLocation(1, &succeed), &retval);
+            JS::RootedValue retval(_cx);
-    }
+            JS_CallFunctionValue(_cx, global, callback, JS::HandleValueArray::fromMarkedLocation(1, &succeed), &retval);
-    this->release();
+        }
+        release();
+    });
 }
 
 void __JSDownloaderDelegator::onSuccess(const std::string &srcUrl, const std::string &storagePath, const std::string &customId)
 {
     Image *image = new Image();
-    jsval valArr[2];
-    JSContext *cx = ScriptingCore::getInstance()->getGlobalContext();
-    JS::RootedObject global(cx, ScriptingCore::getInstance()->getGlobalObject());
     cocos2d::TextureCache *cache = Director::getInstance()->getTextureCache();
     
-    JSAutoCompartment ac(_cx, _obj.ref() ? _obj.ref() : global);
-    
     Texture2D *tex = cache->getTextureForKey(_url);
-    if (tex)
+    if (!tex)
     {
-        valArr[0] = BOOLEAN_TO_JSVAL(true);
+        if (image->initWithImageData(_buffer, _size))
-        js_proxy_t* p = jsb_get_native_proxy(tex);
+        {
-        valArr[1] = OBJECT_TO_JSVAL(p->obj);
+            tex = Director::getInstance()->getTextureCache()->addImage(image, _url);
+        }
     }
-    else if (image->initWithImageData(_buffer, _size))
-    {
-        tex = Director::getInstance()->getTextureCache()->addImage(image, _url);
-        valArr[0] = BOOLEAN_TO_JSVAL(true);
-        
-        JS::RootedObject texProto(cx, jsb_cocos2d_Texture2D_prototype);
-        JSObject *obj = JS_NewObject(cx, jsb_cocos2d_Texture2D_class, texProto, global);
-        // link the native object with the javascript object
-        js_proxy_t* p = jsb_new_proxy(tex, obj);
-        JS::AddNamedObjectRoot(cx, &p->obj, "cocos2d::Texture2D");
-        valArr[1] = OBJECT_TO_JSVAL(p->obj);
-    }
-    else
-    {
-        valArr[0] = BOOLEAN_TO_JSVAL(false);
-        valArr[1] = JSVAL_NULL;
-    }
-    
     image->release();
     
-    if (!_jsCallback.ref().isNull()) {
+    Director::getInstance()->getScheduler()->performFunctionInCocosThread([this, tex]
-        JS::RootedValue retval(cx);
+    {
-        JS_CallFunctionValue(cx, global, _jsCallback.ref(), JS::HandleValueArray::fromMarkedLocation(2, valArr), &retval);
+        JS::RootedObject global(_cx, ScriptingCore::getInstance()->getGlobalObject());
-    }
+        JSAutoCompartment ac(_cx, global);
-    this->release();
+        
-}
+        jsval valArr[2];
-
+        if (tex)
-void __JSDownloaderDelegator::download(JSContext *cx, JS::HandleObject obj, const std::string &url, JS::HandleValue callback)
+        {
-{
+            valArr[0] = BOOLEAN_TO_JSVAL(true);
-    auto t = std::thread([cx, obj, url, callback]() {
+            js_proxy_t* p = jsb_get_native_proxy(tex);
-        new __JSDownloaderDelegator(cx, obj, url, callback);
+            if (!p)
+            {
+                JS::RootedObject texProto(_cx, jsb_cocos2d_Texture2D_prototype);
+                JSObject *obj = JS_NewObject(_cx, jsb_cocos2d_Texture2D_class, texProto, global);
+                // link the native object with the javascript object
+                p = jsb_new_proxy(tex, obj);
+                JS::AddNamedObjectRoot(_cx, &p->obj, "cocos2d::Texture2D");
+            }
+            valArr[1] = OBJECT_TO_JSVAL(p->obj);
+        }
+        else
+        {
+            valArr[0] = BOOLEAN_TO_JSVAL(false);
+            valArr[1] = JSVAL_NULL;
+        }
+    
+        JS::RootedValue callback(_cx, OBJECT_TO_JSVAL(_jsCallback.ref()));
+        if (!callback.isNull())
+        {
+            JS::RootedValue retval(_cx);
+            JS_CallFunctionValue(_cx, global, callback, JS::HandleValueArray::fromMarkedLocation(2, valArr), &retval);
+        }
+        release();
     });
-    t.detach();
 }
 
 // jsb.loadRemoteImg(url, function(succeed, result) {})
@@ -1022,14 +1045,15 @@ bool js_load_remote_image(JSContext *cx, uint32_t argc, jsval *vp)
 {
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
     JS::RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));
-    if (argc == 2) {
+    if (argc == 2)
+    {
         std::string url;
         bool ok = jsval_to_std_string(cx, args.get(0), &url);
-        JS::RootedValue callback(cx, args.get(1));
+        JSB_PRECONDITION2(ok, cx, false, "js_load_remote_image : Error processing arguments");
+        JS::RootedObject callback(cx, args.get(1).toObjectOrNull());
         
-        __JSDownloaderDelegator::download(cx, obj, url, callback);
+        __JSDownloaderDelegator *delegate = __JSDownloaderDelegator::create(cx, obj, url, callback);
-        
+        delegate->downloadAsync();
-        JSB_PRECONDITION2(ok, cx, false, "js_console_log : Error processing arguments");
         
         args.rval().setUndefined();
         return true;

cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.h

@@ -32,12 +32,17 @@
 class __JSDownloaderDelegator : cocos2d::Ref
 {
 public:
-    static void download(JSContext *cx, JS::HandleObject obj, const std::string &url, JS::HandleValue callback);
+    void downloadAsync();
+    void download();
     
+    static __JSDownloaderDelegator *create(JSContext *cx, JS::HandleObject obj, const std::string &url, JS::HandleObject callback);
+
 protected:
-    __JSDownloaderDelegator(JSContext *cx, JS::HandleObject obj, const std::string &url, JS::HandleValue callback);
+    __JSDownloaderDelegator(JSContext *cx, JS::HandleObject obj, const std::string &url, JS::HandleObject callback);
     ~__JSDownloaderDelegator();
     
+    void startDownload();
+    
 private:
     void onSuccess(const std::string &srcUrl, const std::string &storagePath, const std::string &customId);
     void onError(const cocos2d::extension::Downloader::Error &error);
@@ -46,8 +51,8 @@ private:
     std::shared_ptr<cocos2d::extension::Downloader> _downloader;
     std::string _url;
     JSContext *_cx;
-    mozilla::Maybe<JS::RootedValue> _jsCallback;
+    mozilla::Maybe<JS::PersistentRootedObject> _jsCallback;
-    mozilla::Maybe<JS::RootedObject> _obj;
+    mozilla::Maybe<JS::PersistentRootedObject> _obj;
 };
 
 void register_all_cocos2dx_extension_manual(JSContext* cx, JS::HandleObject global);

cocos/scripting/lua-bindings/auto/api/ComAudio.lua

@@ -199,12 +199,6 @@
 -- @param #bool b
 -- @return ComAudio#ComAudio self (return value: ccs.ComAudio)
         
---------------------------------
--- 
--- @function [parent=#ComAudio] isEnabled 
--- @param self
--- @return bool#bool ret (return value: bool)
-        
 --------------------------------
 -- 
 -- @function [parent=#ComAudio] serialize 
@@ -212,10 +206,30 @@
 -- @param #void r
 -- @return bool#bool ret (return value: bool)
         
+--------------------------------
+-- 
+-- @function [parent=#ComAudio] isEnabled 
+-- @param self
+-- @return bool#bool ret (return value: bool)
+        
+--------------------------------
+-- js NA<br>
+-- lua NA
+-- @function [parent=#ComAudio] onRemove 
+-- @param self
+-- @return ComAudio#ComAudio self (return value: ccs.ComAudio)
+        
 --------------------------------
 -- 
 -- @function [parent=#ComAudio] init 
 -- @param self
 -- @return bool#bool ret (return value: bool)
         
+--------------------------------
+-- js NA<br>
+-- lua NA
+-- @function [parent=#ComAudio] onAdd 
+-- @param self
+-- @return ComAudio#ComAudio self (return value: ccs.ComAudio)
+        
 return nil

cocos/scripting/lua-bindings/auto/api/ComController.lua

@@ -29,6 +29,13 @@
 -- @param self
 -- @return bool#bool ret (return value: bool)
         
+--------------------------------
+-- js NA<br>
+-- lua NA
+-- @function [parent=#ComController] onRemove 
+-- @param self
+-- @return ComController#ComController self (return value: ccs.ComController)
+        
 --------------------------------
 -- 
 -- @function [parent=#ComController] update 
@@ -42,6 +49,13 @@
 -- @param self
 -- @return bool#bool ret (return value: bool)
         
+--------------------------------
+-- js NA<br>
+-- lua NA
+-- @function [parent=#ComController] onAdd 
+-- @param self
+-- @return ComController#ComController self (return value: ccs.ComController)
+        
 --------------------------------
 -- js ctor
 -- @function [parent=#ComController] ComController 

cocos/scripting/lua-bindings/auto/api/ComRender.lua

@@ -39,4 +39,18 @@
 -- @param #void r
 -- @return bool#bool ret (return value: bool)
         
+--------------------------------
+-- js NA<br>
+-- lua NA
+-- @function [parent=#ComRender] onRemove 
+-- @param self
+-- @return ComRender#ComRender self (return value: ccs.ComRender)
+        
+--------------------------------
+-- js NA<br>
+-- lua NA
+-- @function [parent=#ComRender] onAdd 
+-- @param self
+-- @return ComRender#ComRender self (return value: ccs.ComRender)
+        
 return nil

cocos/scripting/lua-bindings/auto/api/Component.lua

@@ -24,6 +24,12 @@
 -- @param self
 -- @return bool#bool ret (return value: bool)
         
+--------------------------------
+-- 
+-- @function [parent=#Component] onRemove 
+-- @param self
+-- @return Component#Component self (return value: cc.Component)
+        
 --------------------------------
 -- 
 -- @function [parent=#Component] update 
@@ -45,9 +51,8 @@
         
 --------------------------------
 -- 
--- @function [parent=#Component] setOwner 
+-- @function [parent=#Component] onAdd 
 -- @param self
--- @param #cc.Node pOwner
 -- @return Component#Component self (return value: cc.Component)
         
 --------------------------------
@@ -56,6 +61,13 @@
 -- @param self
 -- @return string#string ret (return value: string)
         
+--------------------------------
+-- 
+-- @function [parent=#Component] setOwner 
+-- @param self
+-- @param #cc.Node pOwner
+-- @return Component#Component self (return value: cc.Component)
+        
 --------------------------------
 -- 
 -- @function [parent=#Component] create 

cocos/scripting/lua-bindings/auto/api/Physics3DComponent.lua

@@ -4,6 +4,12 @@
 -- @extend Component
 -- @parent_module cc
 
+--------------------------------
+-- synchronize node transformation to physics
+-- @function [parent=#Physics3DComponent] syncNodeToPhysics 
+-- @param self
+-- @return Physics3DComponent#Physics3DComponent self (return value: cc.Physics3DComponent)
+        
 --------------------------------
 -- add this component to physics world, called by scene
 -- @function [parent=#Physics3DComponent] addToPhysicsWorld 
@@ -12,14 +18,8 @@
 -- @return Physics3DComponent#Physics3DComponent self (return value: cc.Physics3DComponent)
         
 --------------------------------
--- align node and physics according to physics object
+-- synchronize physics transformation to node
--- @function [parent=#Physics3DComponent] syncToPhysics 
+-- @function [parent=#Physics3DComponent] syncPhysicsToNode 
--- @param self
--- @return Physics3DComponent#Physics3DComponent self (return value: cc.Physics3DComponent)
-        
---------------------------------
--- align node and physics according to node
--- @function [parent=#Physics3DComponent] syncToNode 
 -- @param self
 -- @return Physics3DComponent#Physics3DComponent self (return value: cc.Physics3DComponent)
         

cocos/scripting/lua-bindings/auto/api/PhysicsSprite3D.lua

@@ -5,14 +5,14 @@
 -- @parent_module cc
 
 --------------------------------
---  Physics synchronize rendering. 
+--  synchronize node transformation to physics. 
--- @function [parent=#PhysicsSprite3D] syncToPhysics 
+-- @function [parent=#PhysicsSprite3D] syncNodeToPhysics 
 -- @param self
 -- @return PhysicsSprite3D#PhysicsSprite3D self (return value: cc.PhysicsSprite3D)
         
 --------------------------------
---  Rendering synchronize physics. 
+--  synchronize physics transformation to node. 
--- @function [parent=#PhysicsSprite3D] syncToNode 
+-- @function [parent=#PhysicsSprite3D] syncPhysicsToNode 
 -- @param self
 -- @return PhysicsSprite3D#PhysicsSprite3D self (return value: cc.PhysicsSprite3D)
         

cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp

@@ -91234,6 +91234,53 @@ int lua_cocos2dx_Component_isEnabled(lua_State* tolua_S)
 
     return 0;
 }
+int lua_cocos2dx_Component_onRemove(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::Component* cobj = nullptr;
+    bool ok  = true;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"cc.Component",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::Component*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Component_onRemove'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Component_onRemove'", nullptr);
+            return 0;
+        }
+        cobj->onRemove();
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:onRemove",argc, 0);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Component_onRemove'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_Component_update(lua_State* tolua_S)
 {
     int argc = 0;
@@ -91378,7 +91425,7 @@ int lua_cocos2dx_Component_init(lua_State* tolua_S)
 
     return 0;
 }
-int lua_cocos2dx_Component_setOwner(lua_State* tolua_S)
+int lua_cocos2dx_Component_onAdd(lua_State* tolua_S)
 {
     int argc = 0;
     cocos2d::Component* cobj = nullptr;
@@ -91398,32 +91445,29 @@ int lua_cocos2dx_Component_setOwner(lua_State* tolua_S)
 #if COCOS2D_DEBUG >= 1
     if (!cobj) 
     {
-        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Component_setOwner'", nullptr);
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Component_onAdd'", nullptr);
         return 0;
     }
 #endif
 
     argc = lua_gettop(tolua_S)-1;
-    if (argc == 1) 
+    if (argc == 0) 
     {
-        cocos2d::Node* arg0;
-
-        ok &= luaval_to_object<cocos2d::Node>(tolua_S, 2, "cc.Node",&arg0, "cc.Component:setOwner");
         if(!ok)
         {
-            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Component_setOwner'", nullptr);
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Component_onAdd'", nullptr);
             return 0;
         }
-        cobj->setOwner(arg0);
+        cobj->onAdd();
         lua_settop(tolua_S, 1);
         return 1;
     }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:setOwner",argc, 1);
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:onAdd",argc, 0);
     return 0;
 
 #if COCOS2D_DEBUG >= 1
     tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Component_setOwner'.",&tolua_err);
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Component_onAdd'.",&tolua_err);
 #endif
 
     return 0;
@@ -91475,6 +91519,56 @@ int lua_cocos2dx_Component_getName(lua_State* tolua_S)
 
     return 0;
 }
+int lua_cocos2dx_Component_setOwner(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::Component* cobj = nullptr;
+    bool ok  = true;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"cc.Component",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::Component*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Component_setOwner'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 1) 
+    {
+        cocos2d::Node* arg0;
+
+        ok &= luaval_to_object<cocos2d::Node>(tolua_S, 2, "cc.Node",&arg0, "cc.Component:setOwner");
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Component_setOwner'", nullptr);
+            return 0;
+        }
+        cobj->setOwner(arg0);
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:setOwner",argc, 1);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Component_setOwner'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_Component_create(lua_State* tolua_S)
 {
     int argc = 0;
@@ -91524,11 +91618,13 @@ int lua_register_cocos2dx_Component(lua_State* tolua_S)
         tolua_function(tolua_S,"setEnabled",lua_cocos2dx_Component_setEnabled);
         tolua_function(tolua_S,"setName",lua_cocos2dx_Component_setName);
         tolua_function(tolua_S,"isEnabled",lua_cocos2dx_Component_isEnabled);
+        tolua_function(tolua_S,"onRemove",lua_cocos2dx_Component_onRemove);
         tolua_function(tolua_S,"update",lua_cocos2dx_Component_update);
         tolua_function(tolua_S,"getOwner",lua_cocos2dx_Component_getOwner);
         tolua_function(tolua_S,"init",lua_cocos2dx_Component_init);
-        tolua_function(tolua_S,"setOwner",lua_cocos2dx_Component_setOwner);
+        tolua_function(tolua_S,"onAdd",lua_cocos2dx_Component_onAdd);
         tolua_function(tolua_S,"getName",lua_cocos2dx_Component_getName);
+        tolua_function(tolua_S,"setOwner",lua_cocos2dx_Component_setOwner);
         tolua_function(tolua_S,"create", lua_cocos2dx_Component_create);
     tolua_endmodule(tolua_S);
     std::string typeName = typeid(cocos2d::Component).name();

cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp

@@ -2049,6 +2049,8 @@ int register_all_cocos2dx(lua_State* tolua_S);
 
 
 
+
+
 
 
 

cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics3d_auto.cpp

@@ -3337,6 +3337,53 @@ int lua_register_cocos2dx_physics3d_Physics3DRigidBody(lua_State* tolua_S)
     return 1;
 }
 
+int lua_cocos2dx_physics3d_Physics3DComponent_syncNodeToPhysics(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::Physics3DComponent* cobj = nullptr;
+    bool ok  = true;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+
+
+#if COCOS2D_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"cc.Physics3DComponent",0,&tolua_err)) goto tolua_lerror;
+#endif
+
+    cobj = (cocos2d::Physics3DComponent*)tolua_tousertype(tolua_S,1,0);
+
+#if COCOS2D_DEBUG >= 1
+    if (!cobj) 
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics3d_Physics3DComponent_syncNodeToPhysics'", nullptr);
+        return 0;
+    }
+#endif
+
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0) 
+    {
+        if(!ok)
+        {
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics3d_Physics3DComponent_syncNodeToPhysics'", nullptr);
+            return 0;
+        }
+        cobj->syncNodeToPhysics();
+        lua_settop(tolua_S, 1);
+        return 1;
+    }
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Physics3DComponent:syncNodeToPhysics",argc, 0);
+    return 0;
+
+#if COCOS2D_DEBUG >= 1
+    tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics3d_Physics3DComponent_syncNodeToPhysics'.",&tolua_err);
+#endif
+
+    return 0;
+}
 int lua_cocos2dx_physics3d_Physics3DComponent_addToPhysicsWorld(lua_State* tolua_S)
 {
     int argc = 0;
@@ -3387,7 +3434,7 @@ int lua_cocos2dx_physics3d_Physics3DComponent_addToPhysicsWorld(lua_State* tolua
 
     return 0;
 }
-int lua_cocos2dx_physics3d_Physics3DComponent_syncToPhysics(lua_State* tolua_S)
+int lua_cocos2dx_physics3d_Physics3DComponent_syncPhysicsToNode(lua_State* tolua_S)
 {
     int argc = 0;
     cocos2d::Physics3DComponent* cobj = nullptr;
@@ -3407,7 +3454,7 @@ int lua_cocos2dx_physics3d_Physics3DComponent_syncToPhysics(lua_State* tolua_S)
 #if COCOS2D_DEBUG >= 1
     if (!cobj) 
     {
-        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics3d_Physics3DComponent_syncToPhysics'", nullptr);
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics3d_Physics3DComponent_syncPhysicsToNode'", nullptr);
         return 0;
     }
 #endif
@@ -3417,66 +3464,19 @@ int lua_cocos2dx_physics3d_Physics3DComponent_syncToPhysics(lua_State* tolua_S)
     {
         if(!ok)
         {
-            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics3d_Physics3DComponent_syncToPhysics'", nullptr);
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics3d_Physics3DComponent_syncPhysicsToNode'", nullptr);
             return 0;
         }
-        cobj->syncToPhysics();
+        cobj->syncPhysicsToNode();
         lua_settop(tolua_S, 1);
         return 1;
     }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Physics3DComponent:syncToPhysics",argc, 0);
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Physics3DComponent:syncPhysicsToNode",argc, 0);
     return 0;
 
 #if COCOS2D_DEBUG >= 1
     tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics3d_Physics3DComponent_syncToPhysics'.",&tolua_err);
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics3d_Physics3DComponent_syncPhysicsToNode'.",&tolua_err);
-#endif
-
-    return 0;
-}
-int lua_cocos2dx_physics3d_Physics3DComponent_syncToNode(lua_State* tolua_S)
-{
-    int argc = 0;
-    cocos2d::Physics3DComponent* cobj = nullptr;
-    bool ok  = true;
-
-#if COCOS2D_DEBUG >= 1
-    tolua_Error tolua_err;
-#endif
-
-
-#if COCOS2D_DEBUG >= 1
-    if (!tolua_isusertype(tolua_S,1,"cc.Physics3DComponent",0,&tolua_err)) goto tolua_lerror;
-#endif
-
-    cobj = (cocos2d::Physics3DComponent*)tolua_tousertype(tolua_S,1,0);
-
-#if COCOS2D_DEBUG >= 1
-    if (!cobj) 
-    {
-        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics3d_Physics3DComponent_syncToNode'", nullptr);
-        return 0;
-    }
-#endif
-
-    argc = lua_gettop(tolua_S)-1;
-    if (argc == 0) 
-    {
-        if(!ok)
-        {
-            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics3d_Physics3DComponent_syncToNode'", nullptr);
-            return 0;
-        }
-        cobj->syncToNode();
-        lua_settop(tolua_S, 1);
-        return 1;
-    }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.Physics3DComponent:syncToNode",argc, 0);
-    return 0;
-
-#if COCOS2D_DEBUG >= 1
-    tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics3d_Physics3DComponent_syncToNode'.",&tolua_err);
 #endif
 
     return 0;
@@ -3712,9 +3712,9 @@ int lua_register_cocos2dx_physics3d_Physics3DComponent(lua_State* tolua_S)
 
     tolua_beginmodule(tolua_S,"Physics3DComponent");
         tolua_function(tolua_S,"new",lua_cocos2dx_physics3d_Physics3DComponent_constructor);
+        tolua_function(tolua_S,"syncNodeToPhysics",lua_cocos2dx_physics3d_Physics3DComponent_syncNodeToPhysics);
         tolua_function(tolua_S,"addToPhysicsWorld",lua_cocos2dx_physics3d_Physics3DComponent_addToPhysicsWorld);
-        tolua_function(tolua_S,"syncToPhysics",lua_cocos2dx_physics3d_Physics3DComponent_syncToPhysics);
+        tolua_function(tolua_S,"syncPhysicsToNode",lua_cocos2dx_physics3d_Physics3DComponent_syncPhysicsToNode);
-        tolua_function(tolua_S,"syncToNode",lua_cocos2dx_physics3d_Physics3DComponent_syncToNode);
         tolua_function(tolua_S,"getPhysics3DObject",lua_cocos2dx_physics3d_Physics3DComponent_getPhysics3DObject);
         tolua_function(tolua_S,"setPhysics3DObject",lua_cocos2dx_physics3d_Physics3DComponent_setPhysics3DObject);
         tolua_function(tolua_S,"setSyncFlag",lua_cocos2dx_physics3d_Physics3DComponent_setSyncFlag);
@@ -3726,7 +3726,7 @@ int lua_register_cocos2dx_physics3d_Physics3DComponent(lua_State* tolua_S)
     return 1;
 }
 
-int lua_cocos2dx_physics3d_PhysicsSprite3D_syncToPhysics(lua_State* tolua_S)
+int lua_cocos2dx_physics3d_PhysicsSprite3D_syncNodeToPhysics(lua_State* tolua_S)
 {
     int argc = 0;
     cocos2d::PhysicsSprite3D* cobj = nullptr;
@@ -3746,7 +3746,7 @@ int lua_cocos2dx_physics3d_PhysicsSprite3D_syncToPhysics(lua_State* tolua_S)
 #if COCOS2D_DEBUG >= 1
     if (!cobj) 
     {
-        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics3d_PhysicsSprite3D_syncToPhysics'", nullptr);
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics3d_PhysicsSprite3D_syncNodeToPhysics'", nullptr);
         return 0;
     }
 #endif
@@ -3756,24 +3756,24 @@ int lua_cocos2dx_physics3d_PhysicsSprite3D_syncToPhysics(lua_State* tolua_S)
     {
         if(!ok)
         {
-            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics3d_PhysicsSprite3D_syncToPhysics'", nullptr);
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics3d_PhysicsSprite3D_syncNodeToPhysics'", nullptr);
             return 0;
         }
-        cobj->syncToPhysics();
+        cobj->syncNodeToPhysics();
         lua_settop(tolua_S, 1);
         return 1;
     }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsSprite3D:syncToPhysics",argc, 0);
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsSprite3D:syncNodeToPhysics",argc, 0);
     return 0;
 
 #if COCOS2D_DEBUG >= 1
     tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics3d_PhysicsSprite3D_syncToPhysics'.",&tolua_err);
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics3d_PhysicsSprite3D_syncNodeToPhysics'.",&tolua_err);
 #endif
 
     return 0;
 }
-int lua_cocos2dx_physics3d_PhysicsSprite3D_syncToNode(lua_State* tolua_S)
+int lua_cocos2dx_physics3d_PhysicsSprite3D_syncPhysicsToNode(lua_State* tolua_S)
 {
     int argc = 0;
     cocos2d::PhysicsSprite3D* cobj = nullptr;
@@ -3793,7 +3793,7 @@ int lua_cocos2dx_physics3d_PhysicsSprite3D_syncToNode(lua_State* tolua_S)
 #if COCOS2D_DEBUG >= 1
     if (!cobj) 
     {
-        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics3d_PhysicsSprite3D_syncToNode'", nullptr);
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics3d_PhysicsSprite3D_syncPhysicsToNode'", nullptr);
         return 0;
     }
 #endif
@@ -3803,19 +3803,19 @@ int lua_cocos2dx_physics3d_PhysicsSprite3D_syncToNode(lua_State* tolua_S)
     {
         if(!ok)
         {
-            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics3d_PhysicsSprite3D_syncToNode'", nullptr);
+            tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_physics3d_PhysicsSprite3D_syncPhysicsToNode'", nullptr);
             return 0;
         }
-        cobj->syncToNode();
+        cobj->syncPhysicsToNode();
         lua_settop(tolua_S, 1);
         return 1;
     }
-    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsSprite3D:syncToNode",argc, 0);
+    luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsSprite3D:syncPhysicsToNode",argc, 0);
     return 0;
 
 #if COCOS2D_DEBUG >= 1
     tolua_lerror:
-    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics3d_PhysicsSprite3D_syncToNode'.",&tolua_err);
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics3d_PhysicsSprite3D_syncPhysicsToNode'.",&tolua_err);
 #endif
 
     return 0;
@@ -3967,8 +3967,8 @@ int lua_register_cocos2dx_physics3d_PhysicsSprite3D(lua_State* tolua_S)
 
     tolua_beginmodule(tolua_S,"PhysicsSprite3D");
         tolua_function(tolua_S,"new",lua_cocos2dx_physics3d_PhysicsSprite3D_constructor);
-        tolua_function(tolua_S,"syncToPhysics",lua_cocos2dx_physics3d_PhysicsSprite3D_syncToPhysics);
+        tolua_function(tolua_S,"syncNodeToPhysics",lua_cocos2dx_physics3d_PhysicsSprite3D_syncNodeToPhysics);
-        tolua_function(tolua_S,"syncToNode",lua_cocos2dx_physics3d_PhysicsSprite3D_syncToNode);
+        tolua_function(tolua_S,"syncPhysicsToNode",lua_cocos2dx_physics3d_PhysicsSprite3D_syncPhysicsToNode);
         tolua_function(tolua_S,"getPhysicsObj",lua_cocos2dx_physics3d_PhysicsSprite3D_getPhysicsObj);
         tolua_function(tolua_S,"setSyncFlag",lua_cocos2dx_physics3d_PhysicsSprite3D_setSyncFlag);
     tolua_endmodule(tolua_S);

extensions/assets-manager/Downloader.cpp

@@ -288,6 +288,7 @@ Downloader::HeaderInfo Downloader::prepareHeader(const std::string &srcUrl, void
     curl_easy_setopt(header, CURLOPT_URL, srcUrl.c_str());
     curl_easy_setopt(header, CURLOPT_HEADER, 1);
     curl_easy_setopt(header, CURLOPT_NOBODY, 1);
+    curl_easy_setopt(header, CURLOPT_NOSIGNAL, 1);
     if (curl_easy_perform(header) == CURLE_OK)
     {
         char *url;
@@ -296,16 +297,24 @@ Downloader::HeaderInfo Downloader::prepareHeader(const std::string &srcUrl, void
         curl_easy_getinfo(header, CURLINFO_CONTENT_TYPE, &contentType);
         curl_easy_getinfo(header, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &info.contentSize);
         curl_easy_getinfo(header, CURLINFO_RESPONSE_CODE, &info.responseCode);
-        info.url = url;
-        info.contentType = contentType;
-        info.valid = true;
         
-        if (_onHeader)
+        if (contentType == nullptr || info.contentSize == -1 || info.responseCode >= 400)
         {
-            _onHeader(srcUrl, info);
+            info.valid = false;
+        }
+        else
+        {
+            info.url = url;
+            info.contentType = contentType;
+            info.valid = true;
         }
     }
-    else
+    
+    if (info.valid && _onHeader)
+    {
+        _onHeader(srcUrl, info);
+    }
+    else if (!info.valid)
     {
         info.contentSize = -1;
         std::string msg = StringUtils::format("Can not get content size of file (%s) : Request header failed", srcUrl.c_str());
@@ -325,6 +334,11 @@ long Downloader::getContentSize(const std::string &srcUrl)
     return info.contentSize;
 }
 
+Downloader::HeaderInfo Downloader::getHeader(const std::string &srcUrl)
+{
+    return prepareHeader(srcUrl);
+}
+
 void Downloader::getHeaderAsync(const std::string &srcUrl, const HeaderCallback &callback)
 {
     setHeaderCallback(callback);
@@ -401,25 +415,26 @@ void Downloader::downloadToBuffer(const std::string &srcUrl, const std::string &
     CURLcode res = curl_easy_perform(curl);
     if (res != CURLE_OK)
     {
-        _fileUtils->removeFile(data.path + data.name + TEMP_EXT);
+        std::string msg = StringUtils::format("Unable to download file to buffer: [curl error]%s", curl_easy_strerror(res));
-        std::string msg = StringUtils::format("Unable to download file: [curl error]%s", curl_easy_strerror(res));
         this->notifyError(msg, customId, res);
     }
+    else
+    {
+        Director::getInstance()->getScheduler()->performFunctionInCocosThread([=]{
+            if (!ptr.expired())
+            {
+                std::shared_ptr<Downloader> downloader = ptr.lock();
+                
+                auto successCB = downloader->getSuccessCallback();
+                if (successCB != nullptr)
+                {
+                    successCB(data.url, "", data.customId);
+                }
+            }
+        });
+    }
     
     curl_easy_cleanup(curl);
-    
-    Director::getInstance()->getScheduler()->performFunctionInCocosThread([=]{
-        if (!ptr.expired())
-        {
-            std::shared_ptr<Downloader> downloader = ptr.lock();
-            
-            auto successCB = downloader->getSuccessCallback();
-            if (successCB != nullptr)
-            {
-                successCB(data.url, "", data.customId);
-            }
-        }
-    });
 }
 
 void Downloader::downloadAsync(const std::string &srcUrl, const std::string &storagePath, const std::string &customId/* = ""*/)

extensions/assets-manager/Downloader.h

@@ -107,7 +107,7 @@ public:
         std::string url;
         std::string contentType;
         double contentSize;
-        double responseCode;
+        long responseCode;
     };
     
     typedef std::unordered_map<std::string, DownloadUnit> DownloadUnits;
@@ -139,6 +139,8 @@ public:
     
     long getContentSize(const std::string &srcUrl);
     
+    HeaderInfo getHeader(const std::string &srcUrl);
+    
     void getHeaderAsync(const std::string &srcUrl, const HeaderCallback &callback);
     
     void downloadToBufferAsync(const std::string &srcUrl, unsigned char *buffer, const long &size, const std::string &customId = "");

external/config.json

@@ -1,5 +1,5 @@
 {
-    "version":"v3-deps-57",
+    "version":"v3-deps-61",
     "zip_file_size":"138162176",
     "repo_name":"cocos2d-x-3rd-party-libs-bin",
     "repo_parent":"https://github.com/cocos2d/",

templates/cocos2dx_files.json

@@ -2999,6 +2999,12 @@
         "external/recast/fastlz/fastlz.h", 
         "external/recast/proj.win32/librecast.vcxproj", 
         "external/recast/proj.win32/librecast.vcxproj.filters", 
+        "external/recast/proj.win8.1-universal/librecast.Shared/librecast.Shared.vcxitems", 
+        "external/recast/proj.win8.1-universal/librecast.Shared/librecast.Shared.vcxitems.filters", 
+        "external/recast/proj.win8.1-universal/librecast.Windows/librecast.Windows.vcxproj", 
+        "external/recast/proj.win8.1-universal/librecast.Windows/librecast.Windows.vcxproj.filters", 
+        "external/recast/proj.win8.1-universal/librecast.WindowsPhone/librecast.WindowsPhone.vcxproj", 
+        "external/recast/proj.win8.1-universal/librecast.WindowsPhone/librecast.WindowsPhone.vcxproj.filters", 
         "external/sqlite3/Android.mk", 
         "external/sqlite3/include/sqlite3.h", 
         "external/sqlite3/include/sqlite3ext.h", 

templates/cpp-template-default/Classes/AppDelegate.cpp

@@ -3,6 +3,11 @@
 
 USING_NS_CC;
 
+static cocos2d::Size designResolutionSize = cocos2d::Size(480, 320);
+static cocos2d::Size smallResolutionSize = cocos2d::Size(480, 320);
+static cocos2d::Size mediumResolutionSize = cocos2d::Size(1024, 768);
+static cocos2d::Size largeResolutionSize = cocos2d::Size(2048, 1536);
+
 AppDelegate::AppDelegate() {
 
 }
@@ -44,6 +49,25 @@ bool AppDelegate::applicationDidFinishLaunching() {
     // set FPS. the default value is 1.0/60 if you don't call this
     director->setAnimationInterval(1.0 / 60);
 
+    // Set the design resolution
+    glview->setDesignResolutionSize(designResolutionSize.width, designResolutionSize.height, ResolutionPolicy::NO_BORDER);
+    Size frameSize = glview->getFrameSize();
+    // if the frame's height is larger than the height of medium size.
+    if (frameSize.height > mediumResolutionSize.height)
+    {        
+        director->setContentScaleFactor(MIN(largeResolutionSize.height/designResolutionSize.height, largeResolutionSize.width/designResolutionSize.width));
+    }
+    // if the frame's height is larger than the height of small size.
+    else if (frameSize.height > smallResolutionSize.height)
+    {        
+        director->setContentScaleFactor(MIN(mediumResolutionSize.height/designResolutionSize.height, mediumResolutionSize.width/designResolutionSize.width));
+    }
+    // if the frame's height is smaller than the height of medium size.
+    else
+    {        
+        director->setContentScaleFactor(MIN(smallResolutionSize.height/designResolutionSize.height, smallResolutionSize.width/designResolutionSize.width));
+    }
+
     register_all_packages();
 
     // create a scene. it's an autorelease object

tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp

@@ -18,9 +18,9 @@ bool EnemyController::init()
     return true;
 }
 
-void EnemyController::onEnter()
+void EnemyController::onAdd()
 {
-    ComController::onEnter();
+    ComController::onAdd();
    // Determine where to spawn the target along the Y axis
 	Size winSize = Director::getInstance()->getVisibleSize();
 	float minY = getOwner()->getContentSize().height/2;
@@ -52,7 +52,7 @@ void EnemyController::onEnter()
 	_owner->runAction( Sequence::create(actionMove, actionMoveDone, nullptr) );
 }
 
-void EnemyController::onExit()
+void EnemyController::onRemove()
 {
 }
 

tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h

@@ -14,8 +14,8 @@ protected:
         
 public:
     virtual bool init() override;
-    virtual void onEnter() override;
+    virtual void onAdd() override;
-    virtual void onExit() override;
+    virtual void onRemove() override;
     virtual void update(float delta) override;
    
     static EnemyController* create(void);

tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp

@@ -20,13 +20,13 @@ bool PlayerController::init()
     return true;
 }
 
-void PlayerController::onEnter()
+void PlayerController::onAdd()
 {
-    ComController::onEnter();
+    ComController::onAdd();
     setTouchEnabled(true);
 }
 
-void PlayerController::onExit()
+void PlayerController::onRemove()
 {
     setTouchEnabled(false);
 }

tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h

@@ -17,8 +17,8 @@ public:
     
 public:
     virtual bool init() override;
-    virtual void onEnter() override;
+    virtual void onAdd() override;
-    virtual void onExit() override;
+    virtual void onRemove() override;
     virtual void update(float delta) override;
    
    static PlayerController* create(void);

tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp

@@ -19,9 +19,9 @@ bool ProjectileController::init()
     return true;
 }
 
-void ProjectileController::onEnter()
+void ProjectileController::onAdd()
 {
-    ComController::onEnter();
+    ComController::onAdd();
     auto winSize = Director::getInstance()->getVisibleSize();
     auto origin = Director::getInstance()->getVisibleOrigin();
     _owner->setPosition( Vec2(origin.x+20, origin.y+winSize.height/2) );
@@ -30,7 +30,7 @@ void ProjectileController::onEnter()
     static_cast<SceneController*>(com)->getProjectiles().pushBack(_owner);
 }
 
-void ProjectileController::onExit()
+void ProjectileController::onRemove()
 {
 
 }

tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h

@@ -13,8 +13,8 @@ protected:
         
 public:
     virtual bool init() override;
-    virtual void onEnter() override;
+    virtual void onAdd() override;
-    virtual void onExit() override;
+    virtual void onRemove() override;
     virtual void update(float delta) override;
     
     static ProjectileController* create(void);

tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp

@@ -24,16 +24,16 @@ bool SceneController::init()
     return true;
 }
 
-void SceneController::onEnter()
+void SceneController::onAdd()
 {
-    ComController::onEnter();
+	ComController::onAdd();
     _fAddTargetTime = 1.0f;
    
     static_cast<ComAudio*>(_owner->getComponent("Audio"))->playBackgroundMusic("background.wav", true);
     static_cast<ComAttribute*>(_owner->getComponent("CCComAttribute"))->setInt("KillCount", 0);
 }
 
-void SceneController::onExit()
+void SceneController::onRemove()
 {
 }
 

tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h

@@ -13,8 +13,8 @@ protected:
         
 public:
     virtual bool init() override;
-    virtual void onEnter() override;
+    virtual void onAdd() override;
-    virtual void onExit() override;
+    virtual void onRemove() override;
     virtual void update(float delta) override;
    
    static SceneController* create();

tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp

@@ -210,7 +210,7 @@ void Physics3DTestDemo::shootBox( const cocos2d::Vec3 &des )
     this->addChild(sprite);
     sprite->setPosition3D(_camera->getPosition3D());
     sprite->setScale(0.5f);
-    sprite->syncToNode();
+    sprite->syncNodeToPhysics();
     
     //optimize, only sync node to physics
     sprite->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::PHYSICS_TO_NODE); //sync node to physics
@@ -239,7 +239,7 @@ bool BasicPhysics3DDemo::init()
     floor->setScaleZ(60);
     this->addChild(floor);
     floor->setCameraMask((unsigned short)CameraFlag::USER1);
-    floor->syncToNode();
+    floor->syncNodeToPhysics();
     //static object sync is not needed
     floor->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::NONE);
     
@@ -263,7 +263,7 @@ bool BasicPhysics3DDemo::init()
                 auto sprite = PhysicsSprite3D::create("Sprite3DTest/box.c3t", &rbDes);
                 sprite->setTexture("Images/CyanSquare.png");
                 sprite->setPosition3D(Vec3(x, y, z));
-                sprite->syncToNode();
+                sprite->syncNodeToPhysics();
                 sprite->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::PHYSICS_TO_NODE);
                 sprite->setCameraMask((unsigned short)CameraFlag::USER1);
                 sprite->setScale(0.8f);
@@ -303,7 +303,7 @@ bool Physics3DKinematicDemo::init()
     floor->setPosition3D(Vec3(0.f, -1.f, 0.f));
     this->addChild(floor);
     floor->setCameraMask((unsigned short)CameraFlag::USER1);
-    floor->syncToNode();
+    floor->syncNodeToPhysics();
     //static object sync is not needed
     floor->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::NONE);
 
@@ -354,7 +354,7 @@ bool Physics3DKinematicDemo::init()
                     sprite->setScale(1.0f / sprite->getContentSize().width);
                     this->addChild(sprite);
                     sprite->setPosition3D(Vec3(x, y, z));
-                    sprite->syncToNode();
+                    sprite->syncNodeToPhysics();
                     
                     sprite->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::PHYSICS_TO_NODE);
                 }
@@ -391,7 +391,7 @@ bool Physics3DConstraintDemo::init()
     sprite->setScale(0.4f);
     sprite->setPosition3D(Vec3(-20.f, 5.f, 0.f));
     //sync node position to physics
-    component->syncToNode();
+    component->syncNodeToPhysics();
     //physics controlled, we will not set position for it, so we can skip sync node position to physics
     component->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::PHYSICS_TO_NODE);
     
@@ -414,7 +414,7 @@ bool Physics3DConstraintDemo::init()
     sprite->addComponent(component);
     sprite->setCameraMask((unsigned short)CameraFlag::USER1);
     this->addChild(sprite);
-    component->syncToNode();
+    component->syncNodeToPhysics();
     rigidBody->setAngularVelocity(Vec3(0,3,0));
     constraint = Physics3DHingeConstraint::create(rigidBody, Vec3(4.f, 4.f, 0.5f), Vec3(0.f, 1.f, 0.f));
     physicsScene->getPhysics3DWorld()->addPhysics3DConstraint(constraint);
@@ -433,7 +433,7 @@ bool Physics3DConstraintDemo::init()
     sprite->addComponent(component);
     sprite->setCameraMask((unsigned short)CameraFlag::USER1);
     this->addChild(sprite);
-    component->syncToNode();
+    component->syncNodeToPhysics();
     rigidBody->setLinearVelocity(Vec3(0,3,0));
     
     rbDes.mass = 0.0f;
@@ -447,7 +447,7 @@ bool Physics3DConstraintDemo::init()
     sprite->addComponent(component);
     sprite->setCameraMask((unsigned short)CameraFlag::USER1);
     this->addChild(sprite);
-    component->syncToNode();
+    component->syncNodeToPhysics();
 
     Mat4 frameInA, frameInB;
     Mat4::createRotationZ(CC_DEGREES_TO_RADIANS(90), &frameInA);
@@ -471,7 +471,7 @@ bool Physics3DConstraintDemo::init()
     sprite->addComponent(component);
     sprite->setCameraMask((unsigned short)CameraFlag::USER1);
     this->addChild(sprite);
-    component->syncToNode();
+    component->syncNodeToPhysics();
 
     Mat4::createRotationZ(CC_DEGREES_TO_RADIANS(90), &frameInA);
     frameInA.m[12] = 0.f;
@@ -493,7 +493,7 @@ bool Physics3DConstraintDemo::init()
     sprite->addComponent(component);
     sprite->setCameraMask((unsigned short)CameraFlag::USER1);
     this->addChild(sprite);
-    component->syncToNode();
+    component->syncNodeToPhysics();
     frameInA.setIdentity();
     constraint = Physics3D6DofConstraint::create(rigidBody, frameInA, false);
     physicsScene->getPhysics3DWorld()->addPhysics3DConstraint(constraint);
@@ -592,7 +592,7 @@ bool Physics3DTerrainDemo::init()
     auto component = Physics3DComponent::create(rigidBody);
     terrain->addComponent(component);
     this->addChild(terrain);
-    component->syncToNode();
+    component->syncNodeToPhysics();
     component->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::NONE);
 
 
@@ -619,7 +619,7 @@ bool Physics3DTerrainDemo::init()
                 sprite->setScale(1.0f / sprite->getContentSize().width);
                 sprite->setPosition3D(Vec3(x, y, z));
                 this->addChild(sprite);
-                sprite->syncToNode();
+                sprite->syncNodeToPhysics();
                 sprite->setSyncFlag(Physics3DComponent::PhysicsSyncFlag::PHYSICS_TO_NODE);
             }
         }

tests/js-tests/src/TextureCacheTest/TextureCacheTest.js

@@ -192,7 +192,6 @@ var RemoteTextureTest = TextureCacheTestBase.extend({
     _title:"Remote Texture Test",
     _subtitle:"",
     _remoteTex: "http://cn.cocos2d-x.org/image/logo.png",
-    _sprite : null,
     onEnter:function () {
         this._super();
         if('opengl' in cc.sys.capabilities && !cc.sys.isNative){
@@ -205,19 +204,21 @@ var RemoteTextureTest = TextureCacheTestBase.extend({
     },
 
     startDownload: function() {
-        cc.textureCache.addImageAsync(this._remoteTex, this.texLoaded, this);
+        var imageUrlArray = ["http://www.cocos2d-x.org/s/upload/v35.jpg", "http://www.cocos2d-x.org/s/upload/testin.jpg", "http://www.cocos2d-x.org/s/upload/geometry_dash.jpg", "http://cn.cocos2d-x.org/image/logo.png"];
+
+        for (var i = 0; i < imageUrlArray.length; i++) {
+            cc.textureCache.addImageAsync(imageUrlArray[i], this.texLoaded, this);
+        }
     },
 
     texLoaded: function(texture) {
         if (texture instanceof cc.Texture2D) {
-            cc.log("Remote texture loaded: " + this._remoteTex);
+            cc.log("Remote texture loaded");
-            if (this._sprite) {
+            
-                this.removeChild(this._sprite);
+            var sprite = new cc.Sprite(texture);
-            }
+            sprite.x = cc.winSize.width/2;
-            this._sprite = new cc.Sprite(texture);
+            sprite.y = cc.winSize.height/2;
-            this._sprite.x = cc.winSize.width/2;
+            this.addChild(sprite);
-            this._sprite.y = cc.winSize.height/2;
-            this.addChild(this._sprite);
         }
         else {
             cc.log("Fail to load remote texture");

tests/js-tests/src/XHRTest/XHRTest.js

@@ -103,9 +103,12 @@ var XHRTestLayer = cc.Layer.extend({
         streamXHREventsToLabel(xhr, statusGetLabel, responseLabel, "GET");
         // 5 seconds for timeout
         xhr.timeout = 5000;
-        
+
+        xhr.setRequestHeader("Accept-Encoding","gzip,deflate");
+
         //set arguments with <URL>?xxx=xxx&yyy=yyy
-        xhr.open("GET", "http://httpbin.org/get?show_env=1", true);
+        xhr.open("GET", "http://geek.csdn.net/news/detail/33683", true);
+
         xhr.send();
     },
 
@@ -129,6 +132,7 @@ var XHRTestLayer = cc.Layer.extend({
         streamXHREventsToLabel(xhr, statusPostLabel, responseLabel, "POST");
 
         xhr.open("POST", "http://httpbin.org/post");
+
         //set Content-type "text/plain;charset=UTF-8" to post plain text
         xhr.setRequestHeader("Content-Type","text/plain;charset=UTF-8");
         xhr.send("plain text message");

tools/cocos2d-console

@@ -1 +1 @@
-Subproject commit 3c9958a1d2fc1ce1cea582c6bde0efc5a9537654
+Subproject commit 4f0fd0a30f010756e01a0e1b9c341873e981c10a

tools/tojs/cocos2dx.ini

@@ -118,7 +118,7 @@ skip = Node::[^setPosition$ setGLServerState description getUserObject .*UserDat
         Device::[getTextureDataForText],
         EventDispatcher::[dispatchCustomEvent],
         EventCustom::[getUserData setUserData],
-        Component::[serialize],
+        Component::[serialize onAdd onRemove update],
         EventListenerCustom::[init],
         EventListener::[init],
         Scene::[getCameras getLights initWithPhysics createWithPhysics getPhysicsWorld getPhysics3DWorld setPhysics3DDebugCamera],