diff --git a/native/cocos/platform/android/CCApplication-android.cpp b/native/cocos/platform/android/CCApplication-android.cpp index d3cc183d9a..9791cd81d8 100644 --- a/native/cocos/platform/android/CCApplication-android.cpp +++ b/native/cocos/platform/android/CCApplication-android.cpp @@ -57,7 +57,7 @@ namespace sprintf(commandBuf, "window.innerWidth = %d; window.innerHeight = %d; window.windowHandler = 0x%" PRIxPTR ";", g_width, g_height, - (intptr_t)cocos2d::JniHelper::getAndroidApp()->window); + (uintptr_t)cocos2d::JniHelper::getAndroidApp()->window); se->evalString(commandBuf); return true; diff --git a/native/cocos/platform/ios/CCApplication-ios.mm b/native/cocos/platform/ios/CCApplication-ios.mm index eec90f115a..b7ae5337a7 100644 --- a/native/cocos/platform/ios/CCApplication-ios.mm +++ b/native/cocos/platform/ios/CCApplication-ios.mm @@ -44,7 +44,7 @@ namespace sprintf(commandBuf, "window.innerWidth = %d; window.innerHeight = %d; window.windowHandler = 0x%" PRIxPTR ";", g_width, g_height, - (intptr_t)(UIApplication.sharedApplication.delegate.window.rootViewController.view) ); + (uintptr_t)(UIApplication.sharedApplication.delegate.window.rootViewController.view) ); se->evalString(commandBuf); return true; } diff --git a/native/cocos/platform/mac/CCApplication-mac.mm b/native/cocos/platform/mac/CCApplication-mac.mm index c152d6f4ae..e1863a9c28 100644 --- a/native/cocos/platform/mac/CCApplication-mac.mm +++ b/native/cocos/platform/mac/CCApplication-mac.mm @@ -46,7 +46,7 @@ namespace sprintf(commandBuf, "window.innerWidth = %d; window.innerHeight = %d; window.windowHandler = 0x%" PRIxPTR ";", g_width, g_height, - (intptr_t)[NSApplication sharedApplication].mainWindow.contentView); + (uintptr_t)[NSApplication sharedApplication].mainWindow.contentView); se->evalString(commandBuf); cocos2d::CustomEvent applicationReady; diff --git a/native/cocos/renderer/core/gfx/GFXContext.h b/native/cocos/renderer/core/gfx/GFXContext.h index 05a38bd73b..333b80ca74 100755 --- a/native/cocos/renderer/core/gfx/GFXContext.h +++ b/native/cocos/renderer/core/gfx/GFXContext.h @@ -23,7 +23,7 @@ class CC_CORE_API GFXContext : public Object { protected: GFXDevice* _device = nullptr; - intptr_t _windowHandle = 0; + uintptr_t _windowHandle = 0; GFXContext* _sharedContext = nullptr; GFXVsyncMode _vsyncMode = GFXVsyncMode::OFF; GFXFormat _colorFmt = GFXFormat::UNKNOWN; diff --git a/native/cocos/renderer/core/gfx/GFXDef.h b/native/cocos/renderer/core/gfx/GFXDef.h index a5c8f46e15..c372e65e5a 100755 --- a/native/cocos/renderer/core/gfx/GFXDef.h +++ b/native/cocos/renderer/core/gfx/GFXDef.h @@ -650,7 +650,7 @@ struct GFXWindowInfo { }; struct GFXContextInfo { - intptr_t windowHandle = 0; + uintptr_t windowHandle = 0; GFXContext* sharedCtx = nullptr; GFXVsyncMode vsyncMode = GFXVsyncMode::OFF; }; diff --git a/native/cocos/scripting/js-bindings/jswrapper/Value.cpp b/native/cocos/scripting/js-bindings/jswrapper/Value.cpp index 9658fcef61..721b414500 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/Value.cpp +++ b/native/cocos/scripting/js-bindings/jswrapper/Value.cpp @@ -467,9 +467,9 @@ namespace se { return static_cast(toNumber()); } - intptr_t Value::toIntptr_t() const + intptr_t Value::toUIntptr_t() const { - return static_cast(toNumber()); + return static_cast(toNumber()); } float Value::toFloat() const diff --git a/native/cocos/scripting/js-bindings/jswrapper/Value.hpp b/native/cocos/scripting/js-bindings/jswrapper/Value.hpp index 129cc3c5b3..cb85487010 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/Value.hpp +++ b/native/cocos/scripting/js-bindings/jswrapper/Value.hpp @@ -316,7 +316,7 @@ namespace se { * @brief Converts se::Value to unsigned long. * @return intptr_t. */ - intptr_t toIntptr_t() const; + intptr_t toUIntptr_t() const; /** * @brief Converts se::Value to float number. * @return float number. diff --git a/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp b/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp index a6bcc12d5a..91675fd0c4 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp @@ -412,12 +412,12 @@ bool seval_to_Uint8Array(const se::Value& v, uint8_t* ret) return true; } -bool seval_to_intptr_t(const se::Value& v, intptr_t* ret) +bool seval_to_uintptr_t(const se::Value& v, uintptr_t* ret) { assert(ret != nullptr); if (v.isNumber()) { - *ret = v.toIntptr_t(); + *ret = v.toUIntptr_t(); return true; } *ret = 0UL; diff --git a/native/cocos/scripting/js-bindings/manual/jsb_conversions.hpp b/native/cocos/scripting/js-bindings/manual/jsb_conversions.hpp index 91a9621b8b..a76e8618b6 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_conversions.hpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_conversions.hpp @@ -111,7 +111,7 @@ bool seval_to_std_vector_uint16(const se::Value& v, std::vector* ret); bool seval_to_std_vector_float(const se::Value& v, std::vector* ret); bool seval_to_std_vector_Vec2(const se::Value& v, std::vector* ret); bool seval_to_Uint8Array(const se::Value& v, uint8_t* ret); -bool seval_to_intptr_t(const se::Value& v, intptr_t* ret); +bool seval_to_uintptr_t(const se::Value& v, uintptr_t* ret); bool seval_to_std_map_string_string(const se::Value& v, std::map* ret); bool seval_to_Data(const se::Value& v, cocos2d::Data* ret); diff --git a/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp b/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp index 41fb808984..9597489040 100755 --- a/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp +++ b/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp @@ -37,6 +37,8 @@ namespace { Game *game = nullptr; + struct cocos2d::TouchEvent touchEvent; + struct cocos2d::KeyboardEvent keyboardEvent; /** * Shared state for our app. @@ -48,8 +50,6 @@ namespace int32_t width = 0; int32_t height = 0; bool initialized = false; - cocos2d::TouchEvent touchEvent; - cocos2d::KeyboardEvent keyboardEvent; }; void engineHandleCmd(struct android_app* app, int32_t cmd) diff --git a/native/tools/bindings-generator b/native/tools/bindings-generator index 1513c8a2ed..6c6bfae1c7 160000 --- a/native/tools/bindings-generator +++ b/native/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 1513c8a2ed0d515f16d1015ddcdb497720366abe +Subproject commit 6c6bfae1c7cef23e6bed69bb36739d71d8747740