ARCore Extensions SDK v1.39.0

Editor/BuildResources/ARCoreiOSCloudAnchorDependencies.template

@@ -1,6 +1,6 @@
 <dependencies>
     <iosPods>
-        <iosPod name="ARCore/CloudAnchors" version="~> 1.38.0" minTargetSdk="11.0">
+        <iosPod name="ARCore/CloudAnchors" version="~> 1.39.0" minTargetSdk="11.0">
         </iosPod>
     </iosPods>
 </dependencies>

Editor/BuildResources/ARCoreiOSDependencies.template

@@ -1,6 +1,6 @@
 <dependencies>
     <iosPods>
-        <iosPod name="ARCore/GARSession" version="~> 1.38.0" minTargetSdk="11.0">
+        <iosPod name="ARCore/GARSession" version="~> 1.39.0" minTargetSdk="11.0">
         </iosPod>
     </iosPods>
 </dependencies>

Editor/BuildResources/ARCoreiOSGeospatialDependencies.template

@@ -1,6 +1,6 @@
 <dependencies>
     <iosPods>
-        <iosPod name="ARCore/Geospatial" version="~> 1.38.0" minTargetSdk="11.0">
+        <iosPod name="ARCore/Geospatial" version="~> 1.39.0" minTargetSdk="11.0">
         </iosPod>
     </iosPods>
 </dependencies>

Editor/GeospatialCreator/Scripts/Internal/ARGeospatialCreatorAnchorEditor.cs

@@ -17,7 +17,6 @@
 //
 // </copyright>
 //-----------------------------------------------------------------------
-
 namespace Google.XR.ARCoreExtensions.GeospatialCreator.Editor.Internal
 {
     using System;
@@ -52,10 +51,14 @@ public override void OnInspectorGUI()
 
             GUIContent altitudeTypeLabel = new GUIContent("Altitude Type");
             EditorGUILayout.PropertyField(_altitudeType, altitudeTypeLabel);
+            ARGeospatialCreatorAnchor.AltitudeType altitudeType;
+
+            altitudeType = anchor.AltType;
+
             using (new EditorGUI.IndentLevelScope())
             {
-                if (anchor.AltType == ARGeospatialCreatorAnchor.AltitudeType.Terrain ||
-                    anchor.AltType == ARGeospatialCreatorAnchor.AltitudeType.Rooftop)
+                if (altitudeType == ARGeospatialCreatorAnchor.AltitudeType.Terrain ||
+                    altitudeType == ARGeospatialCreatorAnchor.AltitudeType.Rooftop)
                 {
                     _altitudeOffset.doubleValue = EditorGUILayout.DoubleField(
                         "Altitude Offset",
@@ -64,15 +67,15 @@ public override void OnInspectorGUI()
 
                 _altitude.doubleValue =
                     EditorGUILayout.DoubleField("WGS84 Altitude", _altitude.doubleValue);
-                if (anchor.AltType == ARGeospatialCreatorAnchor.AltitudeType.Terrain)
+                if (altitudeType == ARGeospatialCreatorAnchor.AltitudeType.Terrain)
                 {
                     EditorGUILayout.HelpBox("WGS84 Altitude is only used in the editor to " +
                         "display altitude of the anchored object. At runtime Altitude Offset is " +
                         "used to position the anchor relative to the terrain.",
                         MessageType.Info,
                         wide: true);
                 }
-                else if (anchor.AltType == ARGeospatialCreatorAnchor.AltitudeType.Rooftop)
+                else if (altitudeType == ARGeospatialCreatorAnchor.AltitudeType.Rooftop)
                 {
                     EditorGUILayout.HelpBox("WGS84 Altitude is only used in the editor to " +
                         "display altitude of the anchored object. At runtime Altitude Offset is " +
@@ -82,6 +85,7 @@ public override void OnInspectorGUI()
                 }
             }
 
+
             if (EditorGUI.EndChangeCheck())
             {
                 serializedObject.ApplyModifiedProperties();
@@ -99,4 +103,3 @@ private void OnEnable()
         }
     }
 }
-

Editor/GeospatialCreator/Scripts/Internal/ARGeospatialCreatorOriginEditor.cs

@@ -29,6 +29,12 @@ namespace Google.XR.ARCoreExtensions.GeospatialCreator.Editor.Internal
     using UnityEditor;
     using UnityEngine;
 
+    /// <summary>
+    /// ARGeospatialCreatorOriginEditor
+    ///
+    /// The GUI for ARGeospatialCreatorOrigin,
+    /// It looks like this go/prototype-geospatial-creator-gui-design.
+    /// </summary>
     [CustomEditor(typeof(ARGeospatialCreatorOrigin))]
     internal class ARGeospatialCreatorOriginEditor : Editor
     {
@@ -49,6 +55,11 @@ public static string ApiKeyFromTilesetUrl(string url)
             return string.Empty;
         }
 
+        /// <summary>
+        ///  OnInspectorGUI()
+        ///
+        ///  function that is called every GUI update when the target object get updated.
+        /// </summary>
         public override void OnInspectorGUI()
         {
             serializedObject.Update();
@@ -69,9 +80,54 @@ public override void OnInspectorGUI()
                 GUIForMissingReference(origin);
             }
 
+
             serializedObject.ApplyModifiedProperties();
         }
 
+        /// <summary>Finds the 3d tiles Application Key from the origin.</summary>
+        /// <param name = "origin">A ARGeospatialCreatorOrigin that has a Cesium3DTileset child.
+        /// </param>
+        /// <returns>The key extracted.</returns>
+        internal static string Get3DTilesApiKey(ARGeospatialCreatorOrigin origin)
+        {
+#if !ARCORE_INTERNAL_USE_CESIUM
+            throw new Exception("Cannot get Map Tiles API key; Cesium dependency is missing.");
+#else  // need to use #else block to avoid unreachable code failures
+            Cesium3DTileset tileset =
+                origin.gameObject.GetComponentInChildren(typeof(Cesium3DTileset))
+                as Cesium3DTileset;
+            if (tileset == null)
+            {
+                return "";
+            }
+            return ApiKeyFromTilesetUrl(tileset.url);
+#endif
+        }
+
+        private static void Set3DTileApiKey(ARGeospatialCreatorOrigin origin, string key)
+        {
+#if !ARCORE_INTERNAL_USE_CESIUM
+            throw new Exception("Cannot set Map Tiles API key; Cesium dependency is missing.");
+#else  // need to use #else block to avoid unreachable code failures
+            Cesium3DTileset tileset =
+                origin.gameObject.GetComponentInChildren(typeof(Cesium3DTileset))
+                as Cesium3DTileset;
+            if (tileset == null)
+            {
+                Debug.LogError(
+                    "Attempted to set Map Tiles API key on a missing Cesium3DTileset component.");
+                return;
+            }
+            String url = String.IsNullOrEmpty(key) ? "" : TilesApiUrl(key);
+            if (url != tileset.url)
+            {
+                Undo.RecordObject(tileset, "Update Map Tiles API key ");
+                tileset.url = url;
+                EditorUtility.SetDirty(tileset);
+            }
+#endif
+        }
+
         // Helper that returns the URL for the tiles API for the given key
         private static string TilesApiUrl(string apiKey)
         {
@@ -170,48 +226,7 @@ private void AddGeoreference(ARGeospatialCreatorOrigin origin)
             georeference.tag = "EditorOnly";
             tilesetObject.tag = "EditorOnly";
             Undo.RegisterCreatedObjectUndo(georeference, "Create Cesium Georeference");
-#endif
-        }
-
-        private string Get3DTilesApiKey(ARGeospatialCreatorOrigin origin)
-        {
-#if !ARCORE_INTERNAL_USE_CESIUM
-            throw new Exception("Cannot get Map Tiles API key; Cesium dependency is missing.");
-#else // need to use #else block to avoid unreachable code failures
-            Cesium3DTileset tileset =
-                origin.gameObject.GetComponentInChildren(typeof(Cesium3DTileset))
-                as Cesium3DTileset;
-            if (tileset == null)
-            {
-                return "";
-            }
-            return ApiKeyFromTilesetUrl(tileset.url);
-#endif
-        }
-
-        private void Set3DTileApiKey(ARGeospatialCreatorOrigin origin, string key)
-        {
-#if !ARCORE_INTERNAL_USE_CESIUM
-            throw new Exception("Cannot set Map Tiles API key; Cesium dependency is missing.");
-#else // need to use #else block to avoid unreachable code failures
-            Cesium3DTileset tileset =
-                origin.gameObject.GetComponentInChildren(typeof(Cesium3DTileset))
-                as Cesium3DTileset;
-            if (tileset == null)
-            {
-                Debug.LogError(
-                    "Attempted to set Map Tiles API key on a missing Cesium3DTileset component.");
-                return;
-            }
-            String url = String.IsNullOrEmpty(key) ? "" : TilesApiUrl(key);
-            if (url != tileset.url)
-            {
-                Undo.RecordObject(tileset, "Update Map Tiles API key");
-                tileset.url = url;
-                EditorUtility.SetDirty(tileset);
-            }
 #endif
         }
     }
 }
-

Editor/GeospatialCreator/Scripts/Internal/GeoMath.cs

@@ -167,4 +167,3 @@ public static double4x4 CalculateEnuToEcefTransform(GeoCoordinate originPoint)
         }
     }
 }
-

Editor/GeospatialCreator/Scripts/Internal/GeospatialAnchorUpdater.cs

@@ -23,7 +23,6 @@
 namespace Google.XR.ARCoreExtensions.GeospatialCreator.Editor.Internal
 {
     using System;
-    using System.Collections.Generic;
     using Google.XR.ARCoreExtensions.GeospatialCreator.Internal;
 #if ARCORE_INTERNAL_USE_UNITY_MATH
     using Unity.Mathematics;
@@ -64,7 +63,7 @@ static GeospatialAnchorUpdater()
 
         // :TODO b/278071434: Make the Origin a property of the anchor instead of finding it. This
         // implementation is inefficient to do on each Editor Update, but will be replaced soon.
-        private static GeoCoordinate FindOriginPoint()
+        public static GeoCoordinate FindOriginPoint()
         {
             ARGeospatialCreatorOrigin[] origins =
                 GameObject.FindObjectsOfType<ARGeospatialCreatorOrigin>();

Editor/GeospatialCreator/Scripts/Internal/GeospatialCreatorMenuUtils.cs

@@ -18,7 +18,6 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-
 namespace Google.XR.ARCoreExtensions.GeospatialCreator.Editor.Internal
 {
     using System;
@@ -71,4 +70,3 @@ private static GameObject CreateObject(
         }
     }
 }
-

Editor/GeospatialCreator/Scripts/Internal/GeospatialOriginUpdater.cs

@@ -23,7 +23,6 @@
 namespace Google.XR.ARCoreExtensions.GeospatialCreator.Editor.Internal
 {
     using System;
-    using System.Collections.Generic;
     using Google.XR.ARCoreExtensions.GeospatialCreator.Internal;
     using UnityEditor;
     using UnityEngine;
@@ -77,4 +76,3 @@ private void EditorUpdate()
 }
 
 #endif // ARCORE_INTERNAL_GEOSPATIAL_CREATOR_ENABLED
-

Editor/GeospatialCreator/Scripts/Internal/MatrixStack.cs

@@ -325,4 +325,3 @@ public double4 MultPoint(double4 v)
         }
     }
 }
-

Editor/Scripts/Internal/ARCoreExtensionsProjectSettingsProvider.cs

@@ -53,7 +53,6 @@ public override void OnGUI(string searchContext)
             {
                 IOSSupportHelper.UpdateIOSScriptingDefineSymbols(
                     ARCoreExtensionsProjectSettings.Instance);
-
                 GeospatialCreatorHelper.OnToggle(
                     ARCoreExtensionsProjectSettings.Instance.GeospatialEditorEnabled);
                 ARCoreExtensionsProjectSettings.Instance.Save();

Editor/Scripts/Internal/GeospatialCreatorEnabledWizard.cs

@@ -287,4 +287,3 @@ static WizardStyles()
         }
     }
 }
-

Editor/Scripts/Internal/GeospatialCreatorHelper.cs

@@ -195,4 +195,3 @@ private static HashSet<string> GetCurrentSymbolSet(BuildTargetGroup target)
         }
     }
 }
-

Editor/Scripts/Internal/ModulesWorkflow/CustomizedManifestInjection.cs

@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="CustomizedManifestInjection.cs" company="Google LLC">
 //
-// Copyright 2020 Unity Technologies All Rights Reserved.
+// Copyright 2020 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

README.md

@@ -1,4 +1,4 @@
-Google ARCore Extensions for AR Foundation
+Google ARCore Extensions and Geospatial Creator for Unity's AR Foundation
 ==========================================
 Copyright 2019 Google LLC
 

Runtime/GeospatialCreatorRuntime/Scripts/AssemblyInfo.cs

@@ -20,4 +20,3 @@
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(
     "Google.XR.ARCoreExtensions.GeospatialCreator.Editor")]
-

Runtime/GeospatialCreatorRuntime/Scripts/Internal/ARGeospatialCreatorAnchor.cs

@@ -261,4 +261,3 @@ private IEnumerator ResolveRooftopAnchor(ARAnchorManager anchorManager)
 #endif // !UNITY_EDITOR
     }
 }
-

Runtime/GeospatialCreatorRuntime/Scripts/Internal/ARGeospatialCreatorObject.cs

@@ -21,9 +21,6 @@
 namespace Google.XR.ARCoreExtensions.GeospatialCreator.Internal
 {
     using System;
-#if UNITY_EDITOR
-    using UnityEditor;
-#endif
     using UnityEngine;
 
     /// <summary>
@@ -44,4 +41,3 @@ internal virtual void Update()
 #endif // UNITY_EDITOR
     }
 }
-

Runtime/GeospatialCreatorRuntime/Scripts/Internal/ARGeospatialCreatorOrigin.cs

@@ -23,9 +23,6 @@ namespace Google.XR.ARCoreExtensions.GeospatialCreator.Internal
     using System;
 
     using Google.XR.ARCoreExtensions.Internal;
-#if UNITY_EDITOR
-    using UnityEditor;
-#endif
     using UnityEngine;
 
     /// <summary>
@@ -45,4 +42,3 @@ public class ARGeospatialCreatorOrigin : ARGeospatialCreatorObject
 #endif
     }
 }
-

Runtime/GeospatialCreatorRuntime/Scripts/Internal/GeoCoordinate.cs

@@ -21,7 +21,6 @@
 namespace Google.XR.ARCoreExtensions.GeospatialCreator.Internal
 {
     using System;
-    using System.Collections.Generic;
     using UnityEngine;
 
     /// <summary> Immutable class representing a specific lat/lon/altitude.</summary>
@@ -54,4 +53,3 @@ public double Altitude
         }
     }
 }
-