Skip to content

Commit 9100530

Browse files
update: fix builds
1 parent c719c07 commit 9100530

File tree

10 files changed

+53
-15
lines changed

10 files changed

+53
-15
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
configurations.maybeCreate("default")
2-
artifacts.add("default", file('core-1.41.0.aar'))
2+
artifacts.add("default", file('core-1.43.0.aar'))
Binary file not shown.
Binary file not shown.

β€Žandroid/libs/arcore/include/arcore_c_api.h

Lines changed: 49 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,6 +1938,41 @@ AR_DEFINE_ENUM(ArFutureState){
19381938
AR_FUTURE_STATE_DONE = 2,
19391939
};
19401940

1941+
// Describe the Geospatial anchor type. Do not use. For internal use only.
1942+
AR_DEFINE_ENUM(ArGeospatialAnchorType){
1943+
AR_GEOSPATIAL_ANCHOR_TYPE_UNKNOWN = 0,
1944+
// Anchor with altitude relative to WGS84 Earth ellipsoid's mean sea level.
1945+
AR_GEOSPATIAL_ANCHOR_TYPE_WGS84 = 1,
1946+
// Anchor with altitude relative to ground floors or ground terrain.
1947+
AR_GEOSPATIAL_ANCHOR_TYPE_TERRAIN = 2,
1948+
// Anchor with altitude relative to building rooftops.
1949+
AR_GEOSPATIAL_ANCHOR_TYPE_ROOFTOP = 3,
1950+
};
1951+
1952+
// Describe the Geospatial Creator Platform. Do not use. For internal use only.
1953+
AR_DEFINE_ENUM(ArGeospatialCreatorPlatform){
1954+
// The platform cannot be determined, because the client did not explicitly
1955+
// report this field. This is the default value.
1956+
AR_GEOSPATIAL_CREATOR_PLATFORM_UNKNOWN = 0,
1957+
1958+
// Geospatial Creator is available on the platform, but was not used for
1959+
// this AR application.
1960+
AR_GEOSPATIAL_CREATOR_PLATFORM_DISABLED = 1,
1961+
1962+
// Geospatial Creator was used, but the platform is not defined in an enum.
1963+
// This is useful for implementing backwards compatibility for 3rd party
1964+
// partners, though subsequent ARCore releases should have an appropriate
1965+
// enum value exposed.
1966+
AR_GEOSPATIAL_CREATOR_PLATFORM_OTHER = 2,
1967+
1968+
// Geospatial Creator for the ARCore Extensions SDK was used to build this
1969+
// this AR application.
1970+
AR_GEOSPATIAL_CREATOR_PLATFORM_ARCORE_EXTENSIONS_UNITY = 3,
1971+
1972+
// Geospatial Creator for Adobe Aero was used to build this AR application.
1973+
AR_GEOSPATIAL_CREATOR_PLATFORM_ADOBE_AERO = 4,
1974+
};
1975+
19411976
/// @ingroup ArHostCloudAnchorFuture
19421977
/// Handle to an asynchronous operation launched by
19431978
/// @c ::ArSession_hostCloudAnchorAsync. See the <a
@@ -4842,10 +4877,11 @@ void ArTrackDataList_acquireItem(const ArSession *session,
48424877
/// Attempts to acquire a depth image that corresponds to the current frame.
48434878
///
48444879
/// The depth image has a single 16-bit plane at index 0, stored in
4845-
/// little-endian format. Each pixel contains the distance in millimeters to the
4846-
/// camera plane. Currently, the three most significant bits are always set to
4847-
/// 000. The remaining thirteen bits express values from 0 to 8191, representing
4848-
/// depth in millimeters. To extract distance from a depth map, see <a
4880+
/// little-endian format. Each pixel contains the distance in millimeters along
4881+
/// the camera principal axis. Currently, the three most significant bits are
4882+
/// always set to 000. The remaining thirteen bits express values from 0 to
4883+
/// 8191, representing depth in millimeters. To extract distance from a depth
4884+
/// map, see <a
48494885
/// href="https://developers.google.com/ar/develop/c/depth/developer-guide#extract-distance">the
48504886
/// Depth API developer guide</a>.
48514887
///
@@ -4919,8 +4955,8 @@ ArStatus ArFrame_acquireDepthImage(const ArSession *session,
49194955
/// href="https://developer.android.com/reference/android/hardware/HardwareBuffer#D_16">
49204956
/// HardwareBuffer.D_16</a>, which is a single 16-bit plane at index 0,
49214957
/// stored in little-endian format. Each pixel contains the distance in
4922-
/// millimeters to the camera plane, with the representable depth range between
4923-
/// 0 millimeters and 65535 millimeters, or about 65 meters.
4958+
/// millimeters along the camera principal axis, with the representable depth
4959+
/// range between 0 millimeters and 65535 millimeters, or about 65 meters.
49244960
///
49254961
/// To extract distance from a depth map, see <a
49264962
/// href="https://developers.google.com/ar/develop/c/depth/developer-guide#extract-distance">the
@@ -4995,10 +5031,11 @@ ArStatus ArFrame_acquireDepthImage16Bits(const ArSession *session,
49955031
/// @c ::ArFrame_acquireRawDepthConfidenceImage).
49965032
///
49975033
/// The depth image has a single 16-bit plane at index 0, stored in
4998-
/// little-endian format. Each pixel contains the distance in millimeters to the
4999-
/// camera plane. Currently, the three most significant bits are always set to
5000-
/// 000. The remaining thirteen bits express values from 0 to 8191, representing
5001-
/// depth in millimeters. To extract distance from a depth map, see <a
5034+
/// little-endian format. Each pixel contains the distance in millimeters along
5035+
/// the camera principal axis. Currently, the three most significant bits are
5036+
/// always set to 000. The remaining thirteen bits express values from 0 to
5037+
/// 8191, representing depth in millimeters. To extract distance from a depth
5038+
/// map, see <a
50025039
/// href="https://developers.google.com/ar/develop/c/depth/developer-guide#extract-distance">the
50035040
/// Depth API developer guide</a>.
50045041
///
@@ -5087,8 +5124,8 @@ ArStatus ArFrame_acquireRawDepthImage(const ArSession *session,
50875124
/// href="https://developer.android.com/reference/android/hardware/HardwareBuffer#D_16">
50885125
/// HardwareBuffer.D_16</a>, which is a single 16-bit plane at index 0,
50895126
/// stored in little-endian format. Each pixel contains the distance in
5090-
/// millimeters to the camera plane, with the representable depth range between
5091-
/// 0 millimeters and 65535 millimeters, or about 65 meters.
5127+
/// millimeters along the camera principal axis, with the representable depth
5128+
/// range between 0 millimeters and 65535 millimeters, or about 65 meters.
50925129
///
50935130
/// To extract distance from a depth map, see <a
50945131
/// href="https://developers.google.com/ar/develop/c/depth/developer-guide#extract-distance">the

β€Žandroid/sharedCode/src/main/java/com/viro/core/Node.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1738,7 +1738,8 @@ public void onCameraTransformUpdate(float posX, float poxY, float posZ,
17381738
float rotEulerX, float rotEulerY, float rotEulerZ,
17391739
float forwardX, float forwardY, float forwardZ,
17401740
float upX, float upY, float upZ) {
1741-
} //no-op - used by VRTARScene only
1741+
// no-op - used by VRTARScene only
1742+
}
17421743
//#ENDIF
17431744

17441745
// +---------------------------------------------------------------------------+
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

β€Žandroid/viroreact/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ dependencies {
9999
implementation 'androidx.media3:media3-exoplayer-hls:1.1.1'
100100
implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.1.1'
101101
implementation project(':libs:gvr')
102-
implementation 'com.google.ar:core:1.41.0'
102+
implementation 'com.google.ar:core:1.43.0'
103103
implementation 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7'
104104
}
105105

0 commit comments

Comments
Β (0)