Skip to content

Commit 4858289

Browse files
committed
more VR updates
1 parent f6f62dc commit 4858289

File tree

5 files changed

+43
-24
lines changed

5 files changed

+43
-24
lines changed

libraries/vr/examples/Cube/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="">
3-
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25"/>
3+
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="26"/>
44
<uses-permission android:name="android.permission.VIBRATE"/>
55
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
66
<uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true"/>

libraries/vr/src/processing/vr/PGraphicsVR.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,21 @@ protected void defaultPerspective() {
166166
}
167167

168168

169+
@Override
170+
protected void saveState() {
171+
}
172+
173+
174+
@Override
175+
protected void restoreState() {
176+
}
177+
178+
179+
@Override
180+
protected void restoreSurface() {
181+
}
182+
183+
169184
protected void updateView() {
170185
setVRViewport();
171186
setVRCamera();

src/processing/mode/android/AndroidBuild.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class AndroidBuild extends JavaBuild {
7777
static public final String SUPPORT_VER = "25.3.1";
7878
static public final String PLAY_SERVICES_VER = "11.8.0";
7979
static public final String WEAR_VER = "2.0.5";
80-
static public final String GVR_VER = "1.60.1";
80+
static public final String GVR_VER = "1.120.0";
8181

8282
// Main activity or service
8383
static private final String APP_ACTIVITY_TEMPLATE = "AppActivity.java.tmpl";

templates/VRBuild.gradle.tmpl

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion @@target_sdk@@
5-
buildToolsVersion "@@build_tools@@"
65
defaultConfig {
76
applicationId "@@package_name@@"
87
minSdkVersion @@min_sdk@@
98
targetSdkVersion @@target_sdk@@
109
versionCode @@version_code@@
1110
versionName "@@version_name@@"
1211
}
12+
compileOptions {
13+
sourceCompatibility JavaVersion.VERSION_1_8
14+
targetCompatibility JavaVersion.VERSION_1_8
15+
}
1316
buildTypes {
1417
debug {
1518
debuggable true
@@ -22,15 +25,14 @@ android {
2225
}
2326

2427
dependencies {
25-
compile fileTree(include: ['*.jar'], dir: 'libs')
26-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
27-
exclude group: 'com.android.support', module: 'support-annotations'
28-
})
29-
compile 'com.android.support:appcompat-v7:@@support_version@@'
30-
compile 'com.android.support:design:@@support_version@@'
31-
compile 'com.google.vr:sdk-audio:@@gvr_version@@'
32-
compile 'com.google.vr:sdk-base:@@gvr_version@@'
33-
testCompile 'junit:junit:4.12'
34-
compile files('libs/processing-core.jar')
35-
compile files('libs/vr.jar')
28+
implementation fileTree(include: ['*.jar'], dir: 'libs')
29+
implementation 'com.android.support:appcompat-v7:@@support_version@@'
30+
implementation 'com.android.support:design:@@support_version@@'
31+
implementation 'com.google.vr:sdk-audio:@@gvr_version@@'
32+
implementation 'com.google.vr:sdk-base:@@gvr_version@@'
33+
implementation files('libs/processing-core.jar')
34+
implementation files('libs/vr.jar')
35+
testImplementation 'junit:junit:4.12'
36+
androidTestImplementation 'com.android.support.test:runner:1.0.1'
37+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
3638
}

templates/VRBuildECJ.gradle.tmpl

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion @@target_sdk@@
5-
buildToolsVersion "@@build_tools@@"
65
defaultConfig {
76
applicationId "@@package_name@@"
87
minSdkVersion @@min_sdk@@
98
targetSdkVersion @@target_sdk@@
109
versionCode @@version_code@@
1110
versionName "@@version_name@@"
1211
}
13-
12+
compileOptions {
13+
sourceCompatibility JavaVersion.VERSION_1_8
14+
targetCompatibility JavaVersion.VERSION_1_8
15+
}
1416
buildTypes {
1517
debug {
1618
debuggable true
@@ -71,12 +73,12 @@ android {
7173
}
7274

7375
dependencies {
74-
provided files('@@tools_folder@@/../modes/java/mode/org.eclipse.jdt.core.jar')
75-
compile fileTree(include: ['*.jar'], dir: 'libs')
76-
compile 'com.android.support:appcompat-v7:@@support_version@@'
77-
compile 'com.android.support:design:@@support_version@@'
78-
compile 'com.google.vr:sdk-audio:@@gvr_version@@'
79-
compile 'com.google.vr:sdk-base:@@gvr_version@@'
80-
compile files('libs/processing-core.jar')
81-
compile files('libs/vr.jar')
76+
compileOnly files('@@tools_folder@@/../modes/java/mode/org.eclipse.jdt.core.jar')
77+
implementation fileTree(dir: 'libs', include: ['*.jar'])
78+
implementation 'com.android.support:appcompat-v7:@@support_version@@'
79+
implementation 'com.android.support:design:@@support_version@@'
80+
implementation 'com.google.vr:sdk-audio:@@gvr_version@@'
81+
implementation 'com.google.vr:sdk-base:@@gvr_version@@'
82+
implementation files('libs/processing-core.jar')
83+
implementation files('libs/vr.jar')
8284
}

0 commit comments

Comments
 (0)