Skip to content

Commit 33a14ef

Browse files
codeanticodecodeanticode
committed
more VR renaming
1 parent cacb565 commit 33a14ef

File tree

12 files changed

+72
-70
lines changed

12 files changed

+72
-70
lines changed

‎libraries/vr/src/processing/vr/PSurfaceVR.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ public PSurfaceVR(PGraphics graphics, AppComponent component, SurfaceHolder hold
8787
}
8888
vrActivity.setGvrView(glview);
8989

90+
// Required to read the paired viewer's distortion parameters.
91+
requestPermissions(new String[] {"android.permission.READ_EXTERNAL_STORAGE"});
92+
9093
surfaceView = null;
9194
}
9295

‎mode/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
AndroidMode.jar
2-
/cardboard.jar
2+
/vr.jar

‎scripts/gvrsdk-update.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# This script downloads the GVR SDK, explodes the AAR files, and creates zip packages than
4-
# can be used by the mode to generate the required libraries to build a cardboard sketch.
4+
# can be used by the mode to generate the required libraries to build a VR sketch.
55
# The steps in the AAR to ZIP conversion were based on this blogpost:
66
# https://commonsware.com/blog/2014/07/03/consuming-aars-eclipse.html
77

@@ -15,7 +15,7 @@ sdk=v$1
1515
# Version of the protobuf-javanano dependency
1616
nano=3.1.0
1717

18-
mkdir ../libraries/cardboard/gvrsdk/$ver
18+
mkdir ../libraries/vr/gvrsdk/$ver
1919

2020
wget https://github.com/googlevr/gvr-android-sdk/archive/$sdk.zip
2121

@@ -49,12 +49,12 @@ jar cf gvr-base.jar -C sdk-base/libs/base .
4949
rm -Rf sdk-base/libs/base
5050
mv gvr-base.jar sdk-base/libs
5151

52-
# Need the jar also in cardboard's lib folder
53-
cp sdk-base/libs/gvr-base.jar ../libraries/cardboard/lib
52+
# Need the jar also in VR's lib folder
53+
cp sdk-base/libs/gvr-base.jar ../libraries/vr/lib
5454

5555
# Finally, create zip file and mode to the sdk location
5656
zip -r sdk-base.zip sdk-base
57-
mv sdk-base.zip ../libraries/cardboard/gvrsdk/$ver
57+
mv sdk-base.zip ../libraries/vr/gvrsdk/$ver
5858

5959

6060
################################################
@@ -85,12 +85,12 @@ mv gvr-common.jar sdk-common/libs
8585
wget http://central.maven.org/maven2/com/google/protobuf/nano/protobuf-javanano/$nano/protobuf-javanano-$nano.jar
8686
mv protobuf-javanano-$nano.jar sdk-common/libs
8787

88-
# Need the jar also in cardboard's lib folder
89-
cp sdk-common/libs/gvr-common.jar ../libraries/cardboard/lib
88+
# Need the jar also in VR's lib folder
89+
cp sdk-common/libs/gvr-common.jar ../libraries/vr/lib
9090

9191
# Finally, create zip file and mode to the sdk location
9292
zip -r sdk-common.zip sdk-common
93-
mv sdk-common.zip ../libraries/cardboard/gvrsdk/$ver
93+
mv sdk-common.zip ../libraries/vr/gvrsdk/$ver
9494

9595
################################################
9696
# Audio package
@@ -115,12 +115,12 @@ jar cf gvr-audio.jar -C sdk-audio/libs/audio .
115115
rm -Rf sdk-audio/libs/audio
116116
mv gvr-audio.jar sdk-audio/libs
117117

118-
# Need the jar also in cardboard's lib folder
119-
cp sdk-audio/libs/gvr-audio.jar ../libraries/cardboard/lib
118+
# Need the jar also in VR's lib folder
119+
cp sdk-audio/libs/gvr-audio.jar ../libraries/vr/lib
120120

121121
# Finally, create zip file and mode to the sdk location
122122
zip -r sdk-audio.zip sdk-audio
123-
mv sdk-audio.zip ../libraries/cardboard/gvrsdk/$ver
123+
mv sdk-audio.zip ../libraries/vr/gvrsdk/$ver
124124

125125
################################################
126126
# Cleanup

‎scripts/info.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ wear-update.sh: downloads the wearable aar file from a known maven repository, a
1111
extracts the classes jar and copies it inside core/library
1212

1313
gvrsdk-update.sh: downloads the Google VR SDK and generates all required packages and jar
14-
files needed to build and run cardboard sketches from Processing
14+
files needed to build and run VR sketches from Processing
1515

1616
gradlew-update.sh: creates the gradle wrapper with the desired gradle version and packs
1717
it in the mode folder to be available when exporting projects using gradle as the build

‎settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include 'core', 'libraries:cardboard'
1+
include 'core', 'libraries:vr'

‎src/processing/mode/android/AndroidBuild.java

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,21 @@ class AndroidBuild extends JavaBuild {
4848
static public final int FRAGMENT = 0;
4949
static public final int WALLPAPER = 1;
5050
static public final int WATCHFACE = 2;
51-
static public final int CARDBOARD = 3;
51+
static public final int VR = 3;
5252

5353
static public final String DEFAULT_COMPONENT = "app";
5454

5555
static private final String FRAGMENT_ACTIVITY_TEMPLATE = "FragmentActivity.java.tmpl";
5656
static private final String WALLPAPER_SERVICE_TEMPLATE = "WallpaperService.java.tmpl";
5757
static private final String WATCHFACE_SERVICE_TEMPLATE = "WatchFaceService.java.tmpl";
58-
static private final String CARDBOARD_ACTIVITY_TEMPLATE = "CardboardActivity.java.tmpl";
58+
static private final String VR_ACTIVITY_TEMPLATE = "VRActivity.java.tmpl";
5959
static private final String HANDHELD_ACTIVITY_TEMPLATE = "HandheldActivity.java.tmpl";
6060
static private final String HANDHELD_MANIFEST_TEMPLATE = "HandheldManifest.xml.tmpl";
6161
static private final String HANDHELD_LAYOUT_TEMPLATE = "HandheldLayout.xml.tmpl";
6262
static private final String WEARABLE_DESCRIPTION_TEMPLATE = "WearableDescription.xml.tmpl";
6363
static private final String LAYOUT_ACTIVITY_TEMPLATE = "LayoutActivity.xml.tmpl";
6464
static private final String STYLES_FRAGMENT_TEMPLATE = "StylesFragment.xml.tmpl";
65-
static private final String STYLES_CARDBOARD_TEMPLATE = "StylesCardboard.xml.tmpl";
65+
static private final String STYLES_VR_TEMPLATE = "StylesVR.xml.tmpl";
6666
static private final String XML_WALLPAPER_TEMPLATE = "XMLWallpaper.xml.tmpl";
6767
static private final String STRINGS_WALLPAPER_TEMPLATE = "StringsWallpaper.xml.tmpl";
6868
static private final String XML_WATCHFACE_TEMPLATE = "XMLWatchFace.xml.tmpl";
@@ -74,7 +74,7 @@ class AndroidBuild extends JavaBuild {
7474
static private final String APP_GRADLE_BUILD_TEMPLATE = "FragmentBuild.gradle.tmpl";
7575
static private final String HANDHELD_GRADLE_BUILD_TEMPLATE = "HandheldBuild.gradle.tmpl";
7676
static private final String WEARABLE_GRADLE_BUILD_TEMPLATE = "WearableBuild.gradle.tmpl";
77-
static private final String CARDBOARD_GRADLE_BUILD_TEMPLATE = "CardboardBuild.gradle.tmpl";
77+
static private final String VR_GRADLE_BUILD_TEMPLATE = "VRBuild.gradle.tmpl";
7878

7979
// TODO: ask base package name when exporting signed apk
8080
// static final String basePackage = "changethispackage.beforesubmitting.tothemarket";
@@ -91,7 +91,7 @@ class AndroidBuild extends JavaBuild {
9191
// which allows us to exactly determine the size of the screen.
9292
static public final String min_sdk_fragment = "16"; // Jelly Bean (4.1)
9393
static public final String min_sdk_wallpaper = "16"; //
94-
static public final String min_sdk_cardboard = "19"; // KitKat (4.4)
94+
static public final String min_sdk_gvr = "19"; // KitKat (4.4)
9595
static public final String min_sdk_handheld = "21"; // Lollipop (5.0)
9696
static public final String min_sdk_watchface = "23"; // Marshmallow (6.0)
9797

@@ -269,7 +269,7 @@ public File createProject(String targetID, boolean wear)
269269
if (getAppComponent() == FRAGMENT) {
270270
copyAppCompatLib(targetID, tmpFolder, libsFolder);
271271
}
272-
if (getAppComponent() == CARDBOARD) {
272+
if (getAppComponent() == VR) {
273273
copyGVRLibs(targetID, libsFolder);
274274
}
275275

@@ -923,9 +923,9 @@ private void writeRes(File resFolder) throws SketchException {
923923
writeResStringsWallpaper(valuesFolder);
924924
}
925925

926-
if (comp == CARDBOARD) {
926+
if (comp == VR) {
927927
File valuesFolder = mkdirs(resFolder, "values");
928-
writeResStylesCardboard(valuesFolder);
928+
writeResStylesVR(valuesFolder);
929929
}
930930

931931
File sketchFolder = sketch.getFolder();
@@ -1099,8 +1099,8 @@ private void writeMainClass(final File srcDirectory, String renderer) {
10991099
} else {
11001100
writeWatchFaceCanvasService(srcDirectory, permissions);
11011101
}
1102-
} else if (comp == CARDBOARD) {
1103-
writeCardboardActivity(srcDirectory, permissions);
1102+
} else if (comp == VR) {
1103+
writeVRActivity(srcDirectory, permissions);
11041104
}
11051105
}
11061106

@@ -1155,8 +1155,8 @@ private void writeWatchFaceCanvasService(final File srcDirectory, String[] permi
11551155
}
11561156

11571157

1158-
private void writeCardboardActivity(final File srcDirectory, String[] permissions) {
1159-
File javaTemplate = mode.getContentFile("templates/" + CARDBOARD_ACTIVITY_TEMPLATE);
1158+
private void writeVRActivity(final File srcDirectory, String[] permissions) {
1159+
File javaTemplate = mode.getContentFile("templates/" + VR_ACTIVITY_TEMPLATE);
11601160
File javaFile = new File(new File(srcDirectory, getPackageName().replace(".", "/")), "MainActivity.java");
11611161

11621162
HashMap<String, String> replaceMap = new HashMap<String, String>();
@@ -1185,8 +1185,8 @@ private void writeResStylesFragment(final File valuesFolder) {
11851185
}
11861186

11871187

1188-
private void writeResStylesCardboard(final File valuesFolder) {
1189-
File xmlTemplate = mode.getContentFile("templates/" + STYLES_CARDBOARD_TEMPLATE);
1188+
private void writeResStylesVR(final File valuesFolder) {
1189+
File xmlTemplate = mode.getContentFile("templates/" + STYLES_VR_TEMPLATE);
11901190
File xmlFile = new File(valuesFolder, "styles.xml");
11911191
AndroidMode.createFileFromTemplate(xmlTemplate, xmlFile);
11921192
}
@@ -1360,9 +1360,9 @@ private void createAppModule(File projectFolder, File exportFolder, String build
13601360

13611361
String minSdk;
13621362
String tmplFile;
1363-
if (appComponent == CARDBOARD) {
1364-
minSdk = min_sdk_cardboard;
1365-
tmplFile = CARDBOARD_GRADLE_BUILD_TEMPLATE;
1363+
if (appComponent == VR) {
1364+
minSdk = min_sdk_gvr;
1365+
tmplFile = VR_GRADLE_BUILD_TEMPLATE;
13661366
} else {
13671367
minSdk = min_sdk_fragment;
13681368
tmplFile = APP_GRADLE_BUILD_TEMPLATE;
@@ -1389,9 +1389,9 @@ private void createAppModule(File projectFolder, File exportFolder, String build
13891389
File libsFolder = mkdirs(moduleFolder, "libs");
13901390
Util.copyFile(coreFile, new File(libsFolder, "processing-core.jar"));
13911391

1392-
if (appComponent == CARDBOARD) {
1393-
File cardboardFile = new File(projectFolder, "libs/cardboard.jar");
1394-
Util.copyFile(cardboardFile, new File(libsFolder, "cardboard.jar"));
1392+
if (appComponent == VR) {
1393+
File vrFile = new File(projectFolder, "libs/vr.jar");
1394+
Util.copyFile(vrFile, new File(libsFolder, "vr.jar"));
13951395
}
13961396

13971397
File mainFolder = mkdirs(moduleFolder, "src/main");
@@ -1551,15 +1551,15 @@ private void copyAppCompatLib(String targetID, File tmpFolder, File libsFolder)
15511551
}
15521552

15531553
private void copyGVRLibs(String targetID, File libsFolder) throws IOException {
1554-
// TODO: temporary hack until I find a better way to include the cardboard aar
1555-
// packages included in the cardboard SDK:
1554+
// TODO: temporary hack until I find a better way to include the VR aar
1555+
// packages included in the GVR SDK:
15561556

15571557
////////////////////////////////////////////////////////////////////////
1558-
// first step: unpack the cardboard packages in the project's
1558+
// first step: unpack the VR packages in the project's
15591559
// libs folder:
1560-
File baseZipFile = mode.getContentFile("libraries/cardboard/gvrsdk/" + gvr_sdk_version + "/sdk-base.zip");
1561-
File commonZipFile = mode.getContentFile("libraries/cardboard/gvrsdk/" + gvr_sdk_version + "/sdk-common.zip");
1562-
File audioZipFile = mode.getContentFile("libraries/cardboard/gvrsdk/" + gvr_sdk_version + "/sdk-audio.zip");
1560+
File baseZipFile = mode.getContentFile("libraries/vr/gvrsdk/" + gvr_sdk_version + "/sdk-base.zip");
1561+
File commonZipFile = mode.getContentFile("libraries/vr/gvrsdk/" + gvr_sdk_version + "/sdk-common.zip");
1562+
File audioZipFile = mode.getContentFile("libraries/vr/gvrsdk/" + gvr_sdk_version + "/sdk-audio.zip");
15631563
AndroidMode.extractFolder(baseZipFile, libsFolder, true);
15641564
AndroidMode.extractFolder(commonZipFile, libsFolder, true);
15651565
AndroidMode.extractFolder(audioZipFile, libsFolder, true);

‎src/processing/mode/android/AndroidEditor.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class AndroidEditor extends JavaEditor {
6161
private JCheckBoxMenuItem fragmentItem;
6262
private JCheckBoxMenuItem wallpaperItem;
6363
private JCheckBoxMenuItem watchfaceItem;
64-
private JCheckBoxMenuItem cardboardItem;
64+
private JCheckBoxMenuItem vrItem;
6565

6666
private static final String USB_DRIVER_TITLE = "USB Driver warning";
6767
private static final String USB_DRIVER_URL =
@@ -263,7 +263,7 @@ public void actionPerformed(ActionEvent e) {
263263
fragmentItem = new JCheckBoxMenuItem("App");
264264
wallpaperItem = new JCheckBoxMenuItem("Wallpaper");
265265
watchfaceItem = new JCheckBoxMenuItem("Watch Face");
266-
cardboardItem = new JCheckBoxMenuItem("Cardboard");
266+
vrItem = new JCheckBoxMenuItem("VR");
267267

268268
fragmentItem.addActionListener(new ActionListener() {
269269
@Override
@@ -272,7 +272,7 @@ public void actionPerformed(ActionEvent e) {
272272
fragmentItem.setState(true);
273273
wallpaperItem.setState(false);
274274
watchfaceItem.setSelected(false);
275-
cardboardItem.setSelected(false);
275+
vrItem.setSelected(false);
276276
androidMode.showSelectComponentMessage(AndroidBuild.FRAGMENT);
277277
}
278278
});
@@ -283,7 +283,7 @@ public void actionPerformed(ActionEvent e) {
283283
fragmentItem.setState(false);
284284
wallpaperItem.setState(true);
285285
watchfaceItem.setSelected(false);
286-
cardboardItem.setSelected(false);
286+
vrItem.setSelected(false);
287287
androidMode.showSelectComponentMessage(AndroidBuild.WALLPAPER);
288288
}
289289
});
@@ -294,31 +294,31 @@ public void actionPerformed(ActionEvent e) {
294294
fragmentItem.setState(false);
295295
wallpaperItem.setState(false);
296296
watchfaceItem.setSelected(true);
297-
cardboardItem.setSelected(false);
297+
vrItem.setSelected(false);
298298
androidMode.showSelectComponentMessage(AndroidBuild.WATCHFACE);
299299
}
300300
});
301-
cardboardItem.addActionListener(new ActionListener() {
301+
vrItem.addActionListener(new ActionListener() {
302302
@Override
303303
public void actionPerformed(ActionEvent e) {
304-
setAppComponent(AndroidBuild.CARDBOARD);
304+
setAppComponent(AndroidBuild.VR);
305305
fragmentItem.setState(false);
306306
wallpaperItem.setState(false);
307307
watchfaceItem.setSelected(false);
308-
cardboardItem.setSelected(true);
309-
androidMode.showSelectComponentMessage(AndroidBuild.CARDBOARD);
308+
vrItem.setSelected(true);
309+
androidMode.showSelectComponentMessage(AndroidBuild.VR);
310310
}
311311
});
312312

313313
fragmentItem.setState(false);
314314
wallpaperItem.setState(false);
315315
watchfaceItem.setSelected(false);
316-
cardboardItem.setSelected(false);
316+
vrItem.setSelected(false);
317317

318318
menu.add(fragmentItem);
319319
menu.add(wallpaperItem);
320320
menu.add(watchfaceItem);
321-
menu.add(cardboardItem);
321+
menu.add(vrItem);
322322

323323
menu.addSeparator();
324324

@@ -482,8 +482,8 @@ private void setAppComponent(int opt) {
482482
settings.set("component", "wallpaper");
483483
} else if (appComponent == AndroidBuild.WATCHFACE) {
484484
settings.set("component", "watchface");
485-
} else if (appComponent == AndroidBuild.CARDBOARD) {
486-
settings.set("component", "cardboard");
485+
} else if (appComponent == AndroidBuild.VR) {
486+
settings.set("component", "vr");
487487
}
488488
settings.save();
489489
}
@@ -805,9 +805,9 @@ private void loadModeSettings() {
805805
} else if (component.equals("watchface")) {
806806
appComponent = AndroidBuild.WATCHFACE;
807807
watchfaceItem.setState(true);
808-
} else if (component.equals("cardboard")) {
809-
appComponent = AndroidBuild.CARDBOARD;
810-
cardboardItem.setState(true);
808+
} else if (component.equals("vr")) {
809+
appComponent = AndroidBuild.VR;
810+
vrItem.setState(true);
811811
}
812812
} catch (IOException e) {
813813
System.err.println("While creating " + sketchProps + ": " + e.getMessage());

‎src/processing/mode/android/Commander.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class Commander implements RunnerListener {
5555
static final String targetArg_FRAGMENT = "fragment";
5656
static final String targetArg_WALLPAPER = "wallpaper";
5757
static final String targetArg_WATCHFACE = "watchface";
58-
static final String targetArg_CARDBOARD = "cardboard";
58+
static final String targetArg_VR = "vr";
5959
static final String sketchArg = "--sketch=";
6060
static final String forceArg = "--force";
6161
static final String outputArg = "--output=";
@@ -133,8 +133,8 @@ private void parseArgs(String[] args) {
133133
appComponent = AndroidBuild.WALLPAPER;
134134
} else if (compStr.equals(targetArg_WATCHFACE)) {
135135
appComponent = AndroidBuild.WATCHFACE;
136-
} else if (compStr.equals(targetArg_CARDBOARD)) {
137-
appComponent = AndroidBuild.CARDBOARD;
136+
} else if (compStr.equals(targetArg_VR)) {
137+
appComponent = AndroidBuild.VR;
138138
}
139139
} else if (arg.equals(buildArg)) {
140140
task = BUILD;

0 commit comments

Comments
 (0)