Sceneform SDK v1.6.0

google-ar · Dec 6, 2018 · 26185e7 · 26185e7
1 parent ae9d3fa
commit 26185e7
Show file tree

Hide file tree

Showing 57 changed files with 6,240 additions and 198 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,29 @@
+# How to Contribute
+
+We'd love to accept your patches and contributions to the source code included
+in this project. There are just a few small guidelines you need to follow.
+
+## Contributor License Agreement
+
+Contributions to this project must be accompanied by a Contributor License
+Agreement. You (or your employer) retain the copyright to your contribution;
+this simply gives us permission to use and redistribute your contributions as
+part of the project. Head over to <https://cla.developers.google.com/> to see
+your current agreements on file or to sign a new one.
+
+You generally only need to submit a CLA once, so if you've already submitted one
+(even if it was for a different project), you probably don't need to do it
+again.
+
+## Code reviews
+
+Although we do not use the normal GitHub pull request process to incorporate
+contributions, it's okay to send us pull requests. Once we have received your
+CLA we will review and consider your contribution for inclusion in a future
+release of the SDK.
+
+## Community Guidelines
+
+This project follows
+[Google's Open Source Community
+Guidelines](https://opensource.google.com/conduct/).
diff --git a/samples/augmentedimage/app/build.gradle b/samples/augmentedimage/app/build.gradle
@@ -19,23 +19,18 @@ android {
     defaultConfig {
         applicationId "com.google.ar.sceneform.samples.augmentedimage"
 
-        // 24 is the minimum since Sceneform requires Android N.
+        // Sceneform requires minSdkVersion >= 24.
         minSdkVersion 24
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
-
-      ndk {
-        /*
-         * Sceneform is available for the following ABIs: arm64-v8a, armeabi-v7a,
-         * x86_64 and x86. This sample app enables arm64-v8a to run on
-         * devices and x86 to run on the emulator. Your application should
-         * list the ABIs most appropriate to minimize APK size (arm64-v8a recommended).
-         */
-        abiFilters 'arm64-v8a', 'x86'
-      }
     }
-
+    // Sceneform libraries use language constructs from Java 8.
+    // Add these compile options if targeting minSdkVersion < 26.
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -52,10 +47,10 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support:design:27.1.1'
 
-    // Use the Sceneform Ux Package pre-built from Maven.
-    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.5.1"
+    // Use the Sceneform UX Package pre-built from Maven.
+    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.6.0"
 
-    // Use the Sceneform Ux Package built from the source files included in the sceneformux folder.
+    // Use the Sceneform UX Package built from the source files included in the sceneformux folder.
     //api project(":sceneformux")
 }
 

diff --git a/samples/augmentedimage/build.gradle b/samples/augmentedimage/build.gradle
@@ -23,7 +23,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.google.ar.sceneform:plugin:1.5.1'
+        classpath 'com.google.ar.sceneform:plugin:1.6.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/samples/augmentedimage/gradle/wrapper/gradle-wrapper.jar b/samples/augmentedimage/gradle/wrapper/gradle-wrapper.jar
diff --git a/samples/chromakeyvideo/app/build.gradle b/samples/chromakeyvideo/app/build.gradle
@@ -19,21 +19,14 @@ android {
     defaultConfig {
         applicationId "com.google.ar.sceneform.samples.chromakeyvideo"
 
-        // 24 is the minimum since ARCore only works with 24 and higher.
+        // Sceneform requires minSdkVersion >= 24.
         minSdkVersion 24
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
-        ndk {
-            /*
-             * Sceneform is available for the following ABIs: arm64-v8a, armeabi-v7a,
-             * x86_64 and x86. This sample app enables arm64-v8a to run on
-             * devices and x86 to run on the emulator. Your application should
-             * list the ABIs most appropriate to minimize APK size (arm64-v8a recommended).
-             */
-            abiFilters 'arm64-v8a', 'x86'
-        }
     }
+    // Sceneform libraries use language constructs from Java 8.
+    // Add these compile options if targeting minSdkVersion < 26.
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -54,10 +47,10 @@ dependencies {
     implementation "com.android.support:appcompat-v7:27.1.1"
     implementation "com.android.support:design:27.1.1"
 
-    // Use the Sceneform Ux Package pre-built from Maven.
-    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.5.1"
+    // Use the Sceneform UX Package pre-built from Maven.
+    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.6.0"
 
-    // Use the Sceneform Ux Package built from the source files included in the sceneformux folder.
+    // Use the Sceneform UX Package built from the source files included in the sceneformux folder.
     //api project(":sceneformux")
 }
 

diff --git a/samples/chromakeyvideo/app/sampledata/models/chroma_key_video_material.mat b/samples/chromakeyvideo/app/sampledata/models/chroma_key_video_material.mat
@@ -26,6 +26,10 @@ material {
             // The color to filter out of the video.
             "type" : "float4",
             "name" : "keyColor"
+        },
+        {
+            "type" : "bool",
+            "name" : "disableChromaKey",
         }
     ],
     "requires" : [
@@ -58,19 +62,24 @@ fragment {
           uv.x = 1.0 - uv.x;
         }
 
-        vec3 color = texture(materialParams_videoTexture, uv).rgb;
-        vec3 keyColor = materialParams.keyColor.rgb;
+        vec4 color = texture(materialParams_videoTexture, uv).rgba;
 
-        float threshold = 0.675;
-        float slope = 0.2;
+        if (!materialParams.disableChromaKey) {
+            vec3 keyColor = materialParams.keyColor.rgb;
 
-        float distance = abs(length(abs(keyColor - color)));
-        float edge0 = threshold * (1.0 - slope);
-        float alpha = smoothstep(edge0, threshold, distance);
-        color = desaturate(color, 1.0 - (alpha * alpha * alpha));
+            float threshold = 0.675;
+            float slope = 0.2;
 
-        material.baseColor.a = alpha;
-        material.baseColor.rgb = inverseTonemapSRGB(color);
-        material.baseColor.rgb *= material.baseColor.a;
+            float distance = abs(length(abs(keyColor - color.rgb)));
+            float edge0 = threshold * (1.0 - slope);
+            float alpha = smoothstep(edge0, threshold, distance);
+            color.rgb = desaturate(color.rgb, 1.0 - (alpha * alpha * alpha));
+
+            material.baseColor.a = alpha;
+            material.baseColor.rgb = inverseTonemapSRGB(color.rgb);
+            material.baseColor.rgb *= material.baseColor.a;
+        } else {
+            material.baseColor = color;
+        }
     }
 }
diff --git a/samples/chromakeyvideo/build.gradle b/samples/chromakeyvideo/build.gradle
@@ -23,7 +23,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.google.ar.sceneform:plugin:1.5.1'
+        classpath 'com.google.ar.sceneform:plugin:1.6.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/samples/chromakeyvideo/gradle/wrapper/gradle-wrapper.jar b/samples/chromakeyvideo/gradle/wrapper/gradle-wrapper.jar
diff --git a/samples/hellosceneform/app/build.gradle b/samples/hellosceneform/app/build.gradle
@@ -19,25 +19,11 @@ android {
     defaultConfig {
         applicationId "com.google.ar.sceneform.samples.hellosceneform"
 
-        // AR Optional apps must declare minSdkVersion >= 14.
-        // AR Required apps must declare minSdkVersion >= 24.
+        // Sceneform requires minSdkVersion >= 24.
         minSdkVersion 24
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
-        ndk {
-            /*
-             * Sceneform is available for the following ABIs:
-             * 'arm64-v8a', 'armeabi-v7a', 'x86_64' and 'x86'.
-             * Your application should include the ABIs most appropriate to
-             * minimize APK size. Listing 'arm64-v8a' is recommended.
-             *
-             * This sample app includes two ABIs:
-             * 1. 'arm64-v8a' to run on devices
-             * 2. 'x86' to run in the Android emulator
-             */
-            abiFilters 'arm64-v8a', 'x86'
-        }
     }
     // Sceneform libraries use language constructs from Java 8.
     // Add these compile options if targeting minSdkVersion < 26.
@@ -60,13 +46,13 @@ android {
 dependencies {
 
     // Provides ArFragment, and other Sceneform UX resources:
-    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.5.1"
+    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.6.0"
 
-    // Use the Sceneform Ux Package built from the source files included in the sceneformux folder.
+    // Use the Sceneform UX Package built from the source files included in the sceneformux folder.
     //api project(":sceneformux")
 
     // Alternatively, use ArSceneView without the UX dependency.
-    //implementation "com.google.ar.sceneform:core:1.5.1"
+    //implementation "com.google.ar.sceneform:core:1.6.0"
 
     implementation "com.android.support:appcompat-v7:27.1.1"
 }

diff --git a/samples/hellosceneform/build.gradle b/samples/hellosceneform/build.gradle
@@ -23,7 +23,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.google.ar.sceneform:plugin:1.5.1'
+        classpath 'com.google.ar.sceneform:plugin:1.6.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/samples/hellosceneform/gradle/wrapper/gradle-wrapper.jar b/samples/hellosceneform/gradle/wrapper/gradle-wrapper.jar
diff --git a/samples/solarsystem/app/build.gradle b/samples/solarsystem/app/build.gradle
@@ -19,21 +19,14 @@ android {
     defaultConfig {
         applicationId "com.google.ar.sceneform.samples.solarsystem"
 
-        // 24 is the minimum since ARCore only works with 24 and higher.
+        // Sceneform requires minSdkVersion >= 24.
         minSdkVersion 24
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
-        ndk {
-            /*
-             * Sceneform is available for the following ABIs: arm64-v8a, armeabi-v7a,
-             * x86_64 and x86. This sample app enables arm64-v8a to run on
-             * devices and x86 to run on the emulator. Your application should
-             * list the ABIs most appropriate to minimize APK size (arm64-v8a recommended).
-             */
-            abiFilters 'arm64-v8a','x86'
-        }
     }
+    // Sceneform libraries use language constructs from Java 8.
+    // Add these compile options if targeting minSdkVersion < 26.
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -51,7 +44,7 @@ android {
 }
 
 dependencies {
-  implementation "com.google.ar.sceneform:core:1.5.1"
+  implementation "com.google.ar.sceneform:core:1.6.0"
   implementation "com.android.support:appcompat-v7:27.1.1"
   implementation "com.android.support:design:27.1.1"
 }

diff --git a/samples/solarsystem/app/sampledata/models/Earth/Earth.sfa b/samples/solarsystem/app/sampledata/models/Earth/Earth.sfa
@@ -58,9 +58,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },
@@ -125,9 +122,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },

diff --git a/samples/solarsystem/app/sampledata/models/Jupiter/Jupiter.sfa b/samples/solarsystem/app/sampledata/models/Jupiter/Jupiter.sfa
@@ -58,9 +58,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },
@@ -125,9 +122,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },

diff --git a/samples/solarsystem/app/sampledata/models/Luna/Luna.sfa b/samples/solarsystem/app/sampledata/models/Luna/Luna.sfa
@@ -58,9 +58,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },

diff --git a/samples/solarsystem/app/sampledata/models/Mars/Mars.sfa b/samples/solarsystem/app/sampledata/models/Mars/Mars.sfa
@@ -58,9 +58,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },
@@ -125,9 +122,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },

diff --git a/samples/solarsystem/app/sampledata/models/Mercury/Mercury.sfa b/samples/solarsystem/app/sampledata/models/Mercury/Mercury.sfa
@@ -58,9 +58,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },

diff --git a/samples/solarsystem/app/sampledata/models/Neptune/Neptune.sfa b/samples/solarsystem/app/sampledata/models/Neptune/Neptune.sfa
@@ -58,9 +58,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },
@@ -125,9 +122,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },

diff --git a/samples/solarsystem/app/sampledata/models/Saturn/Saturn.sfa b/samples/solarsystem/app/sampledata/models/Saturn/Saturn.sfa
@@ -58,9 +58,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },
@@ -125,9 +122,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },
@@ -192,9 +186,6 @@
         {
           emissive: null,
         },
-        {
-          reflectance: null,
-        },
         {
           opacity: null,
         },
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,9 +58,6 @@ @@
             {
               emissive: null,
             },
-            {
-              reflectance: null,
-            },
             {
               opacity: null,
             },
@@ Expand Down @@