Fix screen scaling of iOS

Benau · Benau · commit 78ff49ced5c0 · 2019-07-14T16:42:45.000+08:00
diff --git a/lib/irrlicht/source/Irrlicht/CEAGLManager.mm b/lib/irrlicht/source/Irrlicht/CEAGLManager.mm
@@ -67,6 +67,7 @@
     }
 
     dataStorage->Layer = (CAEAGLLayer*)[view layer];
+    dataStorage->Layer.contentsScale = view.contentScaleFactor;
 
     return true;
 }
diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceiOS.mm b/lib/irrlicht/source/Irrlicht/CIrrDeviceiOS.mm
@@ -173,23 +173,22 @@ - (bool)hasFocus
 @interface CIrrViewiOS : UIView
 
 - (id)initWithFrame:(CGRect)frame forDevice:(irr::CIrrDeviceiOS*)device;
+@property (nonatomic) float Scale;
 
 @end
 
 @implementation CIrrViewiOS
 {
     irr::CIrrDeviceiOS* Device;
-    float Scale;
 }
 
 - (id)initWithFrame:(CGRect)frame forDevice:(irr::CIrrDeviceiOS*)device;
 {
     self = [super initWithFrame:frame];
-
+    self.Scale = 1.0f;
     if (self)
     {
         Device = device;
-        Scale = ([self respondsToSelector:@selector(setContentScaleFactor:)]) ? [[UIScreen mainScreen] scale] : 1.f;
     }
 
     return self;
@@ -216,8 +215,8 @@ - (void)touchesBegan:(NSSet*)touches withEvent:(UIEvent*)event
 
         CGPoint touchPoint = [touch locationInView:self];
 
-        ev.TouchInput.X = touchPoint.x*Scale;
-        ev.TouchInput.Y = touchPoint.y*Scale;
+        ev.TouchInput.X = touchPoint.x * self.Scale;
+        ev.TouchInput.Y = touchPoint.y * self.Scale;
 
         Device->postEventFromUser(ev);
         if (ev.TouchInput.ID == 0)
@@ -247,8 +246,8 @@ - (void)touchesMoved:(NSSet*)touches withEvent:(UIEvent*)event
 
         CGPoint touchPoint = [touch locationInView:self];
 
-        ev.TouchInput.X = touchPoint.x*Scale;
-        ev.TouchInput.Y = touchPoint.y*Scale;
+        ev.TouchInput.X = touchPoint.x * self.Scale;
+        ev.TouchInput.Y = touchPoint.y * self.Scale;
 
         Device->postEventFromUser(ev);
         if (ev.TouchInput.ID == 0)
@@ -278,8 +277,8 @@ - (void)touchesEnded:(NSSet*)touches withEvent:(UIEvent*)event
 
         CGPoint touchPoint = [touch locationInView:self];
 
-        ev.TouchInput.X = touchPoint.x*Scale;
-        ev.TouchInput.Y = touchPoint.y*Scale;
+        ev.TouchInput.X = touchPoint.x * self.Scale;
+        ev.TouchInput.Y = touchPoint.y * self.Scale;
 
         Device->postEventFromUser(ev);
         if (ev.TouchInput.ID == 0)
@@ -309,8 +308,8 @@ - (void)touchesCancelled:(NSSet*)touches withEvent:(UIEvent*)event
 
         CGPoint touchPoint = [touch locationInView:self];
 
-        ev.TouchInput.X = touchPoint.x*Scale;
-        ev.TouchInput.Y = touchPoint.y*Scale;
+        ev.TouchInput.X = touchPoint.x * self.Scale;
+        ev.TouchInput.Y = touchPoint.y * self.Scale;
 
         Device->postEventFromUser(ev);
         if (ev.TouchInput.ID == 0)
@@ -797,8 +796,13 @@ + (Class)layerClass
 #ifdef _IRR_COMPILE_WITH_OGLES2_
                 {
                     CIrrViewEAGLiOS* view = [[CIrrViewEAGLiOS alloc] initWithFrame:resolution forDevice:this];
-                    CreationParams.WindowSize = core::dimension2d<u32>(view.frame.size.width, view.frame.size.height);
-
+                    view.contentScaleFactor = dataStorage->Window.screen.nativeScale;
+                    view.Scale = view.contentScaleFactor;
+                    CreationParams.WindowSize =
+                        {
+                            view.frame.size.width * view.contentScaleFactor,
+                            view.frame.size.height * view.contentScaleFactor
+                        };
                     dataStorage->View = view;
                     data.OpenGLiOS.View = (__bridge void*)view;
 

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`dataStorage->Layer = (CAEAGLLayer*)[view layer];`
	`70`	`+ dataStorage->Layer.contentsScale = view.contentScaleFactor;`
`70`	`71`
`71`	`72`	`return true;`
`72`	`73`	`}`