Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

closed #3716: edit lua support

This commit is contained in:
boyu0 2014-01-28 17:06:37 +08:00
parent 1917ffe8b9
commit a5863aafb3
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp
View File

@ -1175,11 +1175,10 @@ static int tolua_cocos2dx_EventListenerPhysicsContact_registerScriptHandler(lua_
{ {
ScriptHandlerMgr::getInstance()->addObjectHandler((void*)self, handler, type); ScriptHandlerMgr::getInstance()->addObjectHandler((void*)self, handler, type);
self->onContactBegin = [handler](EventCustom* event, const PhysicsContact& contact) -> bool{ self->onContactBegin = [handler](PhysicsContact& contact) -> bool{
LuaStack* stack = LuaEngine::getInstance()->getLuaStack(); LuaStack* stack = LuaEngine::getInstance()->getLuaStack();
stack->pushObject(event, "cc.EventCustom"); stack->pushObject(&contact, "cc.PhysicsContact");
stack->pushObject(const_cast<PhysicsContact*>(&contact), "cc.PhysicsContact"); bool ret = stack->executeFunctionByHandler(handler, 1);
bool ret = stack->executeFunctionByHandler(handler, 2);
stack->clean(); stack->clean();
return ret; return ret;
@ -1190,12 +1189,11 @@ static int tolua_cocos2dx_EventListenerPhysicsContact_registerScriptHandler(lua_
{ {
ScriptHandlerMgr::getInstance()->addObjectHandler((void*)self, handler, type); ScriptHandlerMgr::getInstance()->addObjectHandler((void*)self, handler, type);
self->onContactPreSolve = [handler](EventCustom* event, const PhysicsContact& contact, const PhysicsContactPreSolve& solve) -> bool{ self->onContactPreSolve = [handler](PhysicsContact& contact, PhysicsContactPreSolve& solve) -> bool{
LuaStack* stack = LuaEngine::getInstance()->getLuaStack(); LuaStack* stack = LuaEngine::getInstance()->getLuaStack();
stack->pushObject(event, "cc.EventCustom"); stack->pushObject(&contact, "cc.PhysicsContact");
stack->pushObject(const_cast<PhysicsContact*>(&contact), "cc.PhysicsContact"); tolua_pushusertype(stack->getLuaState(), &solve, "cc.PhysicsContactPreSolve");
tolua_pushusertype(stack->getLuaState(), const_cast<PhysicsContactPreSolve*>(&solve), "cc.PhysicsContactPreSolve"); bool ret = stack->executeFunctionByHandler(handler, 2);
bool ret = stack->executeFunctionByHandler(handler, 3);
stack->clean(); stack->clean();
return ret; return ret;
@ -1206,12 +1204,11 @@ static int tolua_cocos2dx_EventListenerPhysicsContact_registerScriptHandler(lua_
{ {
ScriptHandlerMgr::getInstance()->addObjectHandler((void*)self, handler, type); ScriptHandlerMgr::getInstance()->addObjectHandler((void*)self, handler, type);
self->onContactPostSolve = [handler](EventCustom* event, const PhysicsContact& contact, const PhysicsContactPostSolve& solve){ self->onContactPostSolve = [handler](PhysicsContact& contact, const PhysicsContactPostSolve& solve){
LuaStack* stack = LuaEngine::getInstance()->getLuaStack(); LuaStack* stack = LuaEngine::getInstance()->getLuaStack();
stack->pushObject(event, "cc.EventCustom"); stack->pushObject(&contact, "cc.PhysicsContact");
stack->pushObject(const_cast<PhysicsContact*>(&contact), "cc.PhysicsContact");
tolua_pushusertype(stack->getLuaState(), const_cast<PhysicsContactPostSolve*>(&solve), "cc.PhysicsContactPostSolve"); tolua_pushusertype(stack->getLuaState(), const_cast<PhysicsContactPostSolve*>(&solve), "cc.PhysicsContactPostSolve");
stack->executeFunctionByHandler(handler, 3); stack->executeFunctionByHandler(handler, 2);
stack->clean(); stack->clean();
}; };
} }
@ -1220,11 +1217,10 @@ static int tolua_cocos2dx_EventListenerPhysicsContact_registerScriptHandler(lua_
{ {
ScriptHandlerMgr::getInstance()->addObjectHandler((void*)self, handler, type); ScriptHandlerMgr::getInstance()->addObjectHandler((void*)self, handler, type);
self->onContactSeperate = [handler](EventCustom* event, const PhysicsContact& contact){ self->onContactSeperate = [handler](PhysicsContact& contact){
LuaStack* stack = LuaEngine::getInstance()->getLuaStack(); LuaStack* stack = LuaEngine::getInstance()->getLuaStack();
stack->pushObject(event, "cc.EventCustom"); stack->pushObject(&contact, "cc.PhysicsContact");
stack->pushObject(const_cast<PhysicsContact*>(&contact), "cc.PhysicsContact"); stack->executeFunctionByHandler(handler, 1);
stack->executeFunctionByHandler(handler, 2);
stack->clean(); stack->clean();
}; };
} }

2
samples/Lua/TestLua/Resources/luaScript/PhysicsTest/PhysicsTest.lua
View File

@ -702,7 +702,7 @@ local function PhysicsDemoOneWayPlatform()
ball:getPhysicsBody():setMass(1.0); ball:getPhysicsBody():setMass(1.0);
layer:addChild(ball); layer:addChild(ball);
local function onContactBegin(event, contact) local function onContactBegin(contact)
return contact:getContactData().normal.y < 0; return contact:getContactData().normal.y < 0;
end end
local contactListener = cc.EventListenerPhysicsContactWithBodies:create(platform:getPhysicsBody(), ball:getPhysicsBody()); local contactListener = cc.EventListenerPhysicsContactWithBodies:create(platform:getPhysicsBody(), ball:getPhysicsBody());