Merge pull request #26 from fabio914/improving-calibration

Improving Calibration UI and other small UI fixes.

Compatibility.md

@@ -1,6 +1,6 @@
 # Compatible Applications/Games
 
-**ATTENTION** This list is a work in progress. Feel free to open a Pull Request updating it.
+**ATTENTION** This list is incomplete and it is a work in progress. The app might work with some other Quest titles, feel free to open a Pull Request adding more titles to the list.
 
 You can find a list of the officially supported games/applications [here](https://creator.oculus.com/mrc/). 
 
@@ -23,5 +23,5 @@ You can find a list of the officially supported games/applications [here](https:
 | [Richie's Plank Experience](https://www.oculus.com/experiences/quest/1642239225880682) | ? | ? | [Tweet](https://twitter.com/FreekTeunen/status/1327673218891649024) | ? |
 | [SUPERHOT](https://www.oculus.com/experiences/quest/1921533091289407/) | 5 | 5 | [YouTube video](https://www.youtube.com/watch?v=ZnOY8juMw4k) | Works perfectly. |
 | [Space Pirate Trainer](https://www.oculus.com/experiences/quest/1663790613725314) | 5 | 5 | [YouTube video](https://www.youtube.com/watch?v=44Nmv7Es5yI) | Works perfectly. |
-| [Tilt Brush](https://www.oculus.com/experiences/quest/2322529091093901) | 0 | 0 | ? | The video output is glitching and the camera doesn't appear to be respecting the calibration. |
+| [Tilt Brush](https://www.oculus.com/experiences/quest/2322529091093901) | 0 | 0 | [Tweet](https://twitter.com/fabio914/status/1332724521497931777) | The video output is glitching and the camera doesn't appear to be respecting the calibration. |
 | [The Thrill of the Fight](https://www.oculus.com/experiences/quest/3008315795852749) | 4 | 5 | [YouTube video](https://www.youtube.com/watch?v=aPSBmej4ppc) | You'll have to use the "Use magenta for transparency" option. |

Instructions.md

@@ -4,7 +4,7 @@
 
  - Oculus Quest 1 or 2 with the [Oculus MRC Calibration app](https://www.oculus.com/experiences/quest/2532132800176262/) version 1.7 installed.
  - iPhone or iPad with an A12 chip or newer, running iOS 14. The LiDAR sensor is optional but recommended for better results.
- - 5 Ghz WiFi network.
+ - 5 Ghz WiFi network (802.11ac).
  - A [compatible Quest VR application/game](Compatibility.md).
 
 ## Calibration, what is this?

README.md

@@ -21,7 +21,7 @@ Follow us on [Twitter](https://twitter.com/reality_mixer) for more updates!
 
  - Oculus Quest 1 or 2 with the [Oculus MRC Calibration app](https://www.oculus.com/experiences/quest/2532132800176262/) version 1.7 installed.
  - iPhone or iPad with an A12 chip or newer, running iOS 14. The LiDAR sensor is optional but recommended for better results.
- - 5 Ghz WiFi network.
+ - 5 Ghz WiFi network (802.11ac).
  - A [compatible Quest VR application/game](Compatibility.md).
 
 Note that this app is still just a prototype and it's still being developed, use at your own risk.

RealityMixer.xcodeproj/project.pbxproj

@@ -932,7 +932,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = ZTJ55TM37B;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -948,7 +948,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/RealityMixer/FFmpeg-iOS/lib",
 				);
-				MARKETING_VERSION = 0.1.4;
+				MARKETING_VERSION = 0.1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bluenose.reality.mixer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "RealityMixer/RealityMixer-Bridging-Header.h";
@@ -965,7 +965,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = ZTJ55TM37B;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -981,7 +981,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/RealityMixer/FFmpeg-iOS/lib",
 				);
-				MARKETING_VERSION = 0.1.4;
+				MARKETING_VERSION = 0.1.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bluenose.reality.mixer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "RealityMixer/RealityMixer-Bridging-Header.h";

RealityMixer/Calibration/Builders/CalibrationSceneNodeBuilder.swift

@@ -36,28 +36,40 @@ struct CalibrationSceneNodeBuilder {
         let leftController: SCNNode! = model(named: "left")
         leftController.geometry?.firstMaterial?.lightingModel = .constant
         leftController.geometry?.firstMaterial?.diffuse.contents = UIColor.red
-        leftController.rotation = SCNVector4(1, 0, 0, 45.0 * .pi/180.0)
+        leftController.position = SCNVector3(-0.004, 0.027, 0.04)
+
+        let rotatedLeftController = SCNNode()
+        rotatedLeftController.addChildNode(leftController)
+        rotatedLeftController.rotation = SCNVector4(1, 0, 0, 45.0 * .pi/180.0)
 
         let leftControllerNode = SCNNode()
-        leftControllerNode.addChildNode(leftController)
+        leftControllerNode.addChildNode(rotatedLeftController)
         mainNode.addChildNode(leftControllerNode)
 
         let rightController: SCNNode! = model(named: "right")
         rightController.geometry?.firstMaterial?.lightingModel = .constant
         rightController.geometry?.firstMaterial?.diffuse.contents = UIColor.blue
-        rightController.rotation = SCNVector4(1, 0, 0, 45.0 * .pi/180.0)
+        rightController.position = SCNVector3(0.004, 0.027, 0.04)
+
+        let rotatedRightController = SCNNode()
+        rotatedRightController.addChildNode(rightController)
+        rotatedRightController.rotation = SCNVector4(1, 0, 0, 45.0 * .pi/180.0)
 
         let rightControllerNode = SCNNode()
-        rightControllerNode.addChildNode(rightController)
+        rightControllerNode.addChildNode(rotatedRightController)
         mainNode.addChildNode(rightControllerNode)
 
         // Using Quest 2 dimensions
         let headset = SCNBox(width: 0.1915, height: 0.102, length: 0.1425, chamferRadius: 0)
         headset.firstMaterial?.lightingModel = .constant
         headset.firstMaterial?.diffuse.contents = UIColor.gray
 
+        let headsetIntermediateNode = SCNNode()
+        headsetIntermediateNode.geometry = headset
+        headsetIntermediateNode.position = SCNVector3(0, 0.025, 0)
+
         let headsetNode = SCNNode()
-        headsetNode.geometry = headset
+        headsetNode.addChildNode(headsetIntermediateNode)
         mainNode.addChildNode(headsetNode)
 
         return .init(