From a51a32fa9d3bf036c3c1727e9a5ca74b6ad70c9e Mon Sep 17 00:00:00 2001 From: zhangcheng Date: Wed, 3 Jun 2015 15:10:48 +0800 Subject: [PATCH 01/12] 1, add onEnter and onExit of components to CCNode's onEnter and onExit function. --- cocos/2d/CCNode.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp index 423a60286e..ce220e5636 100644 --- a/cocos/2d/CCNode.cpp +++ b/cocos/2d/CCNode.cpp @@ -1414,6 +1414,11 @@ void Node::onEnter() if (_onEnterCallback) _onEnterCallback(); + if (_componentContainer && !_componentContainer->isEmpty()) + { + _componentContainer->onEnter(); + } + #if CC_ENABLE_SCRIPT_BINDING if (_scriptType == kScriptTypeJavascript) { @@ -1493,6 +1498,11 @@ void Node::onExit() if (_onExitCallback) _onExitCallback(); + if (_componentContainer && !_componentContainer->isEmpty()) + { + _componentContainer->onExit(); + } + #if CC_ENABLE_SCRIPT_BINDING if (_scriptType == kScriptTypeJavascript) { From 164e4c8314ee18856cd2553eb3cb7c0c3a84bd47 Mon Sep 17 00:00:00 2001 From: gyf19 Date: Wed, 3 Jun 2015 19:41:14 +0800 Subject: [PATCH 02/12] HttpClient Android supports gzip --- .../lib/Cocos2dxHttpURLConnection.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHttpURLConnection.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHttpURLConnection.java index c0d9c5f7c4..00ddc97845 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHttpURLConnection.java +++ b/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; - try { - in = new DataInputStream(http.getInputStream()); + InputStream in; + try { + 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; From 8d3d3a0348d29d6b24147552d7d2af34022debaa Mon Sep 17 00:00:00 2001 From: zhangcheng Date: Thu, 4 Jun 2015 14:06:31 +0800 Subject: [PATCH 03/12] 1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer. --- cocos/2d/CCComponent.cpp | 22 +++++++++++++++++++ cocos/2d/CCComponent.h | 4 ++++ cocos/2d/CCComponentContainer.cpp | 8 +++---- .../editor-support/cocostudio/CCComAudio.cpp | 10 +++++++++ cocos/editor-support/cocostudio/CCComAudio.h | 10 +++++++++ .../cocostudio/CCComController.cpp | 12 ++++++++++ .../cocostudio/CCComController.h | 10 +++++++++ .../editor-support/cocostudio/CCComRender.cpp | 16 ++++++++++++++ cocos/editor-support/cocostudio/CCComRender.h | 10 +++++++++ .../EnemyController.cpp | 6 ++--- .../EnemyController.h | 4 ++-- .../PlayerController.cpp | 6 ++--- .../PlayerController.h | 4 ++-- .../ProjectileController.cpp | 6 ++--- .../ProjectileController.h | 4 ++-- .../SceneController.cpp | 6 ++--- .../SceneController.h | 4 ++-- 17 files changed, 118 insertions(+), 24 deletions(-) diff --git a/cocos/2d/CCComponent.cpp b/cocos/2d/CCComponent.cpp index 2a252db2d0..5b7049e6f7 100644 --- a/cocos/2d/CCComponent.cpp +++ b/cocos/2d/CCComponent.cpp @@ -91,6 +91,28 @@ void Component::onExit() #endif } +void Component::onAdd() +{ +#if CC_ENABLE_SCRIPT_BINDING + if (_scriptType == kScriptTypeJavascript) + { + if (sendComponentEventToJS(this, kComponentOnAdd)) + return; + } +#endif +} + +void Component::onRemove() +{ +#if CC_ENABLE_SCRIPT_BINDING + if (_scriptType == kScriptTypeJavascript) + { + if (sendComponentEventToJS(this, kComponentOnRemove)) + return; + } +#endif +} + void Component::update(float delta) { #if CC_ENABLE_SCRIPT_BINDING diff --git a/cocos/2d/CCComponent.h b/cocos/2d/CCComponent.h index 90d6de8ca3..226d410ef1 100644 --- a/cocos/2d/CCComponent.h +++ b/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; diff --git a/cocos/2d/CCComponentContainer.cpp b/cocos/2d/CCComponentContainer.cpp index 0de3cd8cdc..963e73369d 100644 --- a/cocos/2d/CCComponentContainer.cpp +++ b/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); } diff --git a/cocos/editor-support/cocostudio/CCComAudio.cpp b/cocos/editor-support/cocostudio/CCComAudio.cpp index 25c334f87a..8e53f5eb88 100644 --- a/cocos/editor-support/cocostudio/CCComAudio.cpp +++ b/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; diff --git a/cocos/editor-support/cocostudio/CCComAudio.h b/cocos/editor-support/cocostudio/CCComAudio.h index d91dbe7bee..a5997aadeb 100644 --- a/cocos/editor-support/cocostudio/CCComAudio.h +++ b/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; diff --git a/cocos/editor-support/cocostudio/CCComController.cpp b/cocos/editor-support/cocostudio/CCComController.cpp index a258321ba1..f24b7bebf5 100644 --- a/cocos/editor-support/cocostudio/CCComController.cpp +++ b/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) { } diff --git a/cocos/editor-support/cocostudio/CCComController.h b/cocos/editor-support/cocostudio/CCComController.h index 8a3ad4f32a..c3dda3fd1e 100644 --- a/cocos/editor-support/cocostudio/CCComController.h +++ b/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; diff --git a/cocos/editor-support/cocostudio/CCComRender.cpp b/cocos/editor-support/cocostudio/CCComRender.cpp index 4243e3aafb..b69e0570d2 100644 --- a/cocos/editor-support/cocostudio/CCComRender.cpp +++ b/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; diff --git a/cocos/editor-support/cocostudio/CCComRender.h b/cocos/editor-support/cocostudio/CCComRender.h index 02b6e3fdd5..2911359bd8 100644 --- a/cocos/editor-support/cocostudio/CCComRender.h +++ b/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); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp index f109da7e5e..0f72d1331a 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp +++ b/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() { } diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h index 790f9da45d..542d673cf0 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h @@ -14,8 +14,8 @@ protected: public: virtual bool init() override; - virtual void onEnter() override; - virtual void onExit() override; + virtual void onAdd() override; + virtual void onRemove() override; virtual void update(float delta) override; static EnemyController* create(void); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp index bd926530d1..d697052ac7 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp +++ b/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); } diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h index 7848ff1e08..c24e388b7a 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h @@ -17,8 +17,8 @@ public: public: virtual bool init() override; - virtual void onEnter() override; - virtual void onExit() override; + virtual void onAdd() override; + virtual void onRemove() override; virtual void update(float delta) override; static PlayerController* create(void); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp index 29b11b5df7..fd24115998 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp +++ b/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(com)->getProjectiles().pushBack(_owner); } -void ProjectileController::onExit() +void ProjectileController::onRemove() { } diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h index 55cd5cba78..3d3b76db73 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h @@ -13,8 +13,8 @@ protected: public: virtual bool init() override; - virtual void onEnter() override; - virtual void onExit() override; + virtual void onAdd() override; + virtual void onRemove() override; virtual void update(float delta) override; static ProjectileController* create(void); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp index e7a677109d..835cb99c87 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp +++ b/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(_owner->getComponent("Audio"))->playBackgroundMusic("background.wav", true); static_cast(_owner->getComponent("CCComAttribute"))->setInt("KillCount", 0); } -void SceneController::onExit() +void SceneController::onRemove() { } diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h index a4eda36e4f..770f73ee27 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h @@ -13,8 +13,8 @@ protected: public: virtual bool init() override; - virtual void onEnter() override; - virtual void onExit() override; + virtual void onAdd() override; + virtual void onRemove() override; virtual void update(float delta) override; static SceneController* create(); From 6a53cfdc764e509a7f517ad736e24ffa0ba6f196 Mon Sep 17 00:00:00 2001 From: zhangcheng Date: Thu, 4 Jun 2015 14:08:47 +0800 Subject: [PATCH 04/12] 1, modify space format. --- cocos/2d/CCComponent.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/2d/CCComponent.h b/cocos/2d/CCComponent.h index 226d410ef1..a6151f337a 100644 --- a/cocos/2d/CCComponent.h +++ b/cocos/2d/CCComponent.h @@ -38,8 +38,8 @@ class Node; enum { kComponentOnEnter, kComponentOnExit, - kComponentOnAdd, - kComponentOnRemove, + kComponentOnAdd, + kComponentOnRemove, kComponentOnUpdate }; From 83f7f30c1c83256f64e9d4bc3913a01183fc85d1 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 4 Jun 2015 15:03:20 +0800 Subject: [PATCH 05/12] Fix issue that __JSDownloaderDelegator::onError get called twice --- .../jsb_cocos2dx_extension_manual.cpp | 6 +----- extensions/assets-manager/Downloader.cpp | 20 +++++++++++++------ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp b/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp index bb3cd6c8e4..597701d0ba 100644 --- a/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp +++ b/cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp @@ -951,11 +951,7 @@ void __JSDownloaderDelegator::startDownload() cocos2d::extension::Downloader::HeaderInfo info = _downloader->getHeader(_url); long contentSize = info.contentSize; - if (contentSize == -1 || info.responseCode >= 400) { - cocos2d::extension::Downloader::Error err; - onError(err); - } - else { + if (contentSize > 0 && info.responseCode < 400) { _size = contentSize / sizeof(unsigned char); _buffer = (unsigned char*)malloc(contentSize); _downloader->downloadToBufferSync(_url, _buffer, _size); diff --git a/extensions/assets-manager/Downloader.cpp b/extensions/assets-manager/Downloader.cpp index afa483440d..c5c260f7c4 100644 --- a/extensions/assets-manager/Downloader.cpp +++ b/extensions/assets-manager/Downloader.cpp @@ -296,16 +296,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()); From 2c168130ed8545edb947e4b13f7708dce09bff05 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 4 Jun 2015 15:59:05 +0800 Subject: [PATCH 06/12] Fix jsbinding calls for CCComponent --- cocos/2d/CCComponent.cpp | 15 +++++---------- .../js-bindings/manual/ScriptingCore.cpp | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/cocos/2d/CCComponent.cpp b/cocos/2d/CCComponent.cpp index 5b7049e6f7..6bb111830b 100644 --- a/cocos/2d/CCComponent.cpp +++ b/cocos/2d/CCComponent.cpp @@ -74,8 +74,7 @@ void Component::onEnter() #if CC_ENABLE_SCRIPT_BINDING if (_scriptType == kScriptTypeJavascript) { - if (sendComponentEventToJS(this, kComponentOnEnter)) - return; + sendComponentEventToJS(this, kComponentOnEnter); } #endif } @@ -85,8 +84,7 @@ void Component::onExit() #if CC_ENABLE_SCRIPT_BINDING if (_scriptType == kScriptTypeJavascript) { - if (sendComponentEventToJS(this, kComponentOnExit)) - return; + sendComponentEventToJS(this, kComponentOnExit); } #endif } @@ -96,8 +94,7 @@ void Component::onAdd() #if CC_ENABLE_SCRIPT_BINDING if (_scriptType == kScriptTypeJavascript) { - if (sendComponentEventToJS(this, kComponentOnAdd)) - return; + sendComponentEventToJS(this, kComponentOnAdd); } #endif } @@ -107,8 +104,7 @@ void Component::onRemove() #if CC_ENABLE_SCRIPT_BINDING if (_scriptType == kScriptTypeJavascript) { - if (sendComponentEventToJS(this, kComponentOnRemove)) - return; + sendComponentEventToJS(this, kComponentOnRemove); } #endif } @@ -118,8 +114,7 @@ void Component::update(float delta) #if CC_ENABLE_SCRIPT_BINDING if (_scriptType == kScriptTypeJavascript) { - if (sendComponentEventToJS(this, kComponentOnUpdate)) - return; + sendComponentEventToJS(this, kComponentOnUpdate); } #endif } diff --git a/cocos/scripting/js-bindings/manual/ScriptingCore.cpp b/cocos/scripting/js-bindings/manual/ScriptingCore.cpp index 05e1fe2528..5f12532efc 100644 --- a/cocos/scripting/js-bindings/manual/ScriptingCore.cpp +++ b/cocos/scripting/js-bindings/manual/ScriptingCore.cpp @@ -1058,7 +1058,21 @@ int ScriptingCore::handleComponentEvent(void* data) JS::RootedValue retval(_cx); jsval dataVal = INT_TO_JSVAL(1); - if (action == kComponentOnEnter) + if (action == kComponentOnAdd) + { + if (isFunctionOverridedInJS(JS::RootedObject(_cx, p->obj.get()), "onAdd", js_cocos2dx_Component_onEnter)) + { + ret = executeFunctionWithOwner(OBJECT_TO_JSVAL(p->obj), "onAdd", 1, &dataVal, &retval); + } + } + else if (action == kComponentOnRemove) + { + if (isFunctionOverridedInJS(JS::RootedObject(_cx, p->obj.get()), "onRemove", js_cocos2dx_Component_onExit)) + { + ret = executeFunctionWithOwner(OBJECT_TO_JSVAL(p->obj), "onRemove", 1, &dataVal, &retval); + } + } + else if (action == kComponentOnEnter) { if (isFunctionOverridedInJS(JS::RootedObject(_cx, p->obj.get()), "onEnter", js_cocos2dx_Component_onEnter)) { From ed6d6521acf7f49c58a341d9e266736edcea5bf8 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 4 Jun 2015 17:59:56 +0800 Subject: [PATCH 07/12] Add CURLOPT_NOSIGNAL to avoid multithread issue on timeout --- extensions/assets-manager/Downloader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/assets-manager/Downloader.cpp b/extensions/assets-manager/Downloader.cpp index c5c260f7c4..3187b19762 100644 --- a/extensions/assets-manager/Downloader.cpp +++ b/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; From 77826b453dccab30e5ade1a122346dbd36b86df6 Mon Sep 17 00:00:00 2001 From: andyque Date: Thu, 4 Jun 2015 18:27:03 +0800 Subject: [PATCH 08/12] update 3rd party libs to 60 --- external/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/config.json b/external/config.json index 54f8f5d4f8..6355bc2b9d 100644 --- a/external/config.json +++ b/external/config.json @@ -1,5 +1,5 @@ { - "version":"v3-deps-57", + "version":"v3-deps-60", "zip_file_size":"138162176", "repo_name":"cocos2d-x-3rd-party-libs-bin", "repo_parent":"https://github.com/cocos2d/", From c722dd76d6793d39927535e35c1235bf15490384 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Thu, 4 Jun 2015 10:49:25 +0000 Subject: [PATCH 09/12] [AUTO][ci skip]: updating cocos2dx_files.json --- templates/cocos2dx_files.json | 41 ++++++----------------------------- 1 file changed, 7 insertions(+), 34 deletions(-) diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 8b77d68bbf..ad1a640300 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -2252,26 +2252,6 @@ "external/chipmunk/prebuilt/wp_8.1/arm/chipmunk.lib", "external/chipmunk/prebuilt/wp_8.1/win32/chipmunk.lib", "external/config.json", - "external/curl/include/android/curl/curl.h", - "external/curl/include/android/curl/curlbuild.h", - "external/curl/include/android/curl/curlrules.h", - "external/curl/include/android/curl/curlver.h", - "external/curl/include/android/curl/easy.h", - "external/curl/include/android/curl/mprintf.h", - "external/curl/include/android/curl/multi.h", - "external/curl/include/android/curl/stdcheaders.h", - "external/curl/include/android/curl/typecheck-gcc.h", - "external/curl/include/ios/curl/curl.h", - "external/curl/include/ios/curl/curlbuild-32.h", - "external/curl/include/ios/curl/curlbuild-64.h", - "external/curl/include/ios/curl/curlbuild.h", - "external/curl/include/ios/curl/curlrules.h", - "external/curl/include/ios/curl/curlver.h", - "external/curl/include/ios/curl/easy.h", - "external/curl/include/ios/curl/mprintf.h", - "external/curl/include/ios/curl/multi.h", - "external/curl/include/ios/curl/stdcheaders.h", - "external/curl/include/ios/curl/typecheck-gcc.h", "external/curl/include/mac/curl/curl.h", "external/curl/include/mac/curl/curlbuild.h", "external/curl/include/mac/curl/curlrules.h", @@ -2308,24 +2288,11 @@ "external/curl/include/wp_8.1/curl/multi.h", "external/curl/include/wp_8.1/curl/stdcheaders.h", "external/curl/include/wp_8.1/curl/typecheck-gcc.h", - "external/curl/prebuilt/android/Android.mk", - "external/curl/prebuilt/android/armeabi-v7a/libcrypto.a", - "external/curl/prebuilt/android/armeabi-v7a/libcurl.a", - "external/curl/prebuilt/android/armeabi-v7a/libssl.a", - "external/curl/prebuilt/android/armeabi/libcrypto.a", - "external/curl/prebuilt/android/armeabi/libcurl.a", - "external/curl/prebuilt/android/armeabi/libssl.a", - "external/curl/prebuilt/android/x86/libcrypto.a", - "external/curl/prebuilt/android/x86/libcurl.a", - "external/curl/prebuilt/android/x86/libssl.a", - "external/curl/prebuilt/ios/libcrypto.a", - "external/curl/prebuilt/ios/libcurl.a", - "external/curl/prebuilt/ios/libssl.a", "external/curl/prebuilt/mac/libcrypto.a", "external/curl/prebuilt/mac/libcurl.a", "external/curl/prebuilt/mac/libssl.a", "external/curl/prebuilt/win32/libcurl.dll", - "external/curl/prebuilt/win32/libcurl_imp.lib", + "external/curl/prebuilt/win32/libcurl.lib", "external/curl/prebuilt/win32/libeay32.lib", "external/curl/prebuilt/win32/ssleay32.lib", "external/curl/prebuilt/winrt_8.1/arm/libcurl.dll", @@ -2999,6 +2966,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", From cf431121c9633f7b43491a8bc29c6c738e2cee07 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 4 Jun 2015 19:38:52 +0800 Subject: [PATCH 10/12] Revert "update 3rd party libs to 60" --- external/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/config.json b/external/config.json index 6355bc2b9d..54f8f5d4f8 100644 --- a/external/config.json +++ b/external/config.json @@ -1,5 +1,5 @@ { - "version":"v3-deps-60", + "version":"v3-deps-57", "zip_file_size":"138162176", "repo_name":"cocos2d-x-3rd-party-libs-bin", "repo_parent":"https://github.com/cocos2d/", From 8865bd488e227f5b1219904aa791a778bc92a050 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Thu, 4 Jun 2015 12:52:41 +0000 Subject: [PATCH 11/12] [ci skip][AUTO]: updating luabinding & jsbinding automatically --- .../auto/api/jsb_cocos2dx_auto_api.js | 24 +++- .../js-bindings/auto/jsb_cocos2dx_auto.cpp | 72 ++++++++--- .../js-bindings/auto/jsb_cocos2dx_auto.hpp | 4 +- .../lua-bindings/auto/api/ComAudio.lua | 26 +++- .../lua-bindings/auto/api/ComController.lua | 14 +++ .../lua-bindings/auto/api/ComRender.lua | 14 +++ .../lua-bindings/auto/api/Component.lua | 16 ++- .../lua-bindings/auto/lua_cocos2dx_auto.cpp | 118 ++++++++++++++++-- .../lua-bindings/auto/lua_cocos2dx_auto.hpp | 2 + 9 files changed, 247 insertions(+), 43 deletions(-) diff --git a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js index 95ab779589..34f28019da 100644 --- a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js +++ b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js @@ -22213,6 +22213,14 @@ isEnabled : function ( return false; }, +/** + * @method onRemove + */ +onRemove : function ( +) +{ +}, + /** * @method update * @param {float} arg0 @@ -22244,11 +22252,9 @@ init : function ( }, /** - * @method setOwner - * @param {cc.Node} arg0 + * @method onAdd */ -setOwner : function ( -node +onAdd : function ( ) { }, @@ -22263,6 +22269,16 @@ getName : function ( return ; }, +/** + * @method setOwner + * @param {cc.Node} arg0 + */ +setOwner : function ( +node +) +{ +}, + /** * @method create * @return {cc.Component} diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index 545aa3cd07..00bd28b7f8 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -67823,6 +67823,22 @@ 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_onRemove(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_onRemove : Invalid Native Object"); + if (argc == 0) { + cobj->onRemove(); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_Component_onRemove : 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); @@ -67886,6 +67902,40 @@ 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_onAdd(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_onAdd : Invalid Native Object"); + if (argc == 0) { + cobj->onAdd(); + args.rval().setUndefined(); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_Component_onAdd : 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 +67964,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 +68058,13 @@ 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("onRemove", js_cocos2dx_Component_onRemove, 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("onAdd", js_cocos2dx_Component_onAdd, 0, 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 }; diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp index 1a0c5560e6..752f1198d2 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp @@ -3922,11 +3922,13 @@ 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_onRemove(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_onAdd(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); diff --git a/cocos/scripting/lua-bindings/auto/api/ComAudio.lua b/cocos/scripting/lua-bindings/auto/api/ComAudio.lua index ad1daa9948..ae10d04a67 100644 --- a/cocos/scripting/lua-bindings/auto/api/ComAudio.lua +++ b/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
+-- 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
+-- lua NA +-- @function [parent=#ComAudio] onAdd +-- @param self +-- @return ComAudio#ComAudio self (return value: ccs.ComAudio) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/ComController.lua b/cocos/scripting/lua-bindings/auto/api/ComController.lua index 87c582e32c..df4fbe5c16 100644 --- a/cocos/scripting/lua-bindings/auto/api/ComController.lua +++ b/cocos/scripting/lua-bindings/auto/api/ComController.lua @@ -29,6 +29,13 @@ -- @param self -- @return bool#bool ret (return value: bool) +-------------------------------- +-- js NA
+-- 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
+-- lua NA +-- @function [parent=#ComController] onAdd +-- @param self +-- @return ComController#ComController self (return value: ccs.ComController) + -------------------------------- -- js ctor -- @function [parent=#ComController] ComController diff --git a/cocos/scripting/lua-bindings/auto/api/ComRender.lua b/cocos/scripting/lua-bindings/auto/api/ComRender.lua index 42200e3a28..0d9f436c6e 100644 --- a/cocos/scripting/lua-bindings/auto/api/ComRender.lua +++ b/cocos/scripting/lua-bindings/auto/api/ComRender.lua @@ -39,4 +39,18 @@ -- @param #void r -- @return bool#bool ret (return value: bool) +-------------------------------- +-- js NA
+-- lua NA +-- @function [parent=#ComRender] onRemove +-- @param self +-- @return ComRender#ComRender self (return value: ccs.ComRender) + +-------------------------------- +-- js NA
+-- lua NA +-- @function [parent=#ComRender] onAdd +-- @param self +-- @return ComRender#ComRender self (return value: ccs.ComRender) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Component.lua b/cocos/scripting/lua-bindings/auto/api/Component.lua index 5e157151d1..372d8e1cf0 100644 --- a/cocos/scripting/lua-bindings/auto/api/Component.lua +++ b/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 diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 84ff90b5f7..8064da4c86 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/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(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(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(); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp index b0e49095a4..59981d3917 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -2049,6 +2049,8 @@ int register_all_cocos2dx(lua_State* tolua_S); + + From 1b8ff0e5957c98b2661b6909a9c6389aaf786f7b Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Thu, 4 Jun 2015 14:05:38 +0000 Subject: [PATCH 12/12] [AUTO][ci skip]: updating cocos2dx_files.json --- templates/cocos2dx_files.json | 41 +++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index ad1a640300..8b77d68bbf 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -2252,6 +2252,26 @@ "external/chipmunk/prebuilt/wp_8.1/arm/chipmunk.lib", "external/chipmunk/prebuilt/wp_8.1/win32/chipmunk.lib", "external/config.json", + "external/curl/include/android/curl/curl.h", + "external/curl/include/android/curl/curlbuild.h", + "external/curl/include/android/curl/curlrules.h", + "external/curl/include/android/curl/curlver.h", + "external/curl/include/android/curl/easy.h", + "external/curl/include/android/curl/mprintf.h", + "external/curl/include/android/curl/multi.h", + "external/curl/include/android/curl/stdcheaders.h", + "external/curl/include/android/curl/typecheck-gcc.h", + "external/curl/include/ios/curl/curl.h", + "external/curl/include/ios/curl/curlbuild-32.h", + "external/curl/include/ios/curl/curlbuild-64.h", + "external/curl/include/ios/curl/curlbuild.h", + "external/curl/include/ios/curl/curlrules.h", + "external/curl/include/ios/curl/curlver.h", + "external/curl/include/ios/curl/easy.h", + "external/curl/include/ios/curl/mprintf.h", + "external/curl/include/ios/curl/multi.h", + "external/curl/include/ios/curl/stdcheaders.h", + "external/curl/include/ios/curl/typecheck-gcc.h", "external/curl/include/mac/curl/curl.h", "external/curl/include/mac/curl/curlbuild.h", "external/curl/include/mac/curl/curlrules.h", @@ -2288,11 +2308,24 @@ "external/curl/include/wp_8.1/curl/multi.h", "external/curl/include/wp_8.1/curl/stdcheaders.h", "external/curl/include/wp_8.1/curl/typecheck-gcc.h", + "external/curl/prebuilt/android/Android.mk", + "external/curl/prebuilt/android/armeabi-v7a/libcrypto.a", + "external/curl/prebuilt/android/armeabi-v7a/libcurl.a", + "external/curl/prebuilt/android/armeabi-v7a/libssl.a", + "external/curl/prebuilt/android/armeabi/libcrypto.a", + "external/curl/prebuilt/android/armeabi/libcurl.a", + "external/curl/prebuilt/android/armeabi/libssl.a", + "external/curl/prebuilt/android/x86/libcrypto.a", + "external/curl/prebuilt/android/x86/libcurl.a", + "external/curl/prebuilt/android/x86/libssl.a", + "external/curl/prebuilt/ios/libcrypto.a", + "external/curl/prebuilt/ios/libcurl.a", + "external/curl/prebuilt/ios/libssl.a", "external/curl/prebuilt/mac/libcrypto.a", "external/curl/prebuilt/mac/libcurl.a", "external/curl/prebuilt/mac/libssl.a", "external/curl/prebuilt/win32/libcurl.dll", - "external/curl/prebuilt/win32/libcurl.lib", + "external/curl/prebuilt/win32/libcurl_imp.lib", "external/curl/prebuilt/win32/libeay32.lib", "external/curl/prebuilt/win32/ssleay32.lib", "external/curl/prebuilt/winrt_8.1/arm/libcurl.dll", @@ -2966,12 +2999,6 @@ "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",