diff --git a/android/code-samples/arcore_client/build.gradle b/android/code-samples/arcore_client/build.gradle index 4984c1748..758ee3eaa 100644 --- a/android/code-samples/arcore_client/build.gradle +++ b/android/code-samples/arcore_client/build.gradle @@ -1,2 +1,2 @@ configurations.maybeCreate("default") -artifacts.add("default", file('core-1.41.0.aar')) +artifacts.add("default", file('core-1.43.0.aar')) diff --git a/android/code-samples/arcore_client/core-1.41.0.aar b/android/code-samples/arcore_client/core-1.41.0.aar deleted file mode 100644 index e4c5c50ed..000000000 Binary files a/android/code-samples/arcore_client/core-1.41.0.aar and /dev/null differ diff --git a/android/code-samples/arcore_client/core-1.43.0.aar b/android/code-samples/arcore_client/core-1.43.0.aar new file mode 100644 index 000000000..d9a59afe6 Binary files /dev/null and b/android/code-samples/arcore_client/core-1.43.0.aar differ diff --git a/android/libs/arcore/include/arcore_c_api.h b/android/libs/arcore/include/arcore_c_api.h index 1c0f91cab..9b74c82da 100644 --- a/android/libs/arcore/include/arcore_c_api.h +++ b/android/libs/arcore/include/arcore_c_api.h @@ -1938,6 +1938,41 @@ AR_DEFINE_ENUM(ArFutureState){ AR_FUTURE_STATE_DONE = 2, }; +// Describe the Geospatial anchor type. Do not use. For internal use only. +AR_DEFINE_ENUM(ArGeospatialAnchorType){ + AR_GEOSPATIAL_ANCHOR_TYPE_UNKNOWN = 0, + // Anchor with altitude relative to WGS84 Earth ellipsoid's mean sea level. + AR_GEOSPATIAL_ANCHOR_TYPE_WGS84 = 1, + // Anchor with altitude relative to ground floors or ground terrain. + AR_GEOSPATIAL_ANCHOR_TYPE_TERRAIN = 2, + // Anchor with altitude relative to building rooftops. + AR_GEOSPATIAL_ANCHOR_TYPE_ROOFTOP = 3, +}; + +// Describe the Geospatial Creator Platform. Do not use. For internal use only. +AR_DEFINE_ENUM(ArGeospatialCreatorPlatform){ + // The platform cannot be determined, because the client did not explicitly + // report this field. This is the default value. + AR_GEOSPATIAL_CREATOR_PLATFORM_UNKNOWN = 0, + + // Geospatial Creator is available on the platform, but was not used for + // this AR application. + AR_GEOSPATIAL_CREATOR_PLATFORM_DISABLED = 1, + + // Geospatial Creator was used, but the platform is not defined in an enum. + // This is useful for implementing backwards compatibility for 3rd party + // partners, though subsequent ARCore releases should have an appropriate + // enum value exposed. + AR_GEOSPATIAL_CREATOR_PLATFORM_OTHER = 2, + + // Geospatial Creator for the ARCore Extensions SDK was used to build this + // this AR application. + AR_GEOSPATIAL_CREATOR_PLATFORM_ARCORE_EXTENSIONS_UNITY = 3, + + // Geospatial Creator for Adobe Aero was used to build this AR application. + AR_GEOSPATIAL_CREATOR_PLATFORM_ADOBE_AERO = 4, +}; + /// @ingroup ArHostCloudAnchorFuture /// Handle to an asynchronous operation launched by /// @c ::ArSession_hostCloudAnchorAsync. See the the /// Depth API developer guide. /// @@ -4919,8 +4955,8 @@ ArStatus ArFrame_acquireDepthImage(const ArSession *session, /// href="https://developer.android.com/reference/android/hardware/HardwareBuffer#D_16"> /// HardwareBuffer.D_16, which is a single 16-bit plane at index 0, /// stored in little-endian format. Each pixel contains the distance in -/// millimeters to the camera plane, with the representable depth range between -/// 0 millimeters and 65535 millimeters, or about 65 meters. +/// millimeters along the camera principal axis, with the representable depth +/// range between 0 millimeters and 65535 millimeters, or about 65 meters. /// /// To extract distance from a depth map, see the @@ -4995,10 +5031,11 @@ ArStatus ArFrame_acquireDepthImage16Bits(const ArSession *session, /// @c ::ArFrame_acquireRawDepthConfidenceImage). /// /// The depth image has a single 16-bit plane at index 0, stored in -/// little-endian format. Each pixel contains the distance in millimeters to the -/// camera plane. Currently, the three most significant bits are always set to -/// 000. The remaining thirteen bits express values from 0 to 8191, representing -/// depth in millimeters. To extract distance from a depth map, see the /// Depth API developer guide. /// @@ -5087,8 +5124,8 @@ ArStatus ArFrame_acquireRawDepthImage(const ArSession *session, /// href="https://developer.android.com/reference/android/hardware/HardwareBuffer#D_16"> /// HardwareBuffer.D_16, which is a single 16-bit plane at index 0, /// stored in little-endian format. Each pixel contains the distance in -/// millimeters to the camera plane, with the representable depth range between -/// 0 millimeters and 65535 millimeters, or about 65 meters. +/// millimeters along the camera principal axis, with the representable depth +/// range between 0 millimeters and 65535 millimeters, or about 65 meters. /// /// To extract distance from a depth map, see the diff --git a/android/sharedCode/src/main/java/com/viro/core/Node.java b/android/sharedCode/src/main/java/com/viro/core/Node.java index ba76f0bf9..41c1d61c0 100644 --- a/android/sharedCode/src/main/java/com/viro/core/Node.java +++ b/android/sharedCode/src/main/java/com/viro/core/Node.java @@ -1738,7 +1738,8 @@ public void onCameraTransformUpdate(float posX, float poxY, float posZ, float rotEulerX, float rotEulerY, float rotEulerZ, float forwardX, float forwardY, float forwardZ, float upX, float upY, float upZ) { - } //no-op - used by VRTARScene only + // no-op - used by VRTARScene only + } //#ENDIF // +---------------------------------------------------------------------------+ diff --git a/android/viroar/src/main/jniLibs/arm64-v8a/libarcore_sdk_c.so b/android/viroar/src/main/jniLibs/arm64-v8a/libarcore_sdk_c.so index d8405a256..15750a79b 100644 Binary files a/android/viroar/src/main/jniLibs/arm64-v8a/libarcore_sdk_c.so and b/android/viroar/src/main/jniLibs/arm64-v8a/libarcore_sdk_c.so differ diff --git a/android/viroar/src/main/jniLibs/armeabi-v7a/libarcore_sdk_c.so b/android/viroar/src/main/jniLibs/armeabi-v7a/libarcore_sdk_c.so index eeb9125d5..9b8b37537 100644 Binary files a/android/viroar/src/main/jniLibs/armeabi-v7a/libarcore_sdk_c.so and b/android/viroar/src/main/jniLibs/armeabi-v7a/libarcore_sdk_c.so differ diff --git a/android/viroar/src/main/jniLibs/x86/libarcore_sdk_c.so b/android/viroar/src/main/jniLibs/x86/libarcore_sdk_c.so index 23860a157..2631e9965 100644 Binary files a/android/viroar/src/main/jniLibs/x86/libarcore_sdk_c.so and b/android/viroar/src/main/jniLibs/x86/libarcore_sdk_c.so differ diff --git a/android/viroar/src/main/jniLibs/x86_64/libarcore_sdk_c.so b/android/viroar/src/main/jniLibs/x86_64/libarcore_sdk_c.so index b3125dc30..76e1c3098 100644 Binary files a/android/viroar/src/main/jniLibs/x86_64/libarcore_sdk_c.so and b/android/viroar/src/main/jniLibs/x86_64/libarcore_sdk_c.so differ diff --git a/android/viroreact/build.gradle b/android/viroreact/build.gradle index f16629908..99f9b517b 100644 --- a/android/viroreact/build.gradle +++ b/android/viroreact/build.gradle @@ -99,7 +99,7 @@ dependencies { implementation 'androidx.media3:media3-exoplayer-hls:1.1.1' implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.1.1' implementation project(':libs:gvr') - implementation 'com.google.ar:core:1.41.0' + implementation 'com.google.ar:core:1.43.0' implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7' }