From 8a1a3188933e80d02edecbfdc11711a93fdfecfb Mon Sep 17 00:00:00 2001 From: minggo Date: Tue, 24 Nov 2020 19:03:32 +0800 Subject: [PATCH] fix iOS resolution issue (#3066) --- native/cocos/bindings/auto/jsb_cocos_auto.cpp | 4 +- native/cocos/platform/Device.h | 2 +- .../cocos/platform/android/Device-android.cpp | 2 +- native/cocos/platform/apple/Device-apple.mm | 4 +- native/cocos/platform/ios/Application-ios.mm | 96 ++++++++----------- native/cocos/platform/win32/Device-win32.cpp | 2 +- 6 files changed, 48 insertions(+), 62 deletions(-) diff --git a/native/cocos/bindings/auto/jsb_cocos_auto.cpp b/native/cocos/bindings/auto/jsb_cocos_auto.cpp index 622c279976..79a089f6e6 100644 --- a/native/cocos/bindings/auto/jsb_cocos_auto.cpp +++ b/native/cocos/bindings/auto/jsb_cocos_auto.cpp @@ -856,8 +856,8 @@ static bool js_engine_Device_getDevicePixelRatio(se::State& s) size_t argc = args.size(); CC_UNUSED bool ok = true; if (argc == 0) { - int result = cc::Device::getDevicePixelRatio(); - ok &= int32_to_seval((int)result, &s.rval()); + float result = cc::Device::getDevicePixelRatio(); + ok &= float_to_seval(result, &s.rval()); SE_PRECONDITION2(ok, false, "js_engine_Device_getDevicePixelRatio : Error processing arguments"); return true; } diff --git a/native/cocos/platform/Device.h b/native/cocos/platform/Device.h index 515c2e5efc..b4230fee29 100644 --- a/native/cocos/platform/Device.h +++ b/native/cocos/platform/Device.h @@ -77,7 +77,7 @@ public: /** * Get device pixel ratio. */ - static int getDevicePixelRatio(); + static float getDevicePixelRatio(); /** * To enable or disable accelerometer. diff --git a/native/cocos/platform/android/Device-android.cpp b/native/cocos/platform/android/Device-android.cpp index b875ea10d4..e87aff62ed 100644 --- a/native/cocos/platform/android/Device-android.cpp +++ b/native/cocos/platform/android/Device-android.cpp @@ -134,7 +134,7 @@ cc::Vec4 Device::getSafeAreaEdge() return cc::Vec4(); } -int Device::getDevicePixelRatio() +float Device::getDevicePixelRatio() { return 1; } diff --git a/native/cocos/platform/apple/Device-apple.mm b/native/cocos/platform/apple/Device-apple.mm index 39abf82210..4d68ffc6f0 100644 --- a/native/cocos/platform/apple/Device-apple.mm +++ b/native/cocos/platform/apple/Device-apple.mm @@ -36,12 +36,12 @@ namespace cc { -int Device::getDevicePixelRatio() { +float Device::getDevicePixelRatio() { #if (CC_PLATFORM == CC_PLATFORM_MAC_OSX) return [[[[NSApplication sharedApplication] delegate] getWindow] backingScaleFactor]; ; #else - return [[UIScreen mainScreen] scale]; + return [[UIScreen mainScreen] nativeScale]; #endif //CC_USE_METAL } diff --git a/native/cocos/platform/ios/Application-ios.mm b/native/cocos/platform/ios/Application-ios.mm index c63bd9e4e8..5d47061802 100644 --- a/native/cocos/platform/ios/Application-ios.mm +++ b/native/cocos/platform/ios/Application-ios.mm @@ -31,8 +31,7 @@ #include "audio/include/AudioEngine.h" #ifndef CC_USE_METAL -@interface MyTimer : NSObject -{ +@interface MyTimer : NSObject { cc::Application* _app; CADisplayLink* _displayLink; int _fps; @@ -46,10 +45,8 @@ @implementation MyTimer -- (instancetype)initWithApp:(cc::Application*)app fps:(int)fps -{ - if (self = [super init]) - { +- (instancetype)initWithApp:(cc::Application*)app fps:(int)fps { + if (self = [super init]) { _fps = fps; _app = app; _displayLink = [NSClassFromString(@"CADisplayLink") displayLinkWithTarget:self selector:@selector(renderScene:)]; @@ -58,28 +55,23 @@ return self; } -- (void)start -{ +- (void)start { [_displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode]; } -- (void)pause -{ +- (void)pause { _displayLink.paused = TRUE; } -- (void)resume -{ +- (void)resume { _displayLink.paused = FALSE; } -- (void)changeFPS:(int)fps -{ +- (void)changeFPS:(int)fps { _displayLink.preferredFramesPerSecond = fps; } -- (void)renderScene:(id)sender -{ +- (void)renderScene:(id)sender { _app->tick(); } @@ -88,20 +80,29 @@ namespace cc { -namespace -{ - bool setCanvasCallback(se::Object* global) - { +namespace { + bool setCanvasCallback(se::Object* global) { auto viewLogicalSize = cc::Application::getInstance()->getViewLogicalSize(); - se::ScriptEngine* se = se::ScriptEngine::getInstance(); + + CGRect nativeBounds = [[UIScreen mainScreen] nativeBounds]; + int nativeWidth = static_cast(nativeBounds.size.width); + int nativeHeight = static_cast(nativeBounds.size.height); + auto rotation = cc::Device::getDeviceRotation(); + bool isLandscape = rotation == cc::Device::Rotation::_90 || rotation == cc::Device::Rotation::_270; + if (isLandscape) std::swap(nativeWidth, nativeHeight); + char commandBuf[200] = {0}; // https://stackoverflow.com/questions/5795978/string-format-for-intptr-t-and-uintptr-t/41897226#41897226 // format intptr_t //set window.innerWidth/innerHeight in css pixel units - sprintf(commandBuf, "window.innerWidth = %d; window.innerHeight = %d; window.windowHandler = 0x%" PRIxPTR ";", - (int)(viewLogicalSize.x), - (int)(viewLogicalSize.y), - (uintptr_t)(UIApplication.sharedApplication.delegate.window.rootViewController.view) ); + sprintf(commandBuf, "window.innerWidth = %d; window.innerHeight = %d; window.nativeWidth = %d; window.nativeHeight = %d; window.windowHandler = 0x%" PRIxPTR ";", + static_cast(viewLogicalSize.x), + static_cast(viewLogicalSize.y), + nativeWidth, + nativeHeight, + reinterpret_cast(UIApplication.sharedApplication.delegate.window.rootViewController.view)); + + se::ScriptEngine* se = se::ScriptEngine::getInstance(); se->evalString(commandBuf); return true; } @@ -114,8 +115,7 @@ namespace Application* Application::_instance = nullptr; std::shared_ptr Application::_scheduler = nullptr; -Application::Application(int width, int height) -{ +Application::Application(int width, int height) { Application::_instance = this; _scheduler = std::make_shared(); EventDispatcher::init(); @@ -127,8 +127,7 @@ Application::Application(int width, int height) #endif } -Application::~Application() -{ +Application::~Application() { #if USE_AUDIO AudioEngine::end(); #endif @@ -143,16 +142,14 @@ Application::~Application() #endif } -std::string Application::getCurrentLanguageCode() const -{ +std::string Application::getCurrentLanguageCode() const { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSArray *languages = [defaults objectForKey:@"AppleLanguages"]; NSString *currentLanguage = [languages objectAtIndex:0]; return [currentLanguage UTF8String]; } -bool Application::isDisplayStats() -{ +bool Application::isDisplayStats() { se::AutoHandleScope hs; se::Value ret; char commandBuf[100] = "cc.debug.isDisplayStats();"; @@ -160,20 +157,17 @@ bool Application::isDisplayStats() return ret.toBoolean(); } -void Application::setDisplayStats(bool isShow) -{ +void Application::setDisplayStats(bool isShow) { se::AutoHandleScope hs; char commandBuf[100] = {0}; sprintf(commandBuf, "cc.debug.setDisplayStats(%s);", isShow ? "true" : "false"); se::ScriptEngine::getInstance()->evalString(commandBuf); } -void Application::setCursorEnabled(bool value) -{ +void Application::setCursorEnabled(bool value) { } -Application::LanguageType Application::getCurrentLanguage() const -{ +Application::LanguageType Application::getCurrentLanguage() const { // get the current language and country config NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSArray *languages = [defaults objectForKey:@"AppleLanguages"]; @@ -205,29 +199,25 @@ Application::LanguageType Application::getCurrentLanguage() const return LanguageType::ENGLISH; } -Application::Platform Application::getPlatform() const -{ +Application::Platform Application::getPlatform() const { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) // idiom for iOS <= 3.2, otherwise: [UIDevice userInterfaceIdiom] is faster. return Platform::IPAD; else return Platform::IPHONE; } -bool Application::openURL(const std::string &url) -{ +bool Application::openURL(const std::string &url) { NSString* msg = [NSString stringWithCString:url.c_str() encoding:NSUTF8StringEncoding]; NSURL* nsUrl = [NSURL URLWithString:msg]; return [[UIApplication sharedApplication] openURL:nsUrl]; } -void Application::copyTextToClipboard(const std::string &text) -{ +void Application::copyTextToClipboard(const std::string &text) { UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; pasteboard.string = [NSString stringWithCString:text.c_str() encoding:NSUTF8StringEncoding]; } -bool Application::init() -{ +bool Application::init() { se::ScriptEngine* se = se::ScriptEngine::getInstance(); se->addRegisterCallback(setCanvasCallback); @@ -238,28 +228,24 @@ bool Application::init() return true; } -void Application::onPause() -{ +void Application::onPause() { #ifndef CC_USE_METAL [_timer pause]; #endif } -void Application::onResume() -{ +void Application::onResume() { #ifndef CC_USE_METAL [_timer resume]; #endif } -std::string Application::getSystemVersion() -{ +std::string Application::getSystemVersion() { NSString* systemVersion = [UIDevice currentDevice].systemVersion; return [systemVersion UTF8String]; } -void Application::setPreferredFramesPerSecond(int fps) -{ +void Application::setPreferredFramesPerSecond(int fps) { _fps = fps; #ifndef CC_USE_METAL [_timer changeFPS:_fps]; diff --git a/native/cocos/platform/win32/Device-win32.cpp b/native/cocos/platform/win32/Device-win32.cpp index 69f44e5188..c94b613844 100644 --- a/native/cocos/platform/win32/Device-win32.cpp +++ b/native/cocos/platform/win32/Device-win32.cpp @@ -96,7 +96,7 @@ cc::Vec4 Device::getSafeAreaEdge() return cc::Vec4(); } -int Device::getDevicePixelRatio() +float Device::getDevicePixelRatio() { return 1; }