ARCore Android SDK v1.34.0

google-ar · Oct 12, 2022 · 3c21e80 · 3c21e80
1 parent d1f5285
commit 3c21e80
Show file tree

Hide file tree

Showing 28 changed files with 846 additions and 166 deletions.
diff --git a/LICENSE b/LICENSE
@@ -2676,6 +2676,43 @@ Developed at SunSoft, a Sun Microsystems, Inc. business.
 Permission to use, copy, modify, and distribute this
 software is freely granted, provided that this notice 
 is preserved.
+*******************************************************************************
+Protocol Buffers
+*******************************************************************************
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Code generated by the Protocol Buffer compiler is owned by the owner
+of the input file used when generating it.  This code is not
+standalone and requires a support library to be linked with it.  This
+support library is itself covered by the above license.
+
 *******************************************************************************
 Protocol Buffers for Java
 *******************************************************************************

diff --git a/libraries/include/arcore_c_api.h b/libraries/include/arcore_c_api.h
diff --git a/samples/augmented_faces_java/app/build.gradle b/samples/augmented_faces_java/app/build.gradle
@@ -26,7 +26,7 @@ android {
 
 dependencies {
     // ARCore (Google Play Services for AR) library.
-    implementation 'com.google.ar:core:1.33.0'
+    implementation 'com.google.ar:core:1.34.0'
 
     // Obj - a simple Wavefront OBJ file loader
     // https://github.com/javagl/Obj

diff --git a/samples/augmented_image_c/app/build.gradle b/samples/augmented_image_c/app/build.gradle
@@ -53,8 +53,8 @@ android {
 
 dependencies {
     // ARCore (Google Play Services for AR) library.
-    implementation 'com.google.ar:core:1.33.0'
-    natives 'com.google.ar:core:1.33.0'
+    implementation 'com.google.ar:core:1.34.0'
+    natives 'com.google.ar:core:1.34.0'
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.1.0'

diff --git a/samples/augmented_image_java/app/build.gradle b/samples/augmented_image_java/app/build.gradle
@@ -26,7 +26,7 @@ android {
 
 dependencies {
     // ARCore (Google Play Services for AR) library.
-    implementation 'com.google.ar:core:1.33.0'
+    implementation 'com.google.ar:core:1.34.0'
 
     // Obj - a simple Wavefront OBJ file loader
     // https://github.com/javagl/Obj

diff --git a/samples/cloud_anchor_java/app/build.gradle b/samples/cloud_anchor_java/app/build.gradle
@@ -26,7 +26,7 @@ android {
 
 dependencies {
     // ARCore (Google Play Services for AR) library.
-    implementation 'com.google.ar:core:1.33.0'
+    implementation 'com.google.ar:core:1.34.0'
 
     // Obj - a simple Wavefront OBJ file loader
     // https://github.com/javagl/Obj

diff --git a/samples/computervision_c/app/build.gradle b/samples/computervision_c/app/build.gradle
@@ -53,8 +53,8 @@ android {
 
 dependencies {
     // ARCore (Google Play Services for AR) library.
-    implementation 'com.google.ar:core:1.33.0'
-    natives 'com.google.ar:core:1.33.0'
+    implementation 'com.google.ar:core:1.34.0'
+    natives 'com.google.ar:core:1.34.0'
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.1.0'

diff --git a/samples/computervision_java/app/build.gradle b/samples/computervision_java/app/build.gradle
@@ -26,7 +26,7 @@ android {
 
 dependencies {
     // ARCore (Google Play Services for AR) library.
-    implementation 'com.google.ar:core:1.33.0'
+    implementation 'com.google.ar:core:1.34.0'
 
     // Obj - a simple Wavefront OBJ file loader
     // https://github.com/javagl/Obj

diff --git a/samples/geospatial_java/app/build.gradle b/samples/geospatial_java/app/build.gradle
@@ -7,7 +7,7 @@ android {
 
         // AR Optional apps must declare minSdkVersion >= 14.
         // AR Required apps must declare minSdkVersion >= 24.
-        minSdkVersion 24
+        minSdkVersion 28
         targetSdkVersion 33
         versionCode 1
         versionName '1.0'
@@ -26,7 +26,7 @@ android {
 
 dependencies {
     // ARCore (Google Play Services for AR) library.
-    implementation 'com.google.ar:core:1.33.0'
+    implementation 'com.google.ar:core:1.34.0'
     implementation 'com.google.android.gms:play-services-location:19.0.1'
 
     // Obj - a simple Wavefront OBJ file loader
@@ -35,4 +35,6 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.1.0'
+    implementation 'androidx.concurrent:concurrent-futures:1.1.0'
+    implementation 'com.google.guava:guava:31.1-android'
 }
diff --git a/samples/geospatial_java/app/src/main/assets/shaders/cubemap_filter.frag b/samples/geospatial_java/app/src/main/assets/shaders/cubemap_filter.frag
@@ -82,7 +82,9 @@ vec4 Filter(const vec3 n) {
   tangentToWorld[1] = cross(n, tangentToWorld[0]);
   tangentToWorld[2] = n;
 
-  ImportanceSampleCache cache = u_ImportanceSampleCaches[u_RoughnessLevel - 1];
+  // TODO(b/243456272): This clamp should not be necessary, but is here due to a
+  // driver issue with certain devices.
+  ImportanceSampleCache cache = u_ImportanceSampleCaches[max(0, u_RoughnessLevel - 1)];
   vec3 radiance = vec3(0.0);
   for (int i = 0; i < cache.number_of_entries; ++i) {
     ImportanceSampleCacheEntry entry = cache.entries[i];