diff --git a/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp b/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp index 7d7600e..447274f 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp @@ -28,8 +28,6 @@ #include "scripting/lua-bindings/manual/tolua_fix.h" #include "scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp" -#include "scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.h" -#include "scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp" #include "scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.hpp" #include "base/CCDirector.h" #include "base/CCEventCustom.h" @@ -467,11 +465,6 @@ int LuaEngine::handleEvent(ScriptHandlerMgr::HandlerType type,void* data) { switch (type) { - case ScriptHandlerMgr::HandlerType::ARMATURE_EVENT: - { - return handleArmatureWrapper(type, data); - } - break; case ScriptHandlerMgr::HandlerType::EVENT_ACC: { return handleEventAcc(data); @@ -519,60 +512,6 @@ int LuaEngine::handleEvent(ScriptHandlerMgr::HandlerType type,void* data) return 0; } -int LuaEngine::handleArmatureWrapper(ScriptHandlerMgr::HandlerType type,void* data) -{ - if (nullptr == data) - return 0; - - BasicScriptData* eventData = static_cast(data); - if (nullptr == eventData->nativeObject || nullptr == eventData->value) - return 0; - - LuaArmatureWrapperEventData* wrapperData = static_cast(eventData->value); - - int handler = ScriptHandlerMgr::getInstance()->getObjectHandler((void*)eventData->nativeObject, ScriptHandlerMgr::HandlerType::ARMATURE_EVENT); - - if (0 == handler) - return 0; - - switch (wrapperData->eventType) - { - case LuaArmatureWrapperEventData::LuaArmatureWrapperEventType::MOVEMENT_EVENT: - { - LuaArmatureMovementEventData* movementData = static_cast(wrapperData->eventData); - - _stack->pushObject(movementData->objTarget, "ccs.Armature"); - _stack->pushInt(movementData->movementType); - _stack->pushString(movementData->movementID.c_str()); - _stack->executeFunctionByHandler(handler, 3); - } - break; - case LuaArmatureWrapperEventData::LuaArmatureWrapperEventType::FRAME_EVENT: - { - LuaArmatureFrameEventData* frameData = static_cast(wrapperData->eventData); - - _stack->pushObject(frameData->objTarget, "ccs.Bone"); - _stack->pushString(frameData->frameEventName.c_str()); - _stack->pushInt(frameData->originFrameIndex); - _stack->pushInt(frameData->currentFrameIndex); - _stack->executeFunctionByHandler(handler, 4); - } - break; - case LuaArmatureWrapperEventData::LuaArmatureWrapperEventType::FILE_ASYNC: - { - _stack->pushFloat(*(float*)wrapperData->eventData); - _stack->executeFunctionByHandler(handler, 1); - } - break; - default: - break; - } - - _stack->clean(); - - return 0; -} - int LuaEngine::reload(const char* moduleFileName) { return _stack->reload(moduleFileName); diff --git a/cocos/scripting/lua-bindings/manual/CCLuaEngine.h b/cocos/scripting/lua-bindings/manual/CCLuaEngine.h index 6e0f9f9..474569c 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaEngine.h +++ b/cocos/scripting/lua-bindings/manual/CCLuaEngine.h @@ -205,7 +205,6 @@ private: int handleCommonEvent(void* data); int handlerControlEvent(void* data); int handleEvenCustom(void* data); - int handleArmatureWrapper(ScriptHandlerMgr::HandlerType type,void* data); int handleEventAcc(void* data); int handleEventKeyboard(ScriptHandlerMgr::HandlerType type,void* data); int handleEventTouch(ScriptHandlerMgr::HandlerType type, void* data); diff --git a/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h b/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h index b6e423d..3b07b96 100644 --- a/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h +++ b/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h @@ -139,8 +139,6 @@ public: LUANODE_DRAW, - ARMATURE_EVENT, - EVENT_ACC, EVENT_CUSTIOM, diff --git a/templates/src/cocos/cocos2d/Cocos2dConstants.lua b/templates/src/cocos/cocos2d/Cocos2dConstants.lua index 641e758..39a4d04 100644 --- a/templates/src/cocos/cocos2d/Cocos2dConstants.lua +++ b/templates/src/cocos/cocos2d/Cocos2dConstants.lua @@ -136,42 +136,41 @@ cc.Handler.WEBSOCKET_MESSAGE = 3 cc.Handler.WEBSOCKET_CLOSE = 4 cc.Handler.WEBSOCKET_ERROR = 5 cc.Handler.LUANODE_DRAW = 6 -cc.Handler.ARMATURE_EVENT = 7 -cc.Handler.EVENT_ACC = 8 -cc.Handler.EVENT_CUSTIOM = 9 -cc.Handler.EVENT_KEYBOARD_PRESSED = 10 -cc.Handler.EVENT_KEYBOARD_RELEASED = 11 -cc.Handler.EVENT_TOUCH_BEGAN = 12 -cc.Handler.EVENT_TOUCH_MOVED = 13 -cc.Handler.EVENT_TOUCH_ENDED = 14 -cc.Handler.EVENT_TOUCH_CANCELLED = 15 -cc.Handler.EVENT_TOUCHES_BEGAN = 16 -cc.Handler.EVENT_TOUCHES_MOVED = 17 -cc.Handler.EVENT_TOUCHES_ENDED = 18 -cc.Handler.EVENT_TOUCHES_CANCELLED = 19 -cc.Handler.EVENT_MOUSE_DOWN = 20 -cc.Handler.EVENT_MOUSE_UP = 21 -cc.Handler.EVENT_MOUSE_MOVE = 22 -cc.Handler.EVENT_MOUSE_SCROLL = 23 -cc.Handler.EVENT_PHYSICS_CONTACT_BEGIN = 24 -cc.Handler.EVENT_PHYSICS_CONTACT_PRESOLVE = 25 -cc.Handler.EVENT_PHYSICS_CONTACT_POSTSOLVE = 26 -cc.Handler.EVENT_PHYSICS_CONTACT_SEPARATE = 27 -cc.Handler.EVENT_FOCUS = 28 -cc.Handler.EVENT_CONTROLLER_CONNECTED = 29 -cc.Handler.EVENT_CONTROLLER_DISCONNECTED = 30 -cc.Handler.EVENT_CONTROLLER_KEYDOWN = 31 -cc.Handler.EVENT_CONTROLLER_KEYUP = 32 -cc.Handler.EVENT_CONTROLLER_KEYREPEAT = 33 -cc.Handler.EVENT_CONTROLLER_AXIS = 34 -cc.Handler.EVENT_SPINE_ANIMATION_START = 35 -cc.Handler.EVENT_SPINE_ANIMATION_INTERRUPT = 36 -cc.Handler.EVENT_SPINE_ANIMATION_END = 37 -cc.Handler.EVENT_SPINE_ANIMATION_DISPOSE = 38 -cc.Handler.EVENT_SPINE_ANIMATION_COMPLETE = 39 -cc.Handler.EVENT_SPINE_ANIMATION_EVENT = 40 -cc.Handler.EVENT_SPINE_ANIMATION_PREUPDATE = 41 -cc.Handler.EVENT_SPINE_ANIMATION_POSTUPDATE = 42 +cc.Handler.EVENT_ACC = 7 +cc.Handler.EVENT_CUSTIOM = 8 +cc.Handler.EVENT_KEYBOARD_PRESSED = 9 +cc.Handler.EVENT_KEYBOARD_RELEASED = 10 +cc.Handler.EVENT_TOUCH_BEGAN = 11 +cc.Handler.EVENT_TOUCH_MOVED = 12 +cc.Handler.EVENT_TOUCH_ENDED = 13 +cc.Handler.EVENT_TOUCH_CANCELLED = 14 +cc.Handler.EVENT_TOUCHES_BEGAN = 15 +cc.Handler.EVENT_TOUCHES_MOVED = 16 +cc.Handler.EVENT_TOUCHES_ENDED = 17 +cc.Handler.EVENT_TOUCHES_CANCELLED = 18 +cc.Handler.EVENT_MOUSE_DOWN = 19 +cc.Handler.EVENT_MOUSE_UP = 20 +cc.Handler.EVENT_MOUSE_MOVE = 21 +cc.Handler.EVENT_MOUSE_SCROLL = 22 +cc.Handler.EVENT_PHYSICS_CONTACT_BEGIN = 23 +cc.Handler.EVENT_PHYSICS_CONTACT_PRESOLVE = 24 +cc.Handler.EVENT_PHYSICS_CONTACT_POSTSOLVE = 25 +cc.Handler.EVENT_PHYSICS_CONTACT_SEPARATE = 26 +cc.Handler.EVENT_FOCUS = 27 +cc.Handler.EVENT_CONTROLLER_CONNECTED = 28 +cc.Handler.EVENT_CONTROLLER_DISCONNECTED = 29 +cc.Handler.EVENT_CONTROLLER_KEYDOWN = 30 +cc.Handler.EVENT_CONTROLLER_KEYUP = 31 +cc.Handler.EVENT_CONTROLLER_KEYREPEAT = 32 +cc.Handler.EVENT_CONTROLLER_AXIS = 33 +cc.Handler.EVENT_SPINE_ANIMATION_START = 34 +cc.Handler.EVENT_SPINE_ANIMATION_INTERRUPT = 35 +cc.Handler.EVENT_SPINE_ANIMATION_END = 36 +cc.Handler.EVENT_SPINE_ANIMATION_DISPOSE = 37 +cc.Handler.EVENT_SPINE_ANIMATION_COMPLETE = 38 +cc.Handler.EVENT_SPINE_ANIMATION_EVENT = 39 +cc.Handler.EVENT_SPINE_ANIMATION_PREUPDATE = 40 +cc.Handler.EVENT_SPINE_ANIMATION_POSTUPDATE = 41 -- EventListener Type cc.EVENT_UNKNOWN = 0 cc.EVENT_TOUCH_ONE_BY_ONE = 1