Merge branch 'master' of https://github.com/NolaDonato/GearVRf into s…

…tatesort
NolaDonato · Jun 20, 2018 · 2602799 · 2602799
2 parents 75c0f73 + 04afe46
commit 2602799
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 20 deletions.
diff --git a/GVRf/Extensions/settings.gradle b/GVRf/Extensions/settings.gradle
@@ -43,6 +43,8 @@ project(':ResonanceAudio').projectDir = new File('ResonanceAudio/resonanceaudio'
 include ':x3d'
 project(':x3d').projectDir = new File('x3d')
 
-include ':platformsdk_support'
-project(':platformsdk_support').projectDir = new File('platformsdk_support')
+if (hasProperty('OVR_PLATFORM_SDK')){
+    include ':platformsdk_support'
+    project(':platformsdk_support').projectDir = new File('platformsdk_support')
+}
 
diff --git a/GVRf/Framework/backend_daydream/build.gradle b/GVRf/Framework/backend_daydream/build.gradle
@@ -59,12 +59,12 @@ project.ext.jomlVersion = "1.9.3-SNAPSHOT"
 project.ext.daydreamVersion = '1.130.0'
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile fileTree(include: ['*.jar'], dir: 'src/main/libs')
-    compile "com.google.vr:sdk-base:${daydreamVersion}"
-    compile "com.google.vr:sdk-controller:${daydreamVersion}"
-    compile project(':framework')
-    compile "org.joml:joml-android:${jomlVersion}"
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar'], dir: 'src/main/libs')
+    implementation "com.google.vr:sdk-base:${daydreamVersion}"
+    implementation "com.google.vr:sdk-controller:${daydreamVersion}"
+    implementation project(':framework')
+    implementation "org.joml:joml-android:${jomlVersion}"
 }
 
 clean {}.doLast {

diff --git a/GVRf/Framework/backend_monoscopic/build.gradle b/GVRf/Framework/backend_monoscopic/build.gradle
@@ -122,10 +122,10 @@ android {
 project.ext.jomlVersion = "1.9.1-SNAPSHOT"
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile fileTree(include: ['*.jar'], dir: 'src/main/libs')
-    compile project(':framework')
-    compile "org.joml:joml-android:${jomlVersion}"
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar'], dir: 'src/main/libs')
+    implementation project(':framework')
+    implementation "org.joml:joml-android:${jomlVersion}"
 }
 
 clean {}.doLast {

diff --git a/GVRf/Framework/backend_oculus/build.gradle b/GVRf/Framework/backend_oculus/build.gradle
@@ -124,10 +124,10 @@ android {
 project.ext.jomlVersion = "1.9.3-SNAPSHOT"
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile fileTree(include: ['*.jar'], dir: 'src/main/libs')
-    compile project(':framework')
-    compile "org.joml:joml-android:${jomlVersion}"
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar'], dir: 'src/main/libs')
+    implementation project(':framework')
+    implementation "org.joml:joml-android:${jomlVersion}"
 }
 
 clean {}.doLast {

diff --git a/GVRf/Framework/framework/build.gradle b/GVRf/Framework/framework/build.gradle
@@ -115,10 +115,10 @@ project.ext.jomlVersion = "1.9.3-SNAPSHOT"
 project.ext.gsonVersion = '2.8.2'
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile fileTree(dir: 'src/main/libs', include: ['*.jar'])
-    compile "org.joml:joml-android:${jomlVersion}"
-    compile "com.google.code.gson:gson:$gsonVersion"
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'src/main/libs', include: ['*.jar'])
+    api "org.joml:joml-android:${jomlVersion}"
+    implementation "com.google.code.gson:gson:$gsonVersion"
 }
 
 clean {}.doLast {

diff --git a/GVRf/Framework/framework/src/main/java/org/gearvrf/GVRShaderTemplate.java b/GVRf/Framework/framework/src/main/java/org/gearvrf/GVRShaderTemplate.java
@@ -425,6 +425,7 @@ private String assignTexcoords(GVRShaderData mtl)
      * @param scene
      *            scene being rendered
      */
+    @Override
     public int bindShader(GVRContext context, IRenderable rdata, GVRScene scene, boolean isMultiview)
     {
         GVRMesh mesh = rdata.getMesh();