ARCore Extensions for AR Foundation v1.15.0

google-ar · Feb 6, 2020 · a3fd7da · a3fd7da
1 parent c00a364
commit a3fd7da
Show file tree

Hide file tree

Showing 91 changed files with 12,202 additions and 51 deletions.
diff --git a/Editor/BuildResources/ARCoreiOSDependencies.template b/Editor/BuildResources/ARCoreiOSDependencies.template
@@ -1,6 +1,6 @@
 <dependencies>
     <iosPods>
-        <iosPod name="ARCore/CloudAnchors" version="~> 1.12.0" minTargetSdk="11.0">
-        </iosPod>
+        <iosPod minTargetSdk="11.0" name="ARCore/CloudAnchors" version="~&gt; 1.15.0">
+            </iosPod>
     </iosPods>
-</dependencies>
+</dependencies>
diff --git a/Editor/Scripts/Internal/ARCoreAnalytics.cs b/Editor/Scripts/Internal/ARCoreAnalytics.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARCoreAnalytics.cs" company="Google">
 //
-// Copyright 2019 Google Inc. All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Editor/Scripts/Internal/ARCoreAnalyticsGUI.cs b/Editor/Scripts/Internal/ARCoreAnalyticsGUI.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARCoreAnalyticsGUI.cs" company="Google">
 //
-// Copyright 2019 Google Inc. All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Editor/Scripts/Internal/ARCoreAnalyticsProvider.cs b/Editor/Scripts/Internal/ARCoreAnalyticsProvider.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARCoreAnalyticsProvider.cs" company="Google">
 //
-// Copyright 2019 Google Inc. All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Editor/Scripts/Internal/ARCoreExtensionsProjectSettings.cs b/Editor/Scripts/Internal/ARCoreExtensionsProjectSettings.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARCoreExtensionsProjectSettings.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Editor/Scripts/Internal/ARCoreExtensionsProjectSettingsGUI.cs b/Editor/Scripts/Internal/ARCoreExtensionsProjectSettingsGUI.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARCoreExtensionsProjectSettingsGUI.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Editor/Scripts/Internal/ARCoreExtensionsProjectSettingsProvider.cs b/Editor/Scripts/Internal/ARCoreExtensionsProjectSettingsProvider.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARCoreExtensionsProjectSettingsProvider.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Editor/Scripts/Internal/AssetHelper.cs b/Editor/Scripts/Internal/AssetHelper.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="AssetHelper.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Editor/Scripts/Internal/CloudAnchorPreprocessBuild.cs b/Editor/Scripts/Internal/CloudAnchorPreprocessBuild.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="CloudAnchorPreprocessBuild.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Editor/Scripts/Internal/IOSSupportHelper.cs b/Editor/Scripts/Internal/IOSSupportHelper.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="IOSSupportHelper.cs" company="Google">
 //
-// Copyright 2019 Google Inc. All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Editor/Scripts/Internal/IOSSupportPreprocessBuild.cs b/Editor/Scripts/Internal/IOSSupportPreprocessBuild.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="IOSSupportPreprocessBuild.cs" company="Google">
 //
-// Copyright 2019 Google Inc. All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Editor/Scripts/Internal/LogRequestUtils.cs b/Editor/Scripts/Internal/LogRequestUtils.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="LogRequestUtils.cs" company="Google">
 //
-// Copyright 2019 Google Inc. All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Editor/Scripts/Internal/SceneUtils.cs b/Editor/Scripts/Internal/SceneUtils.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="SceneUtils.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Editor/Scripts/Internal/ShellHelper.cs b/Editor/Scripts/Internal/ShellHelper.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ShellHelper.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Plugins/arcore_client.aar b/Runtime/Plugins/arcore_client.aar
diff --git a/Runtime/Scripts/ARCloudReferencePoint.cs b/Runtime/Scripts/ARCloudReferencePoint.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARCloudReferencePoint.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/ARCoreExtensions.cs b/Runtime/Scripts/ARCoreExtensions.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARCoreExtensions.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -127,7 +127,7 @@ public void OnDisable()
         public void OnDestroy()
         {
 #if UNITY_IOS && ARCORE_EXTENSIONS_IOS_SUPPORT
-            IOSSupportManager.Instance.ResetARCoreSession();
+            IOSSupportManager.Instance.ResetInstanceAndSession();
 #endif
 
             if (Instance)

diff --git a/Runtime/Scripts/ARCoreExtensionsConfig.cs b/Runtime/Scripts/ARCoreExtensionsConfig.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARCoreExtensionsConfig.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/ARReferencePointManagerExtensions.cs b/Runtime/Scripts/ARReferencePointManagerExtensions.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARReferencePointManagerExtensions.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/CloudReferenceState.cs b/Runtime/Scripts/CloudReferenceState.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="CloudReferenceState.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/ARCoreHandles/ARPlaneExtensions.cs b/Runtime/Scripts/Internal/ARCoreHandles/ARPlaneExtensions.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARPlaneExtensions.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/ARCoreHandles/ARReferencePointExtensions.cs b/Runtime/Scripts/Internal/ARCoreHandles/ARReferencePointExtensions.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARReferencePointExtensions.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/ARCoreHandles/ARSessionExtensions.cs b/Runtime/Scripts/Internal/ARCoreHandles/ARSessionExtensions.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ARSessionExtensions.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/ARCoreHandles/XRCameraFrameExtensions.cs b/Runtime/Scripts/Internal/ARCoreHandles/XRCameraFrameExtensions.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="XRCameraFrameExtensions.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/ApiConstants.cs b/Runtime/Scripts/Internal/ApiConstants.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ApiConstants.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/Helpers/DllImportNoop.cs b/Runtime/Scripts/Internal/Helpers/DllImportNoop.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="DllImportNoop.cs" company="Google">
 //
-// Copyright 2019 Google Inc. All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/Helpers/Translators.cs b/Runtime/Scripts/Internal/Helpers/Translators.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="Translators.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/IOSSupportManager.cs b/Runtime/Scripts/Internal/IOSSupportManager.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="IOSSupportManager.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ namespace Google.XR.ARCoreExtensions.Internal
     internal class IOSSupportManager
     {
         private const string k_IOSCloudServicesApiKeyPath =
-                "RuntimeSettings/iOSCloudServiceApiKey";
+            "RuntimeSettings/iOSCloudServiceApiKey";
 
         private static IOSSupportManager s_Instance;
 
@@ -125,6 +125,15 @@ public void ResetARCoreSession()
             }
         }
 
+        public void ResetInstanceAndSession()
+        {
+            ResetARCoreSession();
+            if (s_Instance != null)
+            {
+                s_Instance = null;
+            }
+        }
+
         private void _CreateARCoreSession()
         {
             ResetARCoreSession();
@@ -138,7 +147,7 @@ private void _CreateARCoreSession()
             if (status != ApiArStatus.Success)
             {
                 Debug.LogErrorFormat("Failed to create a cross platform ARCore session with " +
-                        "error: {0}.", status);
+                    "error: {0}.", status);
                 return;
             }
         }
@@ -165,15 +174,15 @@ private void _OnFrameUpdate(ARCameraFrameEventArgs frameEventArgs)
             {
                 var cameraParams = new XRCameraParams
                 {
-                    zNear = m_CameraManager.GetComponent<Camera>().nearClipPlane,
-                    zFar = m_CameraManager.GetComponent<Camera>().farClipPlane,
-                    screenWidth = Screen.width,
-                    screenHeight = Screen.height,
-                    screenOrientation = Screen.orientation
+                zNear = m_CameraManager.GetComponent<Camera>().nearClipPlane,
+                zFar = m_CameraManager.GetComponent<Camera>().farClipPlane,
+                screenWidth = Screen.width,
+                screenHeight = Screen.height,
+                screenOrientation = Screen.orientation
                 };
 
                 if (!m_CameraManager.subsystem.TryGetLatestFrame(
-                    cameraParams, out XRCameraFrame frame))
+                        cameraParams, out XRCameraFrame frame))
                 {
                     Debug.LogWarning("XRCamera's latest frame is not available now.");
                     return;

diff --git a/Runtime/Scripts/Internal/RuntimeConfig.cs b/Runtime/Scripts/Internal/RuntimeConfig.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="RuntimeConfig.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/Types/ApiArStatus.cs b/Runtime/Scripts/Internal/Types/ApiArStatus.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ApiArStatus.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/Types/ApiCloudAnchorMode.cs b/Runtime/Scripts/Internal/Types/ApiCloudAnchorMode.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ApiCloudAnchorMode.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/Types/ApiCloudAnchorState.cs b/Runtime/Scripts/Internal/Types/ApiCloudAnchorState.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ApiCloudAnchorState.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/Types/ApiPose.cs b/Runtime/Scripts/Internal/Types/ApiPose.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ApiPose.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/Types/ApiTrackingState.cs b/Runtime/Scripts/Internal/Types/ApiTrackingState.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="ApiTrackingState.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/Wrappers/AnchorApi.cs b/Runtime/Scripts/Internal/Wrappers/AnchorApi.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="AnchorApi.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/Wrappers/PoseApi.cs b/Runtime/Scripts/Internal/Wrappers/PoseApi.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="PoseApi.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/Runtime/Scripts/Internal/Wrappers/SessionApi.cs b/Runtime/Scripts/Internal/Wrappers/SessionApi.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="SessionApi.cs" company="Google">
 //
-// Copyright 2019 Google LLC All Rights Reserved.
+// Copyright 2019 Google LLC. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.