import local google-vr project so the vr library works for now

codeanticode · codeanticode · commit 347abacafe9b · 2023-03-26T23:04:54.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -150,6 +150,8 @@ task dist {
                                 file("${root}/libraries/vr/examples"))
         FileUtils.copyDirectory(file("mode/libraries/vr/library"), 
                                 file("${root}/libraries/vr/library"))
+        FileUtils.copyDirectory(file("mode/libraries/vr/libs"), 
+                                file("${root}/libraries/vr/libs"))
         FileUtils.copyDirectory(file("mode/libraries/vr/src"), 
                                 file("${root}/libraries/vr/src"))
         Files.copy(file("mode/libraries/vr/library.properties").toPath(),
diff --git a/debug/apps/vrcube/build.gradle b/debug/apps/vrcube/build.gradle
@@ -30,5 +30,6 @@ dependencies {
     implementation project(':libs:processing-core')
     implementation project(':libs:google-vr')
     implementation project(':libs:processing-vr')
+    implementation 'com.google.protobuf.nano:protobuf-javanano:3.1.0'
     implementation 'androidx.appcompat:appcompat:1.6.0'
 }
diff --git a/debug/apps/vrcube/src/main/java/vrcube/MainActivity.java b/debug/apps/vrcube/src/main/java/vrcube/MainActivity.java
@@ -1,6 +1,8 @@
 package vrcube;
 
+import android.os.Build;
 import android.os.Bundle;
+import android.view.WindowManager;
 
 import processing.vr.VRActivity;
 import processing.core.PApplet;
@@ -9,6 +11,12 @@ public class MainActivity extends VRActivity {
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      getWindow().setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+      getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+    }
+
     PApplet sketch = new Sketch();
     setSketch(sketch);
   }
diff --git a/debug/build.gradle b/debug/build.gradle
@@ -25,17 +25,8 @@ allprojects {
         // Needed to get google-vr dependencies
         maven { url 'https://repo.gradle.org/gradle/libs-releases' }
 
-        // Using the legacy Google VR libs included in the mode's VR library, since they are no
-        // longer available online
-//        flatDir {
-//            dirs '../mode/libraries/vr/libs'
-//        }
-
         mavenCentral()
         google()
-
-        google()
-        mavenCentral()
     }
 }
 
diff --git a/debug/libs/google-vr/build.gradle b/debug/libs/google-vr/build.gradle
@@ -4,7 +4,4 @@
 configurations.maybeCreate("default")
 artifacts.add("default", file('sdk-audio-1.180.0.aar'))
 artifacts.add("default", file('sdk-base-1.180.0.aar'))
-artifacts.add("default", file('sdk-common-1.180.0.aar'))
-
-// https://mvnrepository.com/artifact/com.google.protobuf.nano/protobuf-javanano/3.1.0
-//artifacts.add("default", file('protobuf-javanano-3.1.0.jar'))
+artifacts.add("default", file('sdk-common-1.180.0.aar'))
diff --git a/debug/libs/google-vr/protobuf-javanano-3.1.0.jar b/debug/libs/google-vr/protobuf-javanano-3.1.0.jar
diff --git a/mode/.project b/mode/.project
@@ -22,12 +22,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1650246874247</id>
+			<id>1675640664215</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>
diff --git a/mode/libraries/vr/build.gradle b/mode/libraries/vr/build.gradle
@@ -1,4 +1,5 @@
 import java.nio.file.Files
+// import org.apache.commons.io.FileUtils
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
 
 plugins {
@@ -14,7 +15,7 @@ dependencies {
 //    implementationAar "com.google.vr:sdk-base:${gvrVersion}"
 
 // fix for Issue #718
-    implementationAar fileTree(dir: "libs", include: ["*.aar"])
+    implementationAar fileTree(dir: "libs/google-vr", include: ["*.aar"])
 }
 
 task sourceJar(type: Jar, dependsOn: classes) {
@@ -73,8 +74,12 @@ build.doLast {
 
     if (file("$buildDir/libs/vr.jar").exists()) {
         Files.copy(file("$buildDir/libs/vr.jar").toPath(),
-                vrJar.toPath(), REPLACE_EXISTING);
+                   vrJar.toPath(), REPLACE_EXISTING);
     }
+
+    // FileUtils.copyDirectory(file("libs/google-vr"), 
+    //                         file("$buildDir/libs/google-vr"))
+
     // Renaming artifacts for maven publishing
     if (file("$buildDir/libs/vr.jar").exists()) {
         Files.move(file("$buildDir/libs/vr.jar").toPath(),
diff --git a/mode/libraries/vr/libs/google-vr/build.gradle b/mode/libraries/vr/libs/google-vr/build.gradle
@@ -0,0 +1,7 @@
+// Dummy Gradle project to be able to import local aar files:
+// https://stackoverflow.com/a/60888941
+
+configurations.maybeCreate("default")
+artifacts.add("default", file('sdk-audio-1.180.0.aar'))
+artifacts.add("default", file('sdk-base-1.180.0.aar'))
+artifacts.add("default", file('sdk-common-1.180.0.aar'))
diff --git a/mode/libraries/vr/libs/google-vr/sdk-audio-1.180.0.aar b/mode/libraries/vr/libs/google-vr/sdk-audio-1.180.0.aar
diff --git a/mode/libraries/vr/libs/google-vr/sdk-base-1.180.0.aar b/mode/libraries/vr/libs/google-vr/sdk-base-1.180.0.aar
diff --git a/mode/libraries/vr/libs/google-vr/sdk-common-1.180.0.aar b/mode/libraries/vr/libs/google-vr/sdk-common-1.180.0.aar
diff --git a/mode/mode.properties b/mode/mode.properties
@@ -4,7 +4,7 @@ url = https://android.processing.org
 sentence = This mode lets you use Processing to create Android apps
 paragraph =
 imports=processing.mode.java.JavaMode
-version = 410
-prettyVersion = 4.5
+version = 411
+prettyVersion = 4.5.1
 minRevision = 1283
 maxRevision = 0
diff --git a/mode/src/processing/mode/android/AndroidBuild.java b/mode/src/processing/mode/android/AndroidBuild.java
@@ -26,7 +26,6 @@
 
 import processing.app.Base;
 import processing.app.Library;
-import processing.app.Messages;
 import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.Sketch;
@@ -394,7 +393,13 @@ private void createTopModule(String projectModules, String keyPassword)
     File settingsTemplate = mode.getContentFile("templates/" + GRADLE_SETTINGS_TEMPLATE);
     File settingsFile = new File(tmpFolder, "settings.gradle");
     replaceMap.clear();
-    replaceMap.put("@@project_modules@@", projectModules);
+    if (getAppComponent() == VR) {
+      // The local google-vr has to be added to the settings to fix Issue #718
+      replaceMap.put("@@project_modules@@", projectModules + ", ':app:libs:google-vr'");      
+    } else {
+      replaceMap.put("@@project_modules@@", projectModules);
+    }
+    
     AndroidUtil.createFileFromTemplate(settingsTemplate, settingsFile, replaceMap);
     
     File localPropsTemplate = mode.getContentFile("templates/" + LOCAL_PROPERTIES_TEMPLATE);
@@ -476,15 +481,10 @@ private void createAppModule(String moduleName)
     copyImportedLibs(libsFolder, mainFolder, assetsFolder);
     copyCodeFolder(libsFolder);
 
-    // Copy any system libraries needed by the project
-//    copyWearLib(libsFolder);
-//    copySupportLibs(libsFolder);
-//    if (getAppComponent() == APP) {
-//      copyAppCompatLib(libsFolder);
-//    }
-//    if (getAppComponent() == VR) {
-//      copyGVRLibs(libsFolder);
-//    }
+    if (getAppComponent() == VR) {
+      // Need to call this to fix Issue #718
+      copyGVRLibs(libsFolder);
+    }
 
     // Copy the data folder (if one exists) to the project's 'assets' folder
     final File sketchDataFolder = sketch.getDataFolder();
@@ -853,7 +853,6 @@ private void copyImportedLibs(final File libsFolder,
       }
     }
   }
-  
 
   private void copyImportedLib(final File libsFolder, 
                                final File mainFolder,
@@ -900,6 +899,15 @@ else if (exportName.equals("jniLibs")) {
     }
   }
 
+  /**
+   * Copy the dummy Gradle project containing aar files from Google VR,
+   * so they can be imported locally from the project
+   */  
+  private void copyGVRLibs(final File libsFolder) throws IOException {
+    File srcFolder = new File(mode.getFolder(), "libraries/vr/libs/google-vr");
+    File dstFolder = new File(libsFolder, "google-vr");
+    Util.copyDir(srcFolder, dstFolder);
+  }
   
   private void copyCodeFolder(final File libsFolder) throws IOException {
     // Copy files from the 'code' directory into the 'libs' folder
diff --git a/mode/templates/VRActivity.java.tmpl b/mode/templates/VRActivity.java.tmpl
@@ -1,6 +1,8 @@
 package @@package_name@@;
 
+import android.os.Build;
 import android.os.Bundle;
+import android.view.WindowManager;
 
 import processing.vr.VRActivity;
 import processing.core.PApplet;
@@ -9,6 +11,12 @@ public class MainActivity extends VRActivity {
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      // This is to ensure that the app shows in fullscreen mode with display cutout:
+      // https://stackoverflow.com/questions/49190381/fullscreen-app-with-displaycutout
+      getWindow().setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+      getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+    }
     PApplet sketch = new @@sketch_class_name@@();
     @@external@@
     setSketch(sketch);
diff --git a/mode/templates/VRBuild.gradle.tmpl b/mode/templates/VRBuild.gradle.tmpl
@@ -49,10 +49,10 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:@@appcompat_version@@'
-    implementation 'com.google.vr:sdk-audio:@@gvr_version@@'
-    implementation 'com.google.vr:sdk-base:@@gvr_version@@'
+    implementation project('libs:google-vr')
     implementation files('libs/processing-core.jar')
     implementation files('libs/vr.jar')
+    implementation 'com.google.protobuf.nano:protobuf-javanano:3.1.0'
     androidTestImplementation 'com.android.support.test:runner:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     testImplementation 'junit:junit:4.13'
diff --git a/mode/templates/VRBuildECJ.gradle.tmpl b/mode/templates/VRBuildECJ.gradle.tmpl
@@ -98,8 +98,8 @@ dependencies {
     compileOnly files('@@mode_folder@@/org.eclipse.jdt.core.jar')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:@@appcompat_version@@'
-    implementation 'com.google.vr:sdk-audio:@@gvr_version@@'
-    implementation 'com.google.vr:sdk-base:@@gvr_version@@'
+    implementation project('libs:google-vr')
     implementation files('libs/processing-core.jar')
     implementation files('libs/vr.jar')
+    implementation 'com.google.protobuf.nano:protobuf-javanano:3.1.0'
 }
diff --git a/mode/tools/SDKUpdater/.project b/mode/tools/SDKUpdater/.project
@@ -22,12 +22,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1650246874238</id>
+			<id>1675640664206</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,6 @@ dependencies {`
`30`	`30`	`implementation project(':libs:processing-core')`
`31`	`31`	`implementation project(':libs:google-vr')`
`32`	`32`	`implementation project(':libs:processing-vr')`
	`33`	`+ implementation 'com.google.protobuf.nano:protobuf-javanano:3.1.0'`
`33`	`34`	`implementation 'androidx.appcompat:appcompat:1.6.0'`
`34`	`35`	`}`