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

Merge: 53122216ee a708c2f904 

Merge branch 'master' of https://github.com/c4games/engine-x
This commit is contained in:
halx99 2020-11-18 12:16:36 +08:00
parent 09e2615e51
commit c12701da10
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitmodules vendored
View File

@ -1,9 +0,0 @@
[submodule "tools/cocos2d-console"]
path = tools/cocos2d-console
url = git://github.com/cocos2d/cocos2d-console.git
[submodule "tools/bindings-generator"]
path = tools/bindings-generator
url = git://github.com/cocos2d/bindings-generator.git
[submodule "tests/cpp-tests/Resources/ccs-res"]
path = tests/cpp-tests/Resources/ccs-res
url = git://github.com/dumganhar/ccs-res.git

4
extensions/GUI/CCControlExtension/CCControl.cpp
View File

@ -121,7 +121,9 @@ void Control::sendActionsForControlEvents(EventType controlEvents)
#if CC_ENABLE_SCRIPT_BINDING #if CC_ENABLE_SCRIPT_BINDING
cocos2d::BasicScriptData data(this,(void*)&controlEvents); cocos2d::BasicScriptData data(this,(void*)&controlEvents);
cocos2d::ScriptEvent event(cocos2d::kControlEvent,(void*)&data); cocos2d::ScriptEvent event(cocos2d::kControlEvent,(void*)&data);
cocos2d::ScriptEngineManager::getInstance()->getScriptEngine()->sendEvent(event); auto scriptEngine = cocos2d::ScriptEngineManager::getInstance()->getScriptEngine();
if(scriptEngine)
scriptEngine->sendEvent(event);
#endif #endif
} }
} }

4
extensions/scripting/lua-bindings/CMakeLists.txt
View File

@ -185,10 +185,6 @@ if(WINDOWS)
target_compile_definitions(${ENGINEX_LUA_LIB} PUBLIC _USRLUASTATIC) target_compile_definitions(${ENGINEX_LUA_LIB} PUBLIC _USRLUASTATIC)
endif() endif()
target_compile_definitions(${ENGINEX_LUA_LIB}
PUBLIC LUA_COMPAT_MODULE
)
set_target_properties(${ENGINEX_LUA_LIB} set_target_properties(${ENGINEX_LUA_LIB}
PROPERTIES PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"

13
extensions/scripting/lua-bindings/manual/CCLuaStack.cpp
View File

@ -69,8 +69,7 @@ namespace {
size_t sz; size_t sz;
s = lua_tolstring(L, -1, &sz); /* get result */ s = lua_tolstring(L, -1, &sz); /* get result */
if (s == NULL) if (s == NULL)
return luaL_error(L, LUA_QL("tostring") " must return a string to " return luaL_error(L, "'tostring' must return a string to 'print'");
LUA_QL("print"));
if (i>1) out->append("\t"); if (i>1) out->append("\t");
out->append(s, sz); out->append(s, sz);
lua_pop(L, 1); /* pop result */ lua_pop(L, 1); /* pop result */
@ -188,11 +187,17 @@ void LuaStack::addSearchPath(const char* path)
void LuaStack::addLuaLoader(lua_CFunction func) void LuaStack::addLuaLoader(lua_CFunction func)
{ {
if (!func) return; if (!func) return;
#if LUA_VERSION_NUM >= 504 || (LUA_VERSION_NUM >= 502 && !defined(LUA_COMPAT_LOADERS))
const char* realname = "searchers";
#else
const char* realname = "loaders";
#endif
// stack content after the invoking of the function // stack content after the invoking of the function
// get loader table // get loader table
lua_getglobal(_state, "package"); /* L: package */ lua_getglobal(_state, "package"); /* L: package */
lua_getfield(_state, -1, "loaders"); /* L: package, loaders */ lua_getfield(_state, -1, realname); /* L: package, loaders */
// insert loader into index 2 // insert loader into index 2
lua_pushcfunction(_state, func); /* L: package, loaders, func */ lua_pushcfunction(_state, func); /* L: package, loaders, func */
@ -205,7 +210,7 @@ void LuaStack::addLuaLoader(lua_CFunction func)
lua_rawseti(_state, -2, 2); /* L: package, loaders */ lua_rawseti(_state, -2, 2); /* L: package, loaders */
// set loaders into package // set loaders into package
lua_setfield(_state, -2, "loaders"); /* L: package */ lua_setfield(_state, -2, realname); /* L: package */
lua_pop(_state, 1); lua_pop(_state, 1);
} }