Daydream/Cardboard version updated to ARCore 1.5.0.

Daydream/Cardboard version updated to ARCore 1.5.0. Implemented Tivoyagefeaks suggestion together with latest updates. Unfortenetly I could not confirm that it works. But since it doesn't effect the performance and might work when using the controller I added it and Tivoyagefeaks might be able to fix it quickly when I missed something that it prevents it from working. I renamed the class to AlignmentCorrection and added the mirrorAngle variable to the FollowARCoreCamera class. #17
ChristophGeske · Dec 1, 2018 · d7fef21 · d7fef21
1 parent 61472c0
commit d7fef21
Show file tree

Hide file tree

Showing 181 changed files with 3,694 additions and 720 deletions.
diff --git a/BoxyRoomCardboard.apk b/BoxyRoomCardboard.apk
diff --git a/BoxyRoomChardboard/.vs/BoxyRoomChardboard/v15/Server/sqlite3/db.lock b/BoxyRoomChardboard/.vs/BoxyRoomChardboard/v15/Server/sqlite3/db.lock
diff --git a/BoxyRoomChardboard/.vs/BoxyRoomChardboard/v15/Server/sqlite3/storage.ide b/BoxyRoomChardboard/.vs/BoxyRoomChardboard/v15/Server/sqlite3/storage.ide
diff --git a/BoxyRoomChardboard/Assets/BoxyRoom.unity b/BoxyRoomChardboard/Assets/BoxyRoom.unity
@@ -169,6 +169,10 @@ Prefab:
       propertyPath: reticlePointer
       value: 
       objectReference: {fileID: 653818221}
+    - target: {fileID: 195966, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2}
   m_IsPrefabParent: 0
@@ -519,7 +523,7 @@ Prefab:
     - target: {fileID: 114963366853050710, guid: c10877f7cd5764de18d46d7b777d1faa,
         type: 2}
       propertyPath: m_TrackingType
-      value: 2
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 114963366853050710, guid: c10877f7cd5764de18d46d7b777d1faa,
         type: 2}
@@ -535,6 +539,10 @@ Prefab:
       propertyPath: m_UseRelativeTransform
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1637996540812124, guid: c10877f7cd5764de18d46d7b777d1faa, type: 2}
+      propertyPath: m_Name
+      value: ARCoreCamera
+      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 114876698896786350, guid: c10877f7cd5764de18d46d7b777d1faa, type: 2}
     - {fileID: 20155940112608238, guid: c10877f7cd5764de18d46d7b777d1faa, type: 2}
@@ -691,6 +699,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 198490, guid: 5ca80f4596fa44b87912a0592346d260, type: 2}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 5ca80f4596fa44b87912a0592346d260, type: 2}
   m_IsPrefabParent: 0
@@ -703,6 +715,7 @@ GameObject:
   m_Component:
   - component: {fileID: 502323331}
   - component: {fileID: 502323330}
+  - component: {fileID: 502323332}
   m_Layer: 0
   m_Name: PlayerCamera
   m_TagString: Untagged
@@ -721,7 +734,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9b4ad6edab3d71f45bd7e6313ffb6a70, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  ARCoreFirstPersonCamera: {fileID: 2105487495}
+  aRCoreCamera: {fileID: 2105487495}
+  mirrorAngle: 0
 --- !u!4 &502323331
 Transform:
   m_ObjectHideFlags: 0
@@ -736,46 +750,19 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &584441291
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 584441293}
-  - component: {fileID: 584441292}
-  m_Layer: 0
-  m_Name: VisualImprovementSettingScript
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &584441292
+--- !u!114 &502323332
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 584441291}
+  m_GameObject: {fileID: 502323329}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6976c07f540d04247b9370df811a58b8, type: 3}
+  m_Script: {fileID: 11500000, guid: 08f2ea39bcc3df94e961e6616160c6ef, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!4 &584441293
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 584441291}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.044002533, y: 1.493649, z: -0.052972496}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 13
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  gearCamera: {fileID: 502323331}
+  arcoreCamera: {fileID: 2105487495}
 --- !u!1 &653818221 stripped
 GameObject:
   m_PrefabParentObject: {fileID: 171526, guid: 60270cf52a5e94998a5a335989159738, type: 2}
@@ -902,6 +889,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 1000014104313712, guid: d638298e697ca4e9b91853efadd0e6da, type: 2}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: d638298e697ca4e9b91853efadd0e6da, type: 2}
   m_IsPrefabParent: 0
@@ -1041,6 +1032,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 3
       objectReference: {fileID: 0}
+    - target: {fileID: 177758, guid: 970dd4b9371394fb4890965f608d46fd, type: 2}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 970dd4b9371394fb4890965f608d46fd, type: 2}
   m_IsPrefabParent: 0
@@ -1408,6 +1403,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 632161999, guid: 87c35d808850c410ca0e398a8da84e68, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 87c35d808850c410ca0e398a8da84e68, type: 2}
   m_IsPrefabParent: 0
@@ -1599,6 +1598,10 @@ Prefab:
       propertyPath: m_RootOrder
       value: 9
       objectReference: {fileID: 0}
+    - target: {fileID: 761381335, guid: 463285ecd6702471a909ba810832bf0e, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 463285ecd6702471a909ba810832bf0e, type: 2}
   m_IsPrefabParent: 0
@@ -1948,6 +1951,22 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 0
+--- !u!1 &1670715347 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 1772147192650458, guid: c10877f7cd5764de18d46d7b777d1faa,
+    type: 2}
+  m_PrefabInternal: {fileID: 168835911}
+--- !u!114 &1670715348
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1670715347}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6976c07f540d04247b9370df811a58b8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1725746395 stripped
 GameObject:
   m_PrefabParentObject: {fileID: 1251124450334416, guid: c12db6ac95da443448d6aa9e4cfc66c0,

diff --git a/BoxyRoomChardboard/Assets/GoogleARCore.meta b/BoxyRoomChardboard/Assets/GoogleARCore.meta
diff --git a/BoxyRoomChardboard/Assets/GoogleARCore/CLI/augmented_image_cli_linux b/BoxyRoomChardboard/Assets/GoogleARCore/CLI/augmented_image_cli_linux
diff --git a/...oomChardboard/Assets/Plugins/Android.meta → ...ARCore/CLI/augmented_image_cli_linux.meta b/...oomChardboard/Assets/Plugins/Android.meta → ...ARCore/CLI/augmented_image_cli_linux.meta
diff --git a/BoxyRoomChardboard/Assets/GoogleARCore/Configurations/DefaultSessionConfig.asset b/BoxyRoomChardboard/Assets/GoogleARCore/Configurations/DefaultSessionConfig.asset
@@ -16,3 +16,4 @@ MonoBehaviour:
   EnableLightEstimation: 0
   EnableCloudAnchor: 0
   AugmentedImageDatabase: {fileID: 0}
+  CameraFocusMode: 0
diff --git a/...s/GoogleARCore/Editor/AppDependencies.xml → ...ore/Editor/ARCoreiOSDependencies.template b/...s/GoogleARCore/Editor/AppDependencies.xml → ...ore/Editor/ARCoreiOSDependencies.template
@@ -1,6 +1,6 @@
 <dependencies>
     <iosPods>
-        <iosPod minTargetSdk="11.0" name="ARCore" version="~&gt; 1.3.0">
+        <iosPod minTargetSdk="11.0" name="ARCore" version="~&gt; 1.5.0">
             </iosPod>
     </iosPods>
 </dependencies>
diff --git a/...RCore/Examples/Common/Scripts/Editor.meta → ...ditor/ARCoreiOSDependencies.template.meta b/...RCore/Examples/Common/Scripts/Editor.meta → ...ditor/ARCoreiOSDependencies.template.meta
diff --git a/BoxyRoomChardboard/Assets/GoogleARCore/Editor/AppDependencies.xml.meta b/BoxyRoomChardboard/Assets/GoogleARCore/Editor/AppDependencies.xml.meta
diff --git a/...ts/GoogleARCore/Examples/CloudAnchor.meta → ...s/GoogleARCore/Examples/CloudAnchors.meta b/...ts/GoogleARCore/Examples/CloudAnchor.meta → ...s/GoogleARCore/Examples/CloudAnchors.meta
diff --git a/.../Examples/CloudAnchor/Configurations.meta → ...Examples/CloudAnchors/Configurations.meta b/.../Examples/CloudAnchor/Configurations.meta → ...Examples/CloudAnchors/Configurations.meta
diff --git a/...igurations/CloudAnchorSessionConfig.asset → ...igurations/CloudAnchorSessionConfig.asset b/...igurations/CloudAnchorSessionConfig.asset → ...igurations/CloudAnchorSessionConfig.asset
diff --git a/...tions/CloudAnchorSessionConfig.asset.meta → ...tions/CloudAnchorSessionConfig.asset.meta b/...tions/CloudAnchorSessionConfig.asset.meta → ...tions/CloudAnchorSessionConfig.asset.meta
diff --git a/...leARCore/Examples/CloudAnchor/Scenes.meta → ...eARCore/Examples/CloudAnchors/Scenes.meta b/...leARCore/Examples/CloudAnchor/Scenes.meta → ...eARCore/Examples/CloudAnchors/Scenes.meta
diff --git a/...ples/CloudAnchor/Scenes/CloudAnchor.unity → ...es/CloudAnchors/Scenes/CloudAnchors.unity b/...ples/CloudAnchor/Scenes/CloudAnchor.unity → ...es/CloudAnchors/Scenes/CloudAnchors.unity
diff --git a/...CloudAnchor/Scenes/CloudAnchor.unity.meta → ...oudAnchors/Scenes/CloudAnchors.unity.meta b/...CloudAnchor/Scenes/CloudAnchor.unity.meta → ...oudAnchors/Scenes/CloudAnchors.unity.meta
diff --git a/...eARCore/Examples/CloudAnchor/Scripts.meta → ...ARCore/Examples/CloudAnchors/Scripts.meta b/...eARCore/Examples/CloudAnchor/Scripts.meta → ...ARCore/Examples/CloudAnchors/Scripts.meta
diff --git a/...amples/CloudAnchor/Scripts/ARKitHelper.cs → ...mples/CloudAnchors/Scripts/ARKitHelper.cs b/...amples/CloudAnchor/Scripts/ARKitHelper.cs → ...mples/CloudAnchors/Scripts/ARKitHelper.cs
@@ -18,12 +18,12 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace GoogleARCore.Examples.CloudAnchor
+namespace GoogleARCore.Examples.CloudAnchors
 {
     using System.Collections.Generic;
     using UnityEngine;
 
-#if UNITY_IOS
+#if ARCORE_IOS_SUPPORT
     using UnityEngine.XR.iOS;
     using UnityARUserAnchorComponent = UnityEngine.XR.iOS.UnityARUserAnchorComponent;
 #else
@@ -35,10 +35,9 @@ namespace GoogleARCore.Examples.CloudAnchor
     /// </summary>
     public class ARKitHelper
     {
-#if UNITY_IOS
+#if ARCORE_IOS_SUPPORT
         private List<ARHitTestResult> m_HitResultList = new List<ARHitTestResult>();
 #endif
-
         /// <summary>
         /// Performs a Raycast against a plane.
         /// </summary>
@@ -50,7 +49,7 @@ public class ARKitHelper
         public bool RaycastPlane(Camera camera, float x, float y, out Pose hitPose)
         {
             hitPose = new Pose();
-#if UNITY_IOS
+#if ARCORE_IOS_SUPPORT
             var session = UnityARSessionNativeInterface.GetARSessionNativeInterface();
 
             var viewportPoint = camera.ScreenToViewportPoint(new Vector2(x, y));

diff --git a/...s/CloudAnchor/Scripts/ARKitHelper.cs.meta → .../CloudAnchors/Scripts/ARKitHelper.cs.meta b/...s/CloudAnchor/Scripts/ARKitHelper.cs.meta → .../CloudAnchors/Scripts/ARKitHelper.cs.meta
diff --git a/...Scripts/AnchorIdFromRoomRequestMessage.cs → ...Scripts/AnchorIdFromRoomRequestMessage.cs b/...Scripts/AnchorIdFromRoomRequestMessage.cs → ...Scripts/AnchorIdFromRoomRequestMessage.cs
@@ -17,7 +17,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace GoogleARCore.Examples.CloudAnchor
+namespace GoogleARCore.Examples.CloudAnchors
 {
     using System;
     using UnityEngine.Networking;
@@ -52,4 +52,4 @@ public override void Deserialize(NetworkReader reader)
             RoomId = reader.ReadInt32();
         }
     }
-}
+}
diff --git a/...ts/AnchorIdFromRoomRequestMessage.cs.meta → ...ts/AnchorIdFromRoomRequestMessage.cs.meta b/...ts/AnchorIdFromRoomRequestMessage.cs.meta → ...ts/AnchorIdFromRoomRequestMessage.cs.meta
diff --git a/...cripts/AnchorIdFromRoomResponseMessage.cs → ...cripts/AnchorIdFromRoomResponseMessage.cs b/...cripts/AnchorIdFromRoomResponseMessage.cs → ...cripts/AnchorIdFromRoomResponseMessage.cs
@@ -17,7 +17,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace GoogleARCore.Examples.CloudAnchor
+namespace GoogleARCore.Examples.CloudAnchors
 {
     using UnityEngine.Networking;
 
@@ -58,4 +58,4 @@ public override void Deserialize(NetworkReader reader)
             AnchorId = reader.ReadString();
         }
     }
-}
+}
diff --git a/...s/AnchorIdFromRoomResponseMessage.cs.meta → ...s/AnchorIdFromRoomResponseMessage.cs.meta b/...s/AnchorIdFromRoomResponseMessage.cs.meta → ...s/AnchorIdFromRoomResponseMessage.cs.meta
diff --git a/...udAnchor/Scripts/CloudAnchorController.cs → ...dAnchors/Scripts/CloudAnchorController.cs b/...udAnchor/Scripts/CloudAnchorController.cs → ...dAnchors/Scripts/CloudAnchorController.cs
@@ -18,7 +18,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace GoogleARCore.Examples.CloudAnchor
+namespace GoogleARCore.Examples.CloudAnchors
 {
     using System.Collections.Generic;
     using GoogleARCore;
@@ -33,7 +33,7 @@ namespace GoogleARCore.Examples.CloudAnchor
 #endif
 
     /// <summary>
-    /// Controller for the Cloud Anchor Example.
+    /// Controller for the Cloud Anchors Example.
     /// </summary>
     public class CloudAnchorController : MonoBehaviour
     {
@@ -249,10 +249,11 @@ public void OnResolveRoomClick()
             var roomToResolve = UIController.GetRoomInputValue();
             if (roomToResolve == 0)
             {
-                UIController.ShowResolvingModeBegin("Invalid room code.");
+                UIController.ShowResolvingModeBegin("Anchor resolve failed due to invalid room code.");
                 return;
             }
 
+            UIController.SetRoomTextValue(roomToResolve);
             string ipAddress =
                 UIController.GetResolveOnDeviceValue() ? k_LoopbackIpAddress : UIController.GetIpAddressInputValue();
 
@@ -262,7 +263,8 @@ public void OnResolveRoomClick()
             {
                 if (!found)
                 {
-                    UIController.ShowResolvingModeBegin("Invalid room code.");
+                    UIController.ShowResolvingModeBegin("Anchor resolve failed due to invalid room code, " +
+                                                        "ip address or network error.");
                 }
                 else
                 {
@@ -276,6 +278,8 @@ public void OnResolveRoomClick()
         /// </summary>
         private void _HostLastPlacedAnchor()
         {
+#if !UNITY_IOS || ARCORE_IOS_SUPPORT
+
 #if !UNITY_IOS
             var anchor = (Anchor)m_LastPlacedAnchor;
 #else
@@ -294,6 +298,7 @@ private void _HostLastPlacedAnchor()
                 RoomSharingServer.SaveCloudAnchorToRoom(m_CurrentRoom, result.Anchor);
                 UIController.ShowHostingModeBegin("Cloud anchor was created and saved.");
             });
+#endif
         }
 
         /// <summary>

diff --git a/...hor/Scripts/CloudAnchorController.cs.meta → ...ors/Scripts/CloudAnchorController.cs.meta b/...hor/Scripts/CloudAnchorController.cs.meta → ...ors/Scripts/CloudAnchorController.cs.meta