Skip to content

Commit 6433aca

Browse files
committed
added features for cardboard
1 parent b243917 commit 6433aca

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

src/processing/mode/android/AndroidBuild.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,21 @@ public File createProject() throws IOException, SketchException {
229229
Util.copyFile(wearJarFile, new File(libsFolder, "wearable-1.3.0-classes.jar"));
230230
}
231231

232+
if (publishOption == CARDBOARD) {
233+
// TODO: temporary hack until I find a better way to include the cardboard aar
234+
// packages included in the cardboard SDK:
235+
236+
File audioJarFile = mode.getContentFile("mode/cardboard-audio-classes.jar");
237+
File commonJarFile = mode.getContentFile("mode/cardboard-common-classes.jar");
238+
File coreJarFile = mode.getContentFile("mode/cardboard-core-classes.jar");
239+
240+
Util.copyFile(audioJarFile, new File(libsFolder, "cardboard-audio-classes.jar"));
241+
Util.copyFile(commonJarFile, new File(libsFolder, "cardboard-common-classes.jar"));
242+
Util.copyFile(coreJarFile, new File(libsFolder, "cardboard-core-classes.jar"));
243+
}
244+
245+
246+
232247
// Copy the data folder (if one exists) to the project's 'assets' folder
233248
final File sketchDataFolder = sketch.getDataFolder();
234249
if (sketchDataFolder.exists()) {

src/processing/mode/android/Manifest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,12 @@ private void writeBlankManifest(final File file) {
181181
writer.println(" <uses-feature android:name=\"android.hardware.type.watch\" />" + newLine);
182182
writer.println(" <uses-permission android:name=\"com.google.android.permission.PROVIDE_BACKGROUND\" />" + newLine);
183183
writer.println(" <uses-permission android:name=\"android.permission.WAKE_LOCK\" />" + newLine);
184-
} else if (AndroidBuild.publishOption == AndroidBuild.CARDBOARD) {
184+
} else if (AndroidBuild.publishOption == AndroidBuild.CARDBOARD) {
185+
writer.println(" <uses-permission android:name=\"android.permission.INTERNET\" />" + newLine);
186+
writer.println(" <uses-permission android:name=\"android.permission.NFC\" />" + newLine);
187+
writer.println(" <uses-permission android:name=\"android.permission.VIBRATE\" />" + newLine);
188+
writer.println(" <uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />" + newLine);
189+
writer.println(" <uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />" + newLine);
185190
writer.println(" <uses-feature android:name=\"android.hardware.sensor.accelerometer\" android:required=\"true\" />" + newLine);
186191
writer.println(" <uses-feature android:name=\"android.hardware.sensor.gyroscope\" android:required=\"true\" />" + newLine);
187192
writer.println(" <uses-feature android:glEsVersion=\"0x00020000\" android:required=\"true\" />" + newLine);
@@ -244,7 +249,7 @@ private void writeBlankManifest(final File file) {
244249
writer.println("</service> " + newLine);
245250
} else if (AndroidBuild.publishOption == AndroidBuild.CARDBOARD) {
246251
writer.println("<activity android:name=\".MainActivity\" " + newLine);
247-
writer.println(" android:label=\"\" " + newLine); // insert pretty name
252+
// writer.println(" android:label=\"\" " + newLine); // insert pretty name
248253
writer.println(" android:screenOrientation=\"landscape\" " + newLine);
249254
writer.println(" android:configChanges=\"orientation|keyboardHidden|screenSize\" > " + newLine);
250255
writer.println(" <intent-filter>" + newLine);

0 commit comments

Comments
 (0)