ARCore Unity SDK v1.9.0

google-ar · May 7, 2019 · e93c6ba · e93c6ba
1 parent f1dda90
commit e93c6ba
Show file tree

Hide file tree

Showing 91 changed files with 1,554 additions and 725 deletions.
diff --git a/Assets/GoogleARCore/Editor/ARCoreiOSDependencies.template b/Assets/GoogleARCore/Editor/ARCoreiOSDependencies.template
@@ -1,6 +1,6 @@
 <dependencies>
     <iosPods>
-        <iosPod minTargetSdk="11.0" name="ARCore" version="~&gt; 1.8.0">
+        <iosPod minTargetSdk="11.0" name="ARCore" version="~&gt; 1.9.0">
             </iosPod>
     </iosPods>
 </dependencies>
diff --git a/...s/AumgnetedFaceSessionConfiguration.asset → ...s/AugmentedFaceSessionConfiguration.asset b/...s/AumgnetedFaceSessionConfiguration.asset → ...s/AugmentedFaceSessionConfiguration.asset
@@ -9,7 +9,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 53ac32fab2599402fb6d154adf4c1e40, type: 3}
-  m_Name: AumgnetedFaceSessionConfiguration
+  m_Name: AugmentedFaceSessionConfiguration
   m_EditorClassIdentifier: 
   MatchCameraFramerate: 1
   PlaneFindingMode: 0

diff --git a/...gnetedFaceSessionConfiguration.asset.meta → ...mentedFaceSessionConfiguration.asset.meta b/...gnetedFaceSessionConfiguration.asset.meta → ...mentedFaceSessionConfiguration.asset.meta
diff --git a/Assets/GoogleARCore/Examples/AugmentedImage/Scripts/AugmentedImageExampleController.cs b/Assets/GoogleARCore/Examples/AugmentedImage/Scripts/AugmentedImageExampleController.cs
@@ -29,6 +29,15 @@ namespace GoogleARCore.Examples.AugmentedImage
     /// <summary>
     /// Controller for AugmentedImage example.
     /// </summary>
+    /// <remarks>
+    /// In this sample, we assume all images are static or moving slowly with
+    /// a large occupation of the screen. If the target is actively moving,
+    /// we recommend to check <see cref="AugmentedImage.TrackingMethod"/> and
+    /// render only when the tracking method equals to
+    /// <see cref="AugmentedImageTrackingMethod.FullTracking"/>.
+    /// See details in <a href="https://developers.google.com/ar/develop/c/augmented-images/">
+    /// Recognize and Augment Images</a>
+    /// </remarks>
     public class AugmentedImageExampleController : MonoBehaviour
     {
         /// <summary>
@@ -57,12 +66,6 @@ public void Update()
                 Application.Quit();
             }
 
-            // Check that motion tracking is tracking.
-            if (Session.Status != SessionStatus.Tracking)
-            {
-                return;
-            }
-
             // Get updated augmented images for this frame.
             Session.GetTrackables<AugmentedImage>(
                 m_TempAugmentedImages, TrackableQueryFilter.Updated);

diff --git a/Assets/GoogleARCore/Examples/CloudAnchors/Scripts/CloudAnchorsExampleController.cs b/Assets/GoogleARCore/Examples/CloudAnchors/Scripts/CloudAnchorsExampleController.cs
@@ -24,6 +24,11 @@ namespace GoogleARCore.Examples.CloudAnchors
     using UnityEngine;
     using UnityEngine.Networking;
 
+#if UNITY_EDITOR
+    // Set up touch input propagation while using Instant Preview in the editor.
+    using Input = GoogleARCore.InstantPreviewInput;
+#endif
+
     /// <summary>
     /// Controller for the Cloud Anchors Example. Handles the ARCore lifecycle.
     /// </summary>

diff --git a/Assets/GoogleARCore/Examples/ObjectManipulation/Scripts/Gestures/DragGesture.cs b/Assets/GoogleARCore/Examples/ObjectManipulation/Scripts/Gestures/DragGesture.cs
@@ -23,6 +23,11 @@ namespace GoogleARCore.Examples.ObjectManipulation
     using GoogleARCore.Examples.ObjectManipulationInternal;
     using UnityEngine;
 
+#if UNITY_EDITOR
+    // Set up touch input propagation while using Instant Preview in the editor.
+    using Input = GoogleARCore.InstantPreviewInput;
+#endif
+
     /// <summary>
     /// Gesture for when the user performs a drag motion on the touch screen.
     /// </summary>

diff --git a/Assets/GoogleARCore/Examples/ObjectManipulation/Scripts/Gestures/GestureRecognizer.cs b/Assets/GoogleARCore/Examples/ObjectManipulation/Scripts/Gestures/GestureRecognizer.cs
@@ -24,6 +24,11 @@ namespace GoogleARCore.Examples.ObjectManipulationInternal
     using System.Collections.Generic;
     using UnityEngine;
 
+#if UNITY_EDITOR
+    // Set up touch input propagation while using Instant Preview in the editor.
+    using Input = GoogleARCore.InstantPreviewInput;
+#endif
+
     /// <summary>
     /// Base class for all Gesture Recognizers (i.e. TapGestureRecognizer).
     ///

diff --git a/Assets/GoogleARCore/Examples/ObjectManipulation/Scripts/Gestures/GestureTouchesUtility.cs b/Assets/GoogleARCore/Examples/ObjectManipulation/Scripts/Gestures/GestureTouchesUtility.cs
@@ -23,6 +23,11 @@ namespace GoogleARCore.Examples.ObjectManipulationInternal
     using System.Collections.Generic;
     using UnityEngine;
 
+#if UNITY_EDITOR
+    // Set up touch input propagation while using Instant Preview in the editor.
+    using Input = GoogleARCore.InstantPreviewInput;
+#endif
+
     /// <summary>
     /// Singleton used by Gesture's and GestureRecognizer's to interact with touch input.
     ///

diff --git a/Assets/GoogleARCore/LICENSE b/Assets/GoogleARCore/LICENSE
@@ -1,4 +1,18 @@
-Except as indicated at the end of this LICENSE file,
+===============================================================================
+
+All files in the following folders:
+- Assets/GoogleARCore/SDK/Plugins/
+- Assets/GoogleARCore/SDK/InstantPreview/Plugins/
+- Assets/PlayServicesResolver/
+
+are licensed as follows:
+
+Covered by the **Google APIs Terms of Service** at
+[https://developers.google.com/terms/](https://developers.google.com/terms/)
+
+===============================================================================
+
+Except as indicated previously in this LICENSE file
 files in this SDK are licensed as follows:
 
 Copyright (c) 2017, Google Inc.
@@ -160,14 +174,27 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
     of your accepting any such warranty or additional liability.
 END OF TERMS AND CONDITIONS
 
-===============================================================================
+APPENDIX: How to apply the Apache License to your work.
 
-All files in the following folders:
-- Assets/GoogleARCore/SDK/Plugins/
-- Assets/GoogleARCore/SDK/InstantPreview/Plugins/
-- Assets/PlayServicesResolver/
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
 
-are licensed as follows:
+Copyright [yyyy] [name of copyright owner]
 
-Covered by the **Google APIs Terms of Service** at
-[https://developers.google.com/terms/](https://developers.google.com/terms/)
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/Assets/GoogleARCore/SDK/InstantPreview/Plugins/x86_64/arcore_instant_preview_shared.dll b/Assets/GoogleARCore/SDK/InstantPreview/Plugins/x86_64/arcore_instant_preview_shared.dll
diff --git a/Assets/GoogleARCore/SDK/InstantPreview/Plugins/x86_64/arcore_instant_preview_shared.dll.meta b/Assets/GoogleARCore/SDK/InstantPreview/Plugins/x86_64/arcore_instant_preview_shared.dll.meta
diff --git a/...tantPreview/Plugins/x86_64/arcore_instant_preview_unity_plugin.bundle/Contents/Info.plist b/...tantPreview/Plugins/x86_64/arcore_instant_preview_unity_plugin.bundle/Contents/Info.plist
diff --git a/...barcore_instant_preview_shared.dylib.meta → ...ty_plugin.bundle/Contents/Info.plist.meta b/...barcore_instant_preview_shared.dylib.meta → ...ty_plugin.bundle/Contents/Info.plist.meta
diff --git a/...re_instant_preview_unity_plugin.bundle/Contents/MacOS/arcore_instant_preview_unity_plugin b/...re_instant_preview_unity_plugin.bundle/Contents/MacOS/arcore_instant_preview_unity_plugin
diff --git a/...instant_preview_unity_plugin.bundle/Contents/MacOS/libarcore_instant_preview_shared.dylib b/...instant_preview_unity_plugin.bundle/Contents/MacOS/libarcore_instant_preview_shared.dylib
diff --git a/...gleARCore/SDK/InstantPreview/Prefabs.meta → ...lugin.bundle/Contents/_CodeSignature.meta b/...gleARCore/SDK/InstantPreview/Prefabs.meta → ...lugin.bundle/Contents/_CodeSignature.meta
diff --git a/...s/x86_64/arcore_instant_preview_unity_plugin.bundle/Contents/_CodeSignature/CodeResources b/...s/x86_64/arcore_instant_preview_unity_plugin.bundle/Contents/_CodeSignature/CodeResources
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict/>
+	<key>files2</key>
+	<dict/>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^[^/]+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/...Instant Preview Touch Warning.prefab.meta → ...ontents/_CodeSignature/CodeResources.meta b/...Instant Preview Touch Warning.prefab.meta → ...ontents/_CodeSignature/CodeResources.meta
diff --git a/...ts/GoogleARCore/SDK/InstantPreview/Plugins/x86_64/arcore_instant_preview_unity_plugin.dll b/...ts/GoogleARCore/SDK/InstantPreview/Plugins/x86_64/arcore_instant_preview_unity_plugin.dll