Skip to content

Commit

Permalink
ARCore Android SDK v1.27.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bsanjin committed Sep 22, 2021
1 parent e12a49b commit 3847878
Show file tree
Hide file tree
Showing 152 changed files with 85,976 additions and 117 deletions.
31 changes: 22 additions & 9 deletions libraries/include/arcore_c_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -2023,44 +2023,52 @@ void ArRecordingConfig_destroy(ArRecordingConfig *config);
/// @param[in] config The config object to query
/// @param[out] out_mp4_dataset_file_path Pointer to an @c char* to receive
/// the address of the newly allocated file path.
/// @deprecated Deprecated in release 1.26.0. Use
/// @c ::ArRecordingConfig_getMp4DatasetUri instead.
void ArRecordingConfig_getMp4DatasetFilePath(const ArSession *session,
const ArRecordingConfig *config,
char **out_mp4_dataset_file_path);
char **out_mp4_dataset_file_path)
AR_DEPRECATED(
"Deprecated in release 1.26.0. Please see function documentation");

/// @ingroup ArRecordingConfig
/// Sets the file path to save an MP4 dataset file for the recording.
///
/// @param[in] session The ARCore session
/// @param[in, out] config The config object to change
/// @param[in] mp4_dataset_file_path A string representing the file path
/// @deprecated Deprecated in release 1.26.0. Use
/// @c ::ArRecordingConfig_setMp4DatasetUri instead.
void ArRecordingConfig_setMp4DatasetFilePath(const ArSession *session,
ArRecordingConfig *config,
const char *mp4_dataset_file_path);
const char *mp4_dataset_file_path)
AR_DEPRECATED(
"Deprecated in release 1.26.0. Please see function documentation");

/// @ingroup ArRecordingConfig
/// Gets the uri that the MP4 dataset will be recorded to.
/// Gets the URI that the MP4 dataset will be recorded to.
///
/// This will be null if @c ::ArRecordingConfig_setMp4DatasetFilePath was used
/// to set the output.
///
/// @param[in] session The ARCore session
/// @param[in] config The config object to query
/// @param[out] out_mp4_dataset_uri Pointer to a @c char* to receive
///     the address of the newly allocated uri.
///     the address of the newly allocated URI.
void ArRecordingConfig_getMp4DatasetUri(const ArSession *session,
const ArRecordingConfig *config,
char **out_mp4_dataset_uri);

/// @ingroup ArRecordingConfig
/// Sets the file path to save an MP4 dataset file for the recording.
///
/// The uri must be able to be opened as a file descriptor for reading and
/// The URI must be able to be opened as a file descriptor for reading and
/// writing that supports @c lseek or @c #AR_ERROR_INVALID_ARGUMENT will be
/// returned when @c ::ArSession_startRecording is called.
///
/// @param[in] session The ARCore session
/// @param[in, out] config The config object to change
/// @param[in] mp4_dataset_uri The percent encoded, null terminated, uri to
/// @param[in] mp4_dataset_uri The percent encoded, null terminated, URI to
/// write data to.
void ArRecordingConfig_setMp4DatasetUri(const ArSession *session,
ArRecordingConfig *config,
Expand Down Expand Up @@ -2754,20 +2762,25 @@ void ArSession_getSupportedCameraConfigsWithFilter(
/// - @c #AR_ERROR_PLAYBACK_FAILED if an error occurred with the MP4 dataset
/// file such as not being able to open the file or the file is unable to be
/// decoded.
/// @deprecated Deprecated in release 1.26.0. Use
/// @c ::ArRecordingConfig_setMp4DatasetUri instead.
ArStatus ArSession_setPlaybackDataset(ArSession *session,
const char *mp4_dataset_file_path);
const char *mp4_dataset_file_path)
AR_DEPRECATED(
"Deprecated in release 1.26.0. Please see function documentation");

/// @ingroup ArSession
/// Sets a MP4 dataset file to play back instead of using the live camera feed
/// and IMU sensor data.
///
/// This overrides the last path set by @c ::ArSession_setPlaybackDataset.
//
/// The uri must point to a resource that supports @c lseek.
/// The URI must point to a resource that supports @c lseek.
//
/// See @c ::ArSession_setPlaybackDataset for more restrictions and details.
///
/// @param[in] session The ARCore session
/// @param[in] mp4_dataset_uri The percent encoded, null terminated uri for the
/// @param[in] mp4_dataset_uri The percent encoded, null terminated URI for the
/// dataset
///
/// @return @c #AR_SUCCESS or any of:
Expand Down
2 changes: 1 addition & 1 deletion samples/augmented_faces_java/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.26.0'
implementation 'com.google.ar:core:1.27.0'

// Obj - a simple Wavefront OBJ file loader
// https://github.com/javagl/Obj
Expand Down
4 changes: 2 additions & 2 deletions samples/augmented_image_c/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.26.0'
natives 'com.google.ar:core:1.26.0'
implementation 'com.google.ar:core:1.27.0'
natives 'com.google.ar:core:1.27.0'

implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
Expand Down
2 changes: 1 addition & 1 deletion samples/augmented_image_java/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.26.0'
implementation 'com.google.ar:core:1.27.0'

// Obj - a simple Wavefront OBJ file loader
// https://github.com/javagl/Obj
Expand Down
2 changes: 1 addition & 1 deletion samples/cloud_anchor_java/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.26.0'
implementation 'com.google.ar:core:1.27.0'

// Obj - a simple Wavefront OBJ file loader
// https://github.com/javagl/Obj
Expand Down
4 changes: 2 additions & 2 deletions samples/computervision_c/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.26.0'
natives 'com.google.ar:core:1.26.0'
implementation 'com.google.ar:core:1.27.0'
natives 'com.google.ar:core:1.27.0'

implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
Expand Down
2 changes: 1 addition & 1 deletion samples/computervision_java/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.26.0'
implementation 'com.google.ar:core:1.27.0'

// Obj - a simple Wavefront OBJ file loader
// https://github.com/javagl/Obj
Expand Down
4 changes: 2 additions & 2 deletions samples/hello_ar_c/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.26.0'
natives 'com.google.ar:core:1.26.0'
implementation 'com.google.ar:core:1.27.0'
natives 'com.google.ar:core:1.27.0'

implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
Expand Down
2 changes: 1 addition & 1 deletion samples/hello_ar_java/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.26.0'
implementation 'com.google.ar:core:1.27.0'

// Obj - a simple Wavefront OBJ file loader
// https://github.com/javagl/Obj
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,9 @@ protected void onResume() {
try {
configureSession();
// To record a live camera session for later playback, call
// `session.startRecording(recorderConfig)` at anytime. To playback a previously recorded AR
// `session.startRecording(recordingConfig)` at anytime. To playback a previously recorded AR
// session instead of using the live camera feed, call
// `session.setPlaybackDataset(playbackDatasetPath)` before calling `session.resume()`. To
// `session.setPlaybackDatasetUri(Uri)` before calling `session.resume()`. To
// learn more about recording and playback, see:
// https://developers.google.com/ar/develop/java/recording-and-playback
session.resume();
Expand Down
16 changes: 16 additions & 0 deletions samples/hello_ar_kotlin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Android Studio configuration.
*.iml
.idea/

# Gradle configuration.
.gradle/
build/

# User configuration.
local.properties

# OS configurations.
.DS_Store

# Android NDK cmake output.
.cxx/
2 changes: 2 additions & 0 deletions samples/hello_ar_kotlin/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/build
google-services.json
46 changes: 46 additions & 0 deletions samples/hello_ar_kotlin/app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 30
defaultConfig {
applicationId "com.google.ar.core.examples.kotlin.helloar"

// AR Optional apps must declare minSdkVersion >= 14.
// AR Required apps must declare minSdkVersion >= 24.
minSdkVersion 24
targetSdkVersion 30
versionCode 1
versionName '1.0'
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
kotlinOptions {
jvmTarget = '1.8'
}
}

dependencies {
// ARCore (Google Play Services for AR) library.
implementation 'com.google.ar:core:1.27.0'

// Obj - a simple Wavefront OBJ file loader
// https://github.com/javagl/Obj
implementation 'de.javagl:obj:0.2.1'

implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'

implementation 'com.google.android.material:material:1.1.0'

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
17 changes: 17 additions & 0 deletions samples/hello_ar_kotlin/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /opt/android-sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# Add any project specific keep options here:

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
Loading

0 comments on commit 3847878

Please sign in to comment.