コミット: 60987208b2fe2bca877112762b61d43485feb553 - HotshotOgreIOS (hg)

コミットメタ情報

• リビジョン: 60987208b2fe2bca877112762b61d43485feb553 (tree)
• 日時: 2023-11-15 06:07:39
• 作者: sebastian_bugiu
• コミッター: sebastian_bugiu

ログメッセージ

Hacks to get it to build on xrOS.

変更サマリ

• modified: OgreMain/include/Math/Array/OgreMathlib.h
• modified: OgreMain/include/OgrePlatform.h
• modified: Samples/2.0/Common/src/System/iOS/GameViewController.mm
• modified: Samples/2.0/Common/src/System/iOS/iOSUtils.mm

差分

diff -r b96e2deed6e4 -r 60987208b2fe OgreMain/include/Math/Array/OgreMathlib.h
--- a/OgreMain/include/Math/Array/OgreMathlib.h	Mon Jul 10 21:51:33 2023 +0300
+++ b/OgreMain/include/Math/Array/OgreMathlib.h	Tue Nov 14 23:07:39 2023 +0200
@@ -40,7 +40,7 @@
 
 namespace Ogre
 {
-    typedef MathlibSSE2 Mathlib;
+//    typedef MathlibSSE2 Mathlib;
 }
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
     #if OGRE_DOUBLE_PRECISION == 1

diff -r b96e2deed6e4 -r 60987208b2fe OgreMain/include/OgrePlatform.h
--- a/OgreMain/include/OgrePlatform.h	Mon Jul 10 21:51:33 2023 +0300
+++ b/OgreMain/include/OgrePlatform.h	Tue Nov 14 23:07:39 2023 +0200
@@ -143,11 +143,11 @@
 #elif defined( __APPLE_CC__)
     // Device                                                     Simulator
     // Both requiring OS version 6.0 or greater
-#   if __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 60000 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000
+//#   if __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 60000 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000
 #       define OGRE_PLATFORM OGRE_PLATFORM_APPLE_IOS
-#   else
-#       define OGRE_PLATFORM OGRE_PLATFORM_APPLE
-#   endif
+//#   else
+//#       define OGRE_PLATFORM OGRE_PLATFORM_APPLE
+//#   endif
 #elif defined(__ANDROID__)
 #   define OGRE_PLATFORM OGRE_PLATFORM_ANDROID
 #elif defined( __native_client__ ) 

diff -r b96e2deed6e4 -r 60987208b2fe Samples/2.0/Common/src/System/iOS/GameViewController.mm
--- a/Samples/2.0/Common/src/System/iOS/GameViewController.mm	Mon Jul 10 21:51:33 2023 +0300
+++ b/Samples/2.0/Common/src/System/iOS/GameViewController.mm	Tue Nov 14 23:07:39 2023 +0200
@@ -206,7 +206,7 @@
         _timer = nullptr;
     }
     // create a game loop timer using a display link
-    _timer = [[UIScreen mainScreen] displayLinkWithTarget:self
+    _timer = [/*[UIScreen mainScreen]*/CADisplayLink displayLinkWithTarget:self
                                                  selector:@selector(mainLoop)];
     _timer.frameInterval = 1; //VSync to 60 FPS
     [_timer addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];

diff -r b96e2deed6e4 -r 60987208b2fe Samples/2.0/Common/src/System/iOS/iOSUtils.mm
--- a/Samples/2.0/Common/src/System/iOS/iOSUtils.mm	Mon Jul 10 21:51:33 2023 +0300
+++ b/Samples/2.0/Common/src/System/iOS/iOSUtils.mm	Tue Nov 14 23:07:39 2023 +0200
@@ -34,9 +34,15 @@
 {
 	Ogre::Vector2 iOSUtils::getScreenResolutionInPoints(void)
 	{
-		UIScreen *mainScreen = [UIScreen mainScreen];
-		CGRect screenRect = [mainScreen bounds];
-
-		return Ogre::Vector2( screenRect.size.width, screenRect.size.height );
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
+//		UIScreen *mainScreen = [UIScreen mainScreen];
+//		CGRect screenRect = [mainScreen bounds];
+//
+//		return Ogre::Vector2( screenRect.size.width, screenRect.size.height );
+        return Ogre::Vector2( 1280, 720 );
+#else
+        // We probably are on xrOS.
+        return Ogre::Vector2( 1280, 720 );
+#endif
 	}
 }