Commit: 953a6f150f02a7aea23b0c1fdddf61e905ea3a3a - HotshotIOS (hg)

Commit MetaInfo

• Revision: 953a6f150f02a7aea23b0c1fdddf61e905ea3a3a (tree)
• Time: 2023-07-07 01:44:20
• Author: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

Disabled config.allowIpod as it also loaded OpenAL framework which we don't have on xrOS.

Change Summary

• modified: HotshotVR/HotshotVR.xcodeproj/project.pbxproj
• modified: HotshotVR/HotshotVR.xcodeproj/project.xcworkspace/xcuserdata/sebastian.xcuserdatad/UserInterfaceState.xcuserstate
• modified: HotshotVR/HotshotVR/HotshotVRApp.swift
• modified: core/src/headwayent/blackholedarksun/APP_SinglePlayerGame.java
• modified: core/src/headwayent/blackholedarksun/MainApp.java
• modified: ios/build.gradle
• modified: ios/src/com/headwayent/blackholedarksun/HotshotFrameworkDemo.java
• modified: ios/src/com/headwayent/blackholedarksun/IOSLauncher.java

Incremental Difference

diff -r 5de45aa85154 -r 953a6f150f02 HotshotVR/HotshotVR.xcodeproj/project.pbxproj
--- a/HotshotVR/HotshotVR.xcodeproj/project.pbxproj	Tue Jul 04 23:15:57 2023 +0300
+++ b/HotshotVR/HotshotVR.xcodeproj/project.pbxproj	Thu Jul 06 19:44:20 2023 +0300
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		9E5026292A5723DE00AA3406 /* HotshotFramework.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E5026282A5723DE00AA3406 /* HotshotFramework.xcframework */; };
+		9E50262A2A5723E900AA3406 /* HotshotFramework.xcframework in Copy Frameworks (1 item) */ = {isa = PBXBuildFile; fileRef = 9E5026282A5723DE00AA3406 /* HotshotFramework.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		9E8C2B812A483C9600C4A88A /* RealityKitContent in Frameworks */ = {isa = PBXBuildFile; productRef = 9E8C2B802A483C9600C4A88A /* RealityKitContent */; };
 		9E8C2B832A483C9600C4A88A /* HotshotVRApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E8C2B822A483C9600C4A88A /* HotshotVRApp.swift */; };
 		9E8C2B852A483C9600C4A88A /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E8C2B842A483C9600C4A88A /* ContentView.swift */; };
@@ -15,8 +17,6 @@
 		9E8C2B8C2A483C9700C4A88A /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9E8C2B8B2A483C9700C4A88A /* Preview Assets.xcassets */; };
 		9E8C2B952A49559B00C4A88A /* OgreContentConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E8C2B942A49559B00C4A88A /* OgreContentConfiguration.swift */; };
 		9E8C2B9B2A49D30800C4A88A /* HotshotNativeApp.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E8C2B9A2A49D30800C4A88A /* HotshotNativeApp.m */; };
-		9E8C2BE62A54A7EC00C4A88A /* HotshotFramework.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E8C2BE52A54A7EC00C4A88A /* HotshotFramework.xcframework */; };
-		9E8C2BE72A54A7F100C4A88A /* HotshotFramework.xcframework in Copy Frameworks (1 item) */ = {isa = PBXBuildFile; fileRef = 9E8C2BE52A54A7EC00C4A88A /* HotshotFramework.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -26,7 +26,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				9E8C2BE72A54A7F100C4A88A /* HotshotFramework.xcframework in Copy Frameworks (1 item) */,
+				9E50262A2A5723E900AA3406 /* HotshotFramework.xcframework in Copy Frameworks (1 item) */,
 			);
 			name = "Copy Frameworks (1 item)";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -34,6 +34,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		9E5026282A5723DE00AA3406 /* HotshotFramework.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = HotshotFramework.xcframework; sourceTree = "<group>"; };
 		9E8C2B7B2A483C9600C4A88A /* HotshotVR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HotshotVR.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		9E8C2B7F2A483C9600C4A88A /* RealityKitContent */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = RealityKitContent; sourceTree = "<group>"; };
 		9E8C2B822A483C9600C4A88A /* HotshotVRApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HotshotVRApp.swift; sourceTree = "<group>"; };
@@ -45,7 +46,6 @@
 		9E8C2B992A49D30800C4A88A /* HotshotVR-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "HotshotVR-Bridging-Header.h"; sourceTree = "<group>"; };
 		9E8C2B9A2A49D30800C4A88A /* HotshotNativeApp.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HotshotNativeApp.m; sourceTree = "<group>"; };
 		9E8C2B9C2A49D37A00C4A88A /* HotshotNativeApp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HotshotNativeApp.h; sourceTree = "<group>"; };
-		9E8C2BE52A54A7EC00C4A88A /* HotshotFramework.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = HotshotFramework.xcframework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -53,7 +53,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9E8C2BE62A54A7EC00C4A88A /* HotshotFramework.xcframework in Frameworks */,
+				9E5026292A5723DE00AA3406 /* HotshotFramework.xcframework in Frameworks */,
 				9E8C2B812A483C9600C4A88A /* RealityKitContent in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -114,7 +114,7 @@
 		9E8C2B962A4988BB00C4A88A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				9E8C2BE52A54A7EC00C4A88A /* HotshotFramework.xcframework */,
+				9E5026282A5723DE00AA3406 /* HotshotFramework.xcframework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";

diff -r 5de45aa85154 -r 953a6f150f02 HotshotVR/HotshotVR.xcodeproj/project.xcworkspace/xcuserdata/sebastian.xcuserdatad/UserInterfaceState.xcuserstate
Binary file HotshotVR/HotshotVR.xcodeproj/project.xcworkspace/xcuserdata/sebastian.xcuserdatad/UserInterfaceState.xcuserstate has changed

diff -r 5de45aa85154 -r 953a6f150f02 HotshotVR/HotshotVR/HotshotVRApp.swift
--- a/HotshotVR/HotshotVR/HotshotVRApp.swift	Tue Jul 04 23:15:57 2023 +0300
+++ b/HotshotVR/HotshotVR/HotshotVRApp.swift	Thu Jul 06 19:44:20 2023 +0300
@@ -20,6 +20,7 @@
             NSLog("didFinishLaunchingWithOptions called")
             var sdk:HotshotFrameworkDemo!
             sdk = HotshotFrameworkDemo()
+//            HotshotFrameworkDemo.hello()
             sdk.finishedLaunching(application)
             NSLog("RoboVM version %@", sdk.roboVmVersion())
             return true;
@@ -44,11 +45,15 @@
                 
                             let mtlDevice = layerRenderer.device
                             var hotshotNativeApp = HotshotNativeApp()
-                            hotshotNativeApp.load()
+//                            sdk.finishedLaunching(application)
+//                            hotshotNativeApp.load()
 //                            MTLDevice mDevice = MTLCreateSystemDefaultDevice()
                             let renderThread = Thread {
 //                                let engine = myEngineCreate(layerRenderer)
 //                                myEngineRenderLoop(engine)
+//                                while (true) {
+//                                    sdk.finishedLaunching(application)
+//                                }
                             }
                             renderThread.name = "Render Thread"
                             renderThread.start()

diff -r 5de45aa85154 -r 953a6f150f02 core/src/headwayent/blackholedarksun/APP_SinglePlayerGame.java
--- a/core/src/headwayent/blackholedarksun/APP_SinglePlayerGame.java	Tue Jul 04 23:15:57 2023 +0300
+++ b/core/src/headwayent/blackholedarksun/APP_SinglePlayerGame.java	Thu Jul 06 19:44:20 2023 +0300
@@ -794,7 +794,9 @@
                 miscParams.put("FSAA", "");
                 miscParams.put("vsync", "");
 
-                initializeNotchHeight();
+                if (MainApp.SUBPLATFORM != MainApp.Platform.XROS) {
+                    initializeNotchHeight();
+                }
             }
 
             if (getNotchHeight() > 0.0) {

diff -r 5de45aa85154 -r 953a6f150f02 core/src/headwayent/blackholedarksun/MainApp.java
--- a/core/src/headwayent/blackholedarksun/MainApp.java	Tue Jul 04 23:15:57 2023 +0300
+++ b/core/src/headwayent/blackholedarksun/MainApp.java	Thu Jul 06 19:44:20 2023 +0300
@@ -170,6 +170,7 @@
     // Change here when building for specific platform.
     // Cannot have same code on all platforms so the switch is necessary
     public static Platform PLATFORM;// = Platform.DESKTOP;
+    public static Platform SUBPLATFORM;
     public static DesktopPlatform DESKTOP_PLATFORM;
     public static final int FEATURES_ENABLED = Features.createFeatures(Features.MULTIPLAYER);
     public static final boolean DEV = true;

diff -r 5de45aa85154 -r 953a6f150f02 ios/build.gradle
--- a/ios/build.gradle	Tue Jul 04 23:15:57 2023 +0300
+++ b/ios/build.gradle	Thu Jul 06 19:44:20 2023 +0300
@@ -3,7 +3,8 @@
 
 sourceSets.main.java.srcDirs = [ "src/" ]
 
-sourceCompatibility = '1.8'
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 ext {

diff -r 5de45aa85154 -r 953a6f150f02 ios/src/com/headwayent/blackholedarksun/HotshotFrameworkDemo.java
--- a/ios/src/com/headwayent/blackholedarksun/HotshotFrameworkDemo.java	Tue Jul 04 23:15:57 2023 +0300
+++ b/ios/src/com/headwayent/blackholedarksun/HotshotFrameworkDemo.java	Thu Jul 06 19:44:20 2023 +0300
@@ -43,6 +43,7 @@
 //            }
 //        });
         MainApp.PLATFORM = MainApp.Platform.IOS;
+        MainApp.SUBPLATFORM = MainApp.Platform.XROS;
         iosLauncher = new IOSLauncher();
 
     }
@@ -72,6 +73,12 @@
      */
     @Method(selector = "hello")
     public static void sayHello() {
+        String s = null;
+        try {
+            s.toString();
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+        }
         System.out.println("Hello world from RoboVM framework");
     }
 

diff -r 5de45aa85154 -r 953a6f150f02 ios/src/com/headwayent/blackholedarksun/IOSLauncher.java
--- a/ios/src/com/headwayent/blackholedarksun/IOSLauncher.java	Tue Jul 04 23:15:57 2023 +0300
+++ b/ios/src/com/headwayent/blackholedarksun/IOSLauncher.java	Thu Jul 06 19:44:20 2023 +0300
@@ -51,7 +51,10 @@
 //        config.useWakelock = true;
 //        config.hideStatusBar = true;
 //        config.useImmersiveMode = true;
+        // COMMENT NEXT 2 LINES FOR AUDIO ON IOS!!!
         config.useAudio = false;
+        config.allowIpod = false;
+
         config.colorFormat = GLKViewDrawableColorFormat.RGBA8888;
         config.depthFormat = GLKViewDrawableDepthFormat._24;
         config.hdpiMode = HdpiMode.Pixels;