Skip to content

Use contentScaleFactor instead of scale #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 2, 2021
Merged

Use contentScaleFactor instead of scale #237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
316cad1
Use contentScaleFactor instead of scale
bghgary May 29, 2021
348862b
Merge branch 'master' into scale-fix
bghgary Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Modules/@babylonjs/react-native/ios/BabylonNativeInterop.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ + (void)onBridgeWillInvalidate:(NSNotification*)notification
}

+ (void)updateView:(MTKView*)mtkView {
const int width = static_cast<int>(mtkView.bounds.size.width * UIScreen.mainScreen.scale);
const int height = static_cast<int>(mtkView.bounds.size.height * UIScreen.mainScreen.scale);
const CGFloat scale = mtkView.contentScaleFactor;
const int width = static_cast<int>(mtkView.bounds.size.width * scale);
const int height = static_cast<int>(mtkView.bounds.size.height * scale);
if (width != 0 && height != 0) {
Babylon::UpdateView((__bridge void*)mtkView, width, height);
}
Expand All @@ -81,7 +82,7 @@ + (bool)isXRActive {
+ (void)reportTouchEvent:(MTKView*)mtkView touches:(NSSet<UITouch*>*)touches event:(UIEvent*)event {
for (UITouch* touch in touches) {
if (touch.view == mtkView) {
const CGFloat scale = UIScreen.mainScreen.scale;
const CGFloat scale = mtkView.contentScaleFactor;
const CGPoint pointerPosition = [touch locationInView:mtkView];
const uint32_t x = static_cast<uint32_t>(pointerPosition.x * scale);
const uint32_t y = static_cast<uint32_t>(pointerPosition.y * scale);
Expand Down