update to GVR 1.40.0

Author: codeanticode

libraries/vr/gvrsdk/1.20.0/sdk-audio.zip

@@ -38,7 +38,6 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 import android.content.pm.ConfigurationInfo;
 import android.content.res.AssetManager;
 import android.view.MotionEvent;
@@ -141,13 +140,7 @@ public String getName() {
 
   @Override
   public void setOrientation(int which) {
-    if (component.getKind() == AppComponent.FRAGMENT) {
-      if (which == PORTRAIT) {
-        activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-      } else if (which == LANDSCAPE) {
-        activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-      }
-    }
+    PGraphics.showWarning("Orientation in VR apps cannot be changed");
   }
 
   @Override

libraries/vr/gvrsdk/1.20.0/sdk-base.zip

@@ -17,7 +17,10 @@ nano=3.1.0
 
 mkdir ../libraries/vr/gvrsdk/$ver
 
-wget https://github.com/googlevr/gvr-android-sdk/archive/$sdk.zip
+#wget https://github.com/googlevr/gvr-android-sdk/archive/$sdk.zip
+
+# curl is the default on Mac now
+curl -o $sdk.zip -L https://github.com/googlevr/gvr-android-sdk/archive/$sdk.zip
 
 unzip $sdk.zip
 
@@ -26,6 +29,17 @@ unzip gvr-android-sdk-$ver/libraries/sdk-base-$ver.aar -d base.aar
 unzip gvr-android-sdk-$ver/libraries/sdk-common-$ver.aar -d common.aar
 unzip gvr-android-sdk-$ver/libraries/sdk-audio-$ver.aar -d audio.aar
 
+################################################
+# protobuf-javanano
+
+# protobuf-javanano was unbundled from the SDK:
+# https://github.com/googlevr/gvr-android-sdk/issues/264
+# but required by sdk-common, the correspond pom file alongside the aar contains the 
+# details of the dependency.
+#wget http://central.maven.org/maven2/com/google/protobuf/nano/protobuf-javanano/$nano/protobuf-javanano-$nano.jar
+nanojar=protobuf-javanano-$nano.jar
+curl -o $nanojar -L http://central.maven.org/maven2/com/google/protobuf/nano/protobuf-javanano/$nano/$nanojar
+
 ################################################
 # Base package
 mkdir sdk-base
@@ -56,7 +70,6 @@ cp sdk-base/libs/gvr-base.jar ../libraries/vr/lib
 zip -r sdk-base.zip sdk-base
 mv sdk-base.zip ../libraries/vr/gvrsdk/$ver
 
-
 ################################################
 # Common package
 mkdir sdk-common
@@ -78,12 +91,7 @@ jar cf gvr-common.jar -C sdk-common/libs/common .
 rm -Rf sdk-common/libs/common
 mv gvr-common.jar sdk-common/libs
 
-# protobuf-javanano was unbundled from the SDK:
-# https://github.com/googlevr/gvr-android-sdk/issues/264
-# but required by sdk-common, the correspond pom file alongside the aar contains the 
-# details of the dependency.
-wget http://central.maven.org/maven2/com/google/protobuf/nano/protobuf-javanano/$nano/protobuf-javanano-$nano.jar
-mv protobuf-javanano-$nano.jar sdk-common/libs
+mv $nanojar sdk-common/libs
 
 # Need the jar also in VR's lib folder
 cp sdk-common/libs/gvr-common.jar ../libraries/vr/lib

libraries/vr/gvrsdk/1.20.0/sdk-common.zip

@@ -106,7 +106,7 @@ class AndroidBuild extends JavaBuild {
   static public final String support_version = "25.2.0";
   static public final String play_services_version = "10.2.0";  
   static public final String wear_version = "2.0.0";
-  static public final String gvr_sdk_version = "1.20.0";
+  static public final String gvr_sdk_version = "1.40.0";
 
   private boolean runOnEmulator = false;
   private int appComponent = FRAGMENT;
@@ -1556,7 +1556,8 @@ private void copyGVRLibs(String targetID, File libsFolder) throws IOException {
 
     ////////////////////////////////////////////////////////////////////////
     // first step: unpack the VR packages in the project's 
-    // libs folder:        
+    // libs folder:
+    PApplet.println("GVR version to use", gvr_sdk_version);
     File baseZipFile = mode.getContentFile("libraries/vr/gvrsdk/" + gvr_sdk_version + "/sdk-base.zip");
     File commonZipFile = mode.getContentFile("libraries/vr/gvrsdk/" + gvr_sdk_version + "/sdk-common.zip");
     File audioZipFile = mode.getContentFile("libraries/vr/gvrsdk/" + gvr_sdk_version + "/sdk-audio.zip");