Merge pull request #4358 from samuele3hu/developTableView

issue #3228:CallFuncND + auto remove lua test case have no effect

build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-2461d13fd6f4fadc6ee396109932e50b1de8ed99
+b343c033f369dd9a1cd41baf60012cd447af6970

cocos/2d/CCActionInstant.cpp

@@ -472,7 +472,7 @@ CallFuncN * CallFuncN::clone() const
     if( _selectorTarget) {
         a->initWithTarget(_selectorTarget, _callFuncN);
     }
-    else if( _function ){
+    else if( _functionN ){
         a->initWithFunction(_functionN);
     }
 

cocos/2d/CCActionInstant.h

@@ -263,8 +263,8 @@ public:
     CC_DEPRECATED_ATTRIBUTE bool initWithTarget(Object* target);
 
 	/** initializes the action with the std::function<void()>
-     * @js NK
-     * @lua NK
+     * @js NA
+     * @lua NA
 	 */
     bool initWithFunction(const std::function<void()>& func);
 

cocos/scripting/lua/bindings/LuaScriptHandlerMgr.cpp

@@ -48,31 +48,35 @@ void ScheduleHandlerDelegate::update(float elapse)
 }
 
 
-LuaCallFunc * LuaCallFunc::create(int nHandler)
+LuaCallFunc * LuaCallFunc::create(const std::function<void(void* ,Node*)>& func)
 {
-    LuaCallFunc *ret = new LuaCallFunc();
-    if (NULL != ret )
-    {
+    auto ret = new LuaCallFunc();
+    
+    if (ret && ret->initWithFunction(func) ) {
         ret->autorelease();
-        ScriptHandlerMgr::getInstance()->addObjectHandler((void*)ret, nHandler, ScriptHandlerMgr::HandlerType::CALLFUNC);
         return ret;
     }
+    
+    CC_SAFE_DELETE(ret);
+    return NULL;
+}
+
+void LuaCallFunc::execute()
+{
+    if (_functionLua)
+    {
+        _functionLua((void*)this,_target);
+    }
     else
     {
-        CC_SAFE_DELETE(ret);
-        return NULL;
+        CallFuncN::execute();
     }
 }
-void LuaCallFunc::execute()
+
+bool LuaCallFunc::initWithFunction(const std::function<void (void*, Node*)> &func)
 {
-    int handler =  ScriptHandlerMgr::getInstance()->getObjectHandler((void*)this, ScriptHandlerMgr::HandlerType::CALLFUNC);
-    
-    if (0 == handler)
-        return ;
-    
-    BasicScriptData data((void*)this,(void*)_target);
-    ScriptEvent event(kCallFuncEvent,(void*)&data);
-    ScriptEngineManager::getInstance()->getScriptEngine()->sendEvent(&event);
+    _functionLua = func;
+    return true;
 }
 
 LuaCallFunc* LuaCallFunc::clone() const
@@ -83,13 +87,18 @@ LuaCallFunc* LuaCallFunc::clone() const
         return NULL;
     
     auto ret = new LuaCallFunc();
+    
+    if( _functionLua )
+    {
+        ret->initWithFunction(_functionLua);
+    }
+    
+    ret->autorelease();
 
     int newscriptHandler = cocos2d::ScriptEngineManager::getInstance()->getScriptEngine()->reallocateScriptHandler(handler);
     
     ScriptHandlerMgr::getInstance()->addObjectHandler((void*)ret, newscriptHandler, ScriptHandlerMgr::HandlerType::CALLFUNC);
-    
-    ret->autorelease();
-    
+        
     return ret;
 }
 

cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h

@@ -44,14 +44,20 @@ private:
 class LuaCallFunc:public cocos2d::CallFuncN
 {
 public:
-    LuaCallFunc()
+    LuaCallFunc():_functionLua(nullptr)
     {}
     virtual ~LuaCallFunc()
     {}
     
-    static LuaCallFunc * create(int nHandler);
-    virtual void execute();
+    static LuaCallFunc* create(const std::function<void(void* self,Node*)>& func);
+    bool initWithFunction(const std::function<void(void* self,Node*)>& func);
     virtual LuaCallFunc* clone() const;
+    virtual void execute() override;
+protected:
+    /**
+     */
+    std::function<void(void* self,Node*)> _functionLua;
+    
 };
 
 class ScriptHandlerMgr

cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp.REMOVED.git-id

@@ -1 +1 @@
-6f20ef3b233b2dffcfa11fe289879cfc5ee35d51
+86fa141032de3d513df690fc82b20d2f2b4ab01b

samples/Lua/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua

@@ -835,6 +835,15 @@ local function ActionCallFuncND()
 
 	centerSprites(1)
 
+    local function doRemoveFromParentAndCleanup(sender,table)
+        grossini:removeFromParentAndCleanup(table[1])
+    end
+
+    local action = cc.Sequence:create(
+        cc.MoveBy:create(2, cc.p(200,0)),
+        cc.CallFunc:create(doRemoveFromParentAndCleanup,{true}))
+
+    grossini:runAction(action)
 
 	Helper.titleLabel:setString("CallFuncND + auto remove")
 	Helper.subtitleLabel:setString("CallFuncND + removeFromParent. Grossini dissapears in 2s")