Skip to content
This repository was archived by the owner on Nov 8, 2019. It is now read-only.

Commit a8ec5b5

Browse files
committed
GVR Android SDK v1.140.0
1 parent 233e7fe commit a8ec5b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+359
-274
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
*.iml
33
.idea/
44

5-
# Gradle configuration.
5+
# Gradle build.
6+
.externalNativeBuild/
67
.gradle/
78
build/
9+
libraries/jni
810

911
# User configuration.
1012
local.properties

apks/controller_emulator.apk

393 KB
Binary file not shown.

build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
buildscript {
44
// This configures the Gradle build system, but not the GVR components.
55
repositories {
6+
google()
67
jcenter()
78
}
89
dependencies {
9-
classpath 'com.android.tools.build:gradle-experimental:0.9.3'
10+
classpath 'com.android.tools.build:gradle:3.0.1'
1011

1112
// NOTE: Do not place your application dependencies here; they belong
1213
// in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
1516

1617
allprojects {
1718
repositories {
19+
google()
1820
// For GVR components, the official source of the .aars is JCenter.
1921
jcenter()
2022
maven {
@@ -33,13 +35,13 @@ task clean(type: Delete) {
3335
// The dependencies for NDK builds live inside the .aar files so they need to
3436
// be extracted before NDK targets can build.
3537
task extractAudioSo(type: Copy) {
36-
from zipTree("${project.rootDir}/libraries/sdk-audio-1.130.0.aar")
38+
from zipTree("${project.rootDir}/libraries/sdk-audio-1.140.0.aar")
3739
into "${project.rootDir}/libraries/"
3840
include "jni/**/libgvr_audio.so"
3941
}
4042

4143
task extractGvrSo(type: Copy) {
42-
from zipTree("${project.rootDir}/libraries/sdk-base-1.130.0.aar")
44+
from zipTree("${project.rootDir}/libraries/sdk-base-1.140.0.aar")
4345
into "${project.rootDir}/libraries/"
4446
include "jni/**/libgvr.so"
4547
}

gradle/wrapper/gradle-wrapper.jar

-375 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

libraries/headers/vr/gvr/capi/include/gvr_types.h

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -254,15 +254,17 @@ typedef enum {
254254

255255
/// @}
256256

257-
/// Event data associated with a system-initiated GVR_EVENT_RECENTER event. The
258-
/// client may wish to handle this event to provide custom recentering logic.
257+
/// Event data associated with a GVR_EVENT_RECENTER event, which indicates head
258+
/// tracking recentering. (Controller recentering is signaled separately
259+
/// through gvr_controller_state_get_recentered().) The client may wish to
260+
/// handle this event to provide custom recentering logic.
259261
typedef struct gvr_recenter_event_data {
260262
int32_t recenter_type; // gvr_recenter_event_type
261263
gvr_flags recenter_event_flags;
262264

263-
/// The new transform that maps from "sensor" space to the recentered "start"
264-
/// space. This transform can also be retrieved by querying for the
265-
/// GVR_PROPERTY_RECENTER_TRANSFORM property.
265+
/// The new transform that maps from headset's "sensor" space to the
266+
/// recentered "start" space. This transform can also be retrieved by querying
267+
/// for the GVR_PROPERTY_RECENTER_TRANSFORM property.
266268
gvr_mat4f start_space_from_tracking_space_transform;
267269
} gvr_recenter_event_data;
268270

@@ -635,12 +637,12 @@ typedef enum {
635637
/// Type: float
636638
GVR_PROPERTY_TRACKING_FLOOR_HEIGHT = 1,
637639

638-
/// The current transform that maps from "sensor" space to the recentered
639-
/// "start" space. Apps can optionally undo or extend this transform to
640-
/// perform custom recentering logic with the returned pose, but all poses
641-
/// supplied during frame submission are assumed to be in start space. This
642-
/// transform matches the one reported in the most
643-
/// recent gvr_recenter_event_data.
640+
/// The current transform that maps from headset's "sensor" space to the
641+
/// recentered "start" space. Apps can optionally undo or extend this
642+
/// transform to perform custom recentering logic with the SDK-provided poses,
643+
/// but the SDK assumes poses supplied during frame submission are in start
644+
/// space. This transform matches the one reported in the most recent
645+
/// gvr_recenter_event_data.
644646
/// Type: gvr_mat4f
645647
GVR_PROPERTY_RECENTER_TRANSFORM = 2,
646648

@@ -699,7 +701,9 @@ typedef enum {
699701

700702
/// The type of gvr_event.
701703
typedef enum {
702-
/// Notification that a global recentering event has occurred.
704+
/// Notification that head tracking has been recentered. (Note that controller
705+
/// recentering is signaled separately through
706+
/// gvr_controller_state_get_recentered().)
703707
/// Event data type: gvr_recenter_event_data
704708
GVR_EVENT_RECENTER = 1,
705709

libraries/headers/vr/gvr/capi/include/gvr_version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ extern "C" {
2323
/// A string representation of the current GVR build version. This is of
2424
/// the form "MAJOR.MINOR.PATCH". Note that this may differ from the runtime
2525
/// GVR version as reported by gvr_get_version_string().
26-
#define GVR_SDK_VERSION_STRING "1.130.0"
26+
#define GVR_SDK_VERSION_STRING "1.140.0"
2727

2828
/// Semantic components for the current GVR build version. Note that these
2929
/// values may differ from the runtime GVR version as reported by
3030
/// gvr_get_version().
3131
enum {
3232
GVR_SDK_MAJOR_VERSION = 1,
33-
GVR_SDK_MINOR_VERSION = 130,
33+
GVR_SDK_MINOR_VERSION = 140,
3434
GVR_SDK_PATCH_VERSION = 0,
3535
};
3636

libraries/sdk-audio-1.130.0.aar

-1.25 MB
Binary file not shown.

libraries/sdk-audio-1.140.0.aar

1.25 MB
Binary file not shown.

libraries/sdk-audio-1.130.0.pom renamed to libraries/sdk-audio-1.140.0.pom

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.google.vr</groupId>
66
<artifactId>sdk-audio</artifactId>
7-
<version>1.130.0</version>
7+
<version>1.140.0</version>
88
<packaging>aar</packaging>
99

1010
<name>Google VR SDK-Audio</name>
@@ -19,7 +19,7 @@
1919
<groupId>com.google.vr</groupId>
2020
<artifactId>sdk-base</artifactId>
2121
<type>aar</type>
22-
<version>1.130.0</version>
22+
<version>1.140.0</version>
2323
</dependency>
2424
</dependencies>
2525
</project>

0 commit comments

Comments
 (0)