ARCore Android SDK v1.36.0

google-ar · Mar 2, 2023 · 429ee46 · 429ee46
1 parent 6f887e1
commit 429ee46
Show file tree

Hide file tree

Showing 73 changed files with 1,559 additions and 91 deletions.
diff --git a/.allstar/binary_artifacts.yaml b/.allstar/binary_artifacts.yaml
@@ -0,0 +1,17 @@
+# Copyright 2023 Google LLC
+#
+# 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
+#
+#      http://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.
+ignorePaths:
+- tools/arcoreimg/linux/arcoreimg
+- tools/arcoreimg/macos/arcoreimg
+- tools/arcoreimg/windows/arcoreimg.exe
diff --git a/LICENSE b/LICENSE
diff --git a/libraries/include/arcore_c_api.h b/libraries/include/arcore_c_api.h
@@ -193,7 +193,6 @@
 /// - Orientation approximates the direction the user is facing in the EUS
 ///   coordinate system. The EUS coordinate system has X+ pointing east, Y+
 ///   pointing up, and Z+ pointing south.
-
 /// - Accuracy of the latitude, longitude, altitude, and heading are available
 ///   as numeric confidence intervals where a large value (large interval) means
 ///   low confidence and small value (small interval) means high confidence.
@@ -2138,7 +2137,7 @@ void ArCameraConfigFilter_destroy(ArCameraConfigFilter *filter);
 ///     @c ::ArCameraConfigTargetFps values, bitwise-or'd together
 void ArCameraConfigFilter_setTargetFps(const ArSession *session,
                                        ArCameraConfigFilter *filter,
-                                       const uint32_t fps_filters);
+                                       uint32_t fps_filters);
 
 /// @ingroup ArCameraConfigFilter
 /// Gets the desired framerates to allow.
@@ -5187,8 +5186,6 @@ void ArAugmentedFace_getRegionPose(const ArSession *session,
                                    const ArAugmentedFaceRegionType region_type,
                                    ArPose *out_pose);
 
-/// @}
-
 /// @ingroup ArAugmentedFace
 /// Returns the pose of the center of the face.
 ///

diff --git a/samples/augmented_faces_java/app/build.gradle b/samples/augmented_faces_java/app/build.gradle
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2017 Google LLC
+ *
+ * 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
+ *
+ *      http://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.
+ */
 apply plugin: 'com.android.application'
 
 android {
@@ -26,7 +41,7 @@ android {
 
 dependencies {
     // ARCore (Google Play Services for AR) library.
-    implementation 'com.google.ar:core:1.35.0'
+    implementation 'com.google.ar:core:1.36.0'
 
     // Obj - a simple Wavefront OBJ file loader
     // https://github.com/javagl/Obj

diff --git a/...ava/app/src/main/java/com/google/ar/core/examples/java/common/helpers/SnackbarHelper.java b/...ava/app/src/main/java/com/google/ar/core/examples/java/common/helpers/SnackbarHelper.java
@@ -50,6 +50,16 @@ public void showMessageWithDismiss(Activity activity, String message) {
     show(activity, message, DismissBehavior.SHOW);
   }
 
+  /** Shows a snackbar with a given message for Snackbar.LENGTH_SHORT milliseconds */
+  public void showMessageForShortDuration(Activity activity, String message) {
+    show(activity, message, DismissBehavior.SHOW, Snackbar.LENGTH_SHORT);
+  }
+
+  /** Shows a snackbar with a given message for Snackbar.LENGTH_LONG milliseconds */
+  public void showMessageForLongDuration(Activity activity, String message) {
+    show(activity, message, DismissBehavior.SHOW, Snackbar.LENGTH_LONG);
+  }
+
   /**
    * Shows a snackbar with a given error message. When dismissed, will finish the activity. Useful
    * for notifying errors, where no further interaction with the activity is possible.
@@ -96,8 +106,15 @@ public void setParentView(View snackbarView) {
     this.snackbarView = snackbarView;
   }
 
+  private void show(Activity activity, String message, DismissBehavior dismissBehavior) {
+    show(activity, message, dismissBehavior, Snackbar.LENGTH_INDEFINITE);
+  }
+
   private void show(
-      final Activity activity, final String message, final DismissBehavior dismissBehavior) {
+      final Activity activity,
+      final String message,
+      final DismissBehavior dismissBehavior,
+      int duration) {
     activity.runOnUiThread(
         new Runnable() {
           @Override
@@ -108,9 +125,9 @@ public void run() {
                         ? activity.findViewById(android.R.id.content)
                         : snackbarView,
                     message,
-                    Snackbar.LENGTH_INDEFINITE);
+                    duration);
             messageSnackbar.getView().setBackgroundColor(BACKGROUND_COLOR);
-            if (dismissBehavior != DismissBehavior.HIDE) {
+            if (dismissBehavior != DismissBehavior.HIDE && duration == Snackbar.LENGTH_INDEFINITE) {
               messageSnackbar.setAction(
                   "Dismiss",
                   new View.OnClickListener() {

diff --git a/samples/augmented_faces_java/build.gradle b/samples/augmented_faces_java/build.gradle
@@ -1,5 +1,20 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+/*
+ * Copyright 2017 Google LLC
+ *
+ * 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
+ *
+ *      http://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.
+ */
 
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
         google()

diff --git a/samples/augmented_faces_java/settings.gradle b/samples/augmented_faces_java/settings.gradle
@@ -1 +1,16 @@
+/*
+ * Copyright 2017 Google LLC
+ *
+ * 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
+ *
+ *      http://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.
+ */
 include ':app'
diff --git a/samples/augmented_image_c/app/build.gradle b/samples/augmented_image_c/app/build.gradle
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2017 Google LLC
+ *
+ * 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
+ *
+ *      http://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.
+ */
 apply plugin: 'com.android.application'
 
 /*
@@ -53,8 +68,8 @@ android {
 
 dependencies {
     // ARCore (Google Play Services for AR) library.
-    implementation 'com.google.ar:core:1.35.0'
-    natives 'com.google.ar:core:1.35.0'
+    implementation 'com.google.ar:core:1.36.0'
+    natives 'com.google.ar:core:1.36.0'
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.1.0'

diff --git a/samples/augmented_image_c/build.gradle b/samples/augmented_image_c/build.gradle
@@ -1,5 +1,20 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+/*
+ * Copyright 2017 Google LLC
+ *
+ * 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
+ *
+ *      http://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.
+ */
 
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
         google()

diff --git a/samples/augmented_image_c/settings.gradle b/samples/augmented_image_c/settings.gradle
@@ -1 +1,16 @@
+/*
+ * Copyright 2017 Google LLC
+ *
+ * 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
+ *
+ *      http://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.
+ */
 include ':app'
diff --git a/samples/augmented_image_java/app/build.gradle b/samples/augmented_image_java/app/build.gradle
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2017 Google LLC
+ *
+ * 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
+ *
+ *      http://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.
+ */
 apply plugin: 'com.android.application'
 
 android {
@@ -26,7 +41,7 @@ android {
 
 dependencies {
     // ARCore (Google Play Services for AR) library.
-    implementation 'com.google.ar:core:1.35.0'
+    implementation 'com.google.ar:core:1.36.0'
 
     // Obj - a simple Wavefront OBJ file loader
     // https://github.com/javagl/Obj

diff --git a/...ava/app/src/main/java/com/google/ar/core/examples/java/common/helpers/SnackbarHelper.java b/...ava/app/src/main/java/com/google/ar/core/examples/java/common/helpers/SnackbarHelper.java
@@ -50,6 +50,16 @@ public void showMessageWithDismiss(Activity activity, String message) {
     show(activity, message, DismissBehavior.SHOW);
   }
 
+  /** Shows a snackbar with a given message for Snackbar.LENGTH_SHORT milliseconds */
+  public void showMessageForShortDuration(Activity activity, String message) {
+    show(activity, message, DismissBehavior.SHOW, Snackbar.LENGTH_SHORT);
+  }
+
+  /** Shows a snackbar with a given message for Snackbar.LENGTH_LONG milliseconds */
+  public void showMessageForLongDuration(Activity activity, String message) {
+    show(activity, message, DismissBehavior.SHOW, Snackbar.LENGTH_LONG);
+  }
+
   /**
    * Shows a snackbar with a given error message. When dismissed, will finish the activity. Useful
    * for notifying errors, where no further interaction with the activity is possible.
@@ -96,8 +106,15 @@ public void setParentView(View snackbarView) {
     this.snackbarView = snackbarView;
   }
 
+  private void show(Activity activity, String message, DismissBehavior dismissBehavior) {
+    show(activity, message, dismissBehavior, Snackbar.LENGTH_INDEFINITE);
+  }
+
   private void show(
-      final Activity activity, final String message, final DismissBehavior dismissBehavior) {
+      final Activity activity,
+      final String message,
+      final DismissBehavior dismissBehavior,
+      int duration) {
     activity.runOnUiThread(
         new Runnable() {
           @Override
@@ -108,9 +125,9 @@ public void run() {
                         ? activity.findViewById(android.R.id.content)
                         : snackbarView,
                     message,
-                    Snackbar.LENGTH_INDEFINITE);
+                    duration);
             messageSnackbar.getView().setBackgroundColor(BACKGROUND_COLOR);
-            if (dismissBehavior != DismissBehavior.HIDE) {
+            if (dismissBehavior != DismissBehavior.HIDE && duration == Snackbar.LENGTH_INDEFINITE) {
               messageSnackbar.setAction(
                   "Dismiss",
                   new View.OnClickListener() {

diff --git a/samples/augmented_image_java/build.gradle b/samples/augmented_image_java/build.gradle
@@ -1,5 +1,20 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
+/*
+ * Copyright 2017 Google LLC
+ *
+ * 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
+ *
+ *      http://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.
+ */
 
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
         google()

diff --git a/samples/augmented_image_java/settings.gradle b/samples/augmented_image_java/settings.gradle
@@ -1 +1,16 @@
+/*
+ * Copyright 2017 Google LLC
+ *
+ * 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
+ *
+ *      http://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.
+ */
 include ':app'
diff --git a/samples/cloud_anchor_java/app/build.gradle b/samples/cloud_anchor_java/app/build.gradle
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2017 Google LLC
+ *
+ * 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
+ *
+ *      http://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.
+ */
 apply plugin: 'com.android.application'
 
 android {
@@ -26,7 +41,7 @@ android {
 
 dependencies {
     // ARCore (Google Play Services for AR) library.
-    implementation 'com.google.ar:core:1.35.0'
+    implementation 'com.google.ar:core:1.36.0'
 
     // Obj - a simple Wavefront OBJ file loader
     // https://github.com/javagl/Obj