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

Add missing param JNIEnv* for natvie interfaces [ci build]

This commit is contained in:
halx99 2020-11-18 12:15:02 +08:00
parent a524d61036
commit 09e2615e51
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitmodules vendored Normal file
View File

@ -0,0 +1,9 @@
[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

12
cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp
View File

@ -42,7 +42,7 @@ extern "C" {
cocos2d::Director::getInstance()->mainLoop(); cocos2d::Director::getInstance()->mainLoop();
} }
JNIEXPORT void JNICALL Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeOnPause() { JNIEXPORT void JNICALL Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeOnPause(JNIEnv* env) {
if (Director::getInstance()->getOpenGLView()) { if (Director::getInstance()->getOpenGLView()) {
Application::getInstance()->applicationDidEnterBackground(); Application::getInstance()->applicationDidEnterBackground();
cocos2d::EventCustom backgroundEvent(EVENT_COME_TO_BACKGROUND); cocos2d::EventCustom backgroundEvent(EVENT_COME_TO_BACKGROUND);
@ -50,7 +50,7 @@ extern "C" {
} }
} }
JNIEXPORT void JNICALL Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeOnResume() { JNIEXPORT void JNICALL Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeOnResume(JNIEnv* env) {
static bool firstTime = true; static bool firstTime = true;
if (Director::getInstance()->getOpenGLView()) { if (Director::getInstance()->getOpenGLView()) {
// don't invoke at first to keep the same logic as iOS // don't invoke at first to keep the same logic as iOS
@ -75,11 +75,9 @@ extern "C" {
cocos2d::IMEDispatcher::sharedDispatcher()->dispatchDeleteBackward(); cocos2d::IMEDispatcher::sharedDispatcher()->dispatchDeleteBackward();
} }
JNIEXPORT jstring JNICALL Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeGetContentText() { JNIEXPORT jstring JNICALL Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeGetContentText(JNIEnv* env) {
JNIEnv * env = 0; if (! env) {
return nullptr;
if (JniHelper::getJavaVM()->GetEnv((void**)&env, JNI_VERSION_1_4) != JNI_OK || ! env) {
return 0;
} }
std::string pszText = cocos2d::IMEDispatcher::sharedDispatcher()->getContentText(); std::string pszText = cocos2d::IMEDispatcher::sharedDispatcher()->getContentText();
return cocos2d::StringUtils::newStringUTFJNI(env, pszText); return cocos2d::StringUtils::newStringUTFJNI(env, pszText);

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

@ -121,9 +121,7 @@ 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);
auto scriptEngine = cocos2d::ScriptEngineManager::getInstance()->getScriptEngine(); cocos2d::ScriptEngineManager::getInstance()->getScriptEngine()->sendEvent(event);
if(scriptEngine)
scriptEngine->sendEvent(event);
#endif #endif
} }
} }

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

@ -185,6 +185,10 @@ 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,7 +69,8 @@ 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, "'tostring' must return a string to 'print'"); return luaL_error(L, LUA_QL("tostring") " must return a string to "
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 */
@ -187,17 +188,11 @@ 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, realname); /* L: package, loaders */ lua_getfield(_state, -1, "loaders"); /* 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 */
@ -210,7 +205,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, realname); /* L: package */ lua_setfield(_state, -2, "loaders"); /* L: package */
lua_pop(_state, 1); lua_pop(_state, 1);
} }

12
extensions/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp
View File

@ -37,16 +37,14 @@
extern "C" { extern "C" {
JNIEXPORT jint JNICALL Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge_callLuaFunctionWithString JNIEXPORT jint JNICALL Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge_callLuaFunctionWithString(JNIEnv *env, jclass cls, jint functionId, jstring value)
(JNIEnv *env, jclass cls, jint functionId, jstring value)
{ {
std::string strValue = cocos2d::StringUtils::getStringUTFCharsJNI(env, value); std::string strValue = cocos2d::StringUtils::getStringUTFCharsJNI(env, value);
int ret = LuaJavaBridge::callLuaFunctionById(functionId, strValue.c_str()); int ret = LuaJavaBridge::callLuaFunctionById(functionId, strValue.c_str());
return ret; return ret;
} }
JNIEXPORT jint JNICALL Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge_callLuaGlobalFunctionWithString JNIEXPORT jint JNICALL Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge_callLuaGlobalFunctionWithString(JNIEnv *env, jclass cls, jstring luaFunctionName, jstring value)
(JNIEnv *env, jclass cls, jstring luaFunctionName, jstring value)
{ {
std::string functionNameStr = cocos2d::StringUtils::getStringUTFCharsJNI(env, luaFunctionName); std::string functionNameStr = cocos2d::StringUtils::getStringUTFCharsJNI(env, luaFunctionName);
std::string valueStr = cocos2d::StringUtils::getStringUTFCharsJNI(env, value); std::string valueStr = cocos2d::StringUtils::getStringUTFCharsJNI(env, value);
@ -55,14 +53,12 @@ JNIEXPORT jint JNICALL Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge_callLuaGlobal
return ret; return ret;
} }
JNIEXPORT jint JNICALL Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge_retainLuaFunction JNIEXPORT jint JNICALL Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge_retainLuaFunction(JNIEnv *env, jclass cls, jint luaFunctionId)
(JNIEnv *env, jclass cls, jint luaFunctionId)
{ {
return LuaJavaBridge::retainLuaFunctionById(luaFunctionId); return LuaJavaBridge::retainLuaFunctionById(luaFunctionId);
} }
JNIEXPORT jint JNICALL Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge_releaseLuaFunction JNIEXPORT jint JNICALL Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge_releaseLuaFunction(JNIEnv *env, jclass cls, jint luaFunctionId)
(JNIEnv *env, jclass cls, jint luaFunctionId)
{ {
return LuaJavaBridge::releaseLuaFunctionById(luaFunctionId); return LuaJavaBridge::releaseLuaFunctionById(luaFunctionId);
} }