diff --git a/scripting/lua/cocos2dx_support/LuaBasicConversions.cpp b/scripting/lua/cocos2dx_support/LuaBasicConversions.cpp index 9b389e25a7..73d2e811ea 100644 --- a/scripting/lua/cocos2dx_support/LuaBasicConversions.cpp +++ b/scripting/lua/cocos2dx_support/LuaBasicConversions.cpp @@ -1137,7 +1137,7 @@ void array_to_luaval(lua_State* L,Array* inValue) if (nullptr == obj) continue; - uint32_t typeId = cocos2d::getHashCodeByString(typeid(*obj).name()); + uint32_t typeId = typeid(*obj).hash_code(); auto iter = g_luaType.find(typeId); if (g_luaType.end() != iter) { @@ -1226,7 +1226,8 @@ void dictionary_to_luaval(lua_State* L, Dictionary* dict) if (NULL == element) continue; - uint32_t typeId = cocos2d::getHashCodeByString(typeid(element->getObject()).name()); + uint32_t typeId = typeid(element->getObject()).hash_code(); + auto iter = g_luaType.find(typeId); if (g_luaType.end() != iter) { diff --git a/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id b/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id index 1a95695d30..59e1eb54ca 100644 --- a/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id +++ b/scripting/lua/cocos2dx_support/LuaOpengl.cpp.REMOVED.git-id @@ -1 +1 @@ -13bc27135b11b87249075c37897972a41802f216 \ No newline at end of file +e2ec824824096631a51472eab29643b0f55ef6f3 \ No newline at end of file diff --git a/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp.REMOVED.git-id b/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp.REMOVED.git-id index a079474a29..ba456b9a2d 100644 --- a/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp.REMOVED.git-id +++ b/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp.REMOVED.git-id @@ -1 +1 @@ -451f7b8e8003474fb17be07923476ea2f12a9122 \ No newline at end of file +90eec5befefca388a591c3cf8dc10950588cec15 \ No newline at end of file diff --git a/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js.REMOVED.git-id b/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js.REMOVED.git-id index ecb3af7f4c..9fa10a1d50 100644 --- a/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js.REMOVED.git-id +++ b/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js.REMOVED.git-id @@ -1 +1 @@ -7ec8c685dde8f273f39cb13c8e009d9bca6e0e53 \ No newline at end of file +bc27ec5b64be9ac5530fd15fcc22cd8832504685 \ No newline at end of file diff --git a/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_extension_auto.cpp.REMOVED.git-id b/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_extension_auto.cpp.REMOVED.git-id index 55cb9b86aa..40c1f53607 100644 --- a/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_extension_auto.cpp.REMOVED.git-id +++ b/scripting/lua/cocos2dx_support/generated/lua_cocos2dx_extension_auto.cpp.REMOVED.git-id @@ -1 +1 @@ -2c817ab849fe61f97c010cf5e9b6528bca2a0396 \ No newline at end of file +0389c415199783d5bbcc1ee8882cc01220bc37f6 \ No newline at end of file diff --git a/scripting/lua/cocos2dx_support/lua_cocos2dx_extension_manual.cpp b/scripting/lua/cocos2dx_support/lua_cocos2dx_extension_manual.cpp index 7a4b325aaf..790e64a15e 100644 --- a/scripting/lua/cocos2dx_support/lua_cocos2dx_extension_manual.cpp +++ b/scripting/lua/cocos2dx_support/lua_cocos2dx_extension_manual.cpp @@ -690,7 +690,7 @@ int register_cocos2dx_extension_CCBProxy(lua_State* tolua_S) tolua_endmodule(tolua_S); tolua_endmodule(tolua_S); - uint32_t typeId = cocos2d::getHashCodeByString(typeid(CCBProxy).name()); + uint32_t typeId = typeid(CCBProxy).hash_code(); g_luaType[typeId] = "CCBProxy"; return 1; } diff --git a/scripting/lua/cocos2dx_support/lua_cocos2dx_manual.cpp b/scripting/lua/cocos2dx_support/lua_cocos2dx_manual.cpp index c3ee4d2e0c..275f08edf0 100644 --- a/scripting/lua/cocos2dx_support/lua_cocos2dx_manual.cpp +++ b/scripting/lua/cocos2dx_support/lua_cocos2dx_manual.cpp @@ -903,7 +903,7 @@ tolua_lerror: #endif } -static int tolua_cocos2d_Sequence_create(lua_State* tolua_S) +int tolua_cocos2d_Sequence_create(lua_State* tolua_S) { if (NULL == tolua_S) return 0; @@ -1279,7 +1279,7 @@ tolua_lerror: #endif } -static int tolua_cocos2d_CardinalSplineBy_create(lua_State* tolua_S) +int lua_cocos2d_CardinalSplineBy_create(lua_State* tolua_S) { if (NULL == tolua_S) return 0; @@ -1348,7 +1348,7 @@ tolua_lerror: #endif } -static int tolua_cocos2d_CatmullRomBy_create(lua_State* tolua_S) +int tolua_cocos2d_CatmullRomBy_create(lua_State* tolua_S) { if (NULL == tolua_S) return 0; @@ -1412,7 +1412,7 @@ tolua_lerror: #endif } -static int tolua_cocos2d_CatmullRomTo_create(lua_State* tolua_S) +int tolua_cocos2d_CatmullRomTo_create(lua_State* tolua_S) { if (NULL == tolua_S) return 0; @@ -1476,7 +1476,7 @@ tolua_lerror: #endif } -static int tolua_cocos2d_BezierBy_create(lua_State* tolua_S) +int tolua_cocos2d_BezierBy_create(lua_State* tolua_S) { if (NULL == tolua_S) return 0; @@ -1536,7 +1536,7 @@ tolua_lerror: #endif } -static int tolua_cocos2d_BezierTo_create(lua_State* tolua_S) +int tolua_cocos2d_BezierTo_create(lua_State* tolua_S) { if (NULL == tolua_S) return 0; @@ -2497,7 +2497,7 @@ static void extendCardinalSplineBy(lua_State* tolua_S) if (lua_istable(tolua_S,-1)) { lua_pushstring(tolua_S,"create"); - lua_pushcfunction(tolua_S,tolua_cocos2d_CardinalSplineBy_create); + lua_pushcfunction(tolua_S,lua_cocos2d_CardinalSplineBy_create); lua_rawset(tolua_S,-3); } } diff --git a/tools/bindings-generator b/tools/bindings-generator index e82fb176bd..98ddf882f2 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit e82fb176bd9a9fa573e3282e6af5ba19a7131633 +Subproject commit 98ddf882f2898bc9043ea54d9ed7f32383f6be4d