Sceneform SDK v1.9.0

google-ar · May 7, 2019 · 4b24cff · 4b24cff
1 parent d7a504a
commit 4b24cff
Show file tree

Hide file tree

Showing 22 changed files with 7,332 additions and 7,325 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/NOTICE b/NOTICE
diff --git a/samples/animation/app/build.gradle b/samples/animation/app/build.gradle
@@ -26,8 +26,8 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
     // Sceneform
-    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.8.0"
-    implementation "com.google.ar.sceneform:animation:1.8.0"
+    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.9.0"
+    implementation "com.google.ar.sceneform:animation:1.9.0"
     implementation 'com.android.support:design:28.0.0'
 }
 

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

diff --git a/samples/augmentedfaces/app/build.gradle b/samples/augmentedfaces/app/build.gradle
@@ -42,13 +42,13 @@ android {
 dependencies {
 
     // Provides ArFragment, and other Sceneform UX resources:
-    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.8.0"
+    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.9.0"
 
     // 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.8.0"
+    //implementation "com.google.ar.sceneform:core:1.9.0"
 
     implementation "com.android.support:appcompat-v7:28.0.0"
 }

diff --git a/.../src/main/java/com/google/ar/sceneform/samples/augmentedfaces/AugmentedFacesActivity.java b/.../src/main/java/com/google/ar/sceneform/samples/augmentedfaces/AugmentedFacesActivity.java
@@ -139,8 +139,8 @@ protected void onCreate(Bundle savedInstanceState) {
   public static boolean checkIsSupportedDeviceOrFinish(final Activity activity) {
     if (ArCoreApk.getInstance().checkAvailability(activity)
         == ArCoreApk.Availability.UNSUPPORTED_DEVICE_NOT_CAPABLE) {
-      Log.e(TAG, "Augmented Faces requires ArCore.");
-      Toast.makeText(activity, "Augmented Faces requires ArCore", Toast.LENGTH_LONG).show();
+      Log.e(TAG, "Augmented Faces requires ARCore.");
+      Toast.makeText(activity, "Augmented Faces requires ARCore", Toast.LENGTH_LONG).show();
       activity.finish();
       return false;
     }

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

diff --git a/samples/augmentedimage/app/build.gradle b/samples/augmentedimage/app/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     implementation 'com.android.support:design:28.0.0'
 
     // Use the Sceneform UX Package pre-built from Maven.
-    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.8.0"
+    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.9.0"
 
     // 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.3.0'
-        classpath 'com.google.ar.sceneform:plugin:1.8.0'
+        classpath 'com.google.ar.sceneform:plugin:1.9.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/samples/chromakeyvideo/app/build.gradle b/samples/chromakeyvideo/app/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation "com.android.support:design:28.0.0"
 
     // Use the Sceneform UX Package pre-built from Maven.
-    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.8.0"
+    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.9.0"
 
     // Use the Sceneform UX Package built from the source files included in the sceneformux folder.
     //api project(":sceneformux")

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.3.0'
-        classpath 'com.google.ar.sceneform:plugin:1.8.0'
+        classpath 'com.google.ar.sceneform:plugin:1.9.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/samples/hellosceneform/app/build.gradle b/samples/hellosceneform/app/build.gradle
@@ -42,13 +42,13 @@ android {
 dependencies {
 
     // Provides ArFragment, and other Sceneform UX resources:
-    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.8.0"
+    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.9.0"
 
     // 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.8.0"
+    //implementation "com.google.ar.sceneform:core:1.9.0"
 
     implementation "com.android.support:appcompat-v7:28.0.0"
 }

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.3.0'
-        classpath 'com.google.ar.sceneform:plugin:1.8.0'
+        classpath 'com.google.ar.sceneform:plugin:1.9.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/samples/solarsystem/app/build.gradle b/samples/solarsystem/app/build.gradle
@@ -40,7 +40,7 @@ android {
 }
 
 dependencies {
-  implementation "com.google.ar.sceneform:core:1.8.0"
+  implementation "com.google.ar.sceneform:core:1.9.0"
   implementation "com.android.support:appcompat-v7:28.0.0"
   implementation "com.android.support:design:28.0.0"
 }

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

diff --git a/samples/videorecording/app/build.gradle b/samples/videorecording/app/build.gradle
@@ -42,14 +42,14 @@ android {
 dependencies {
 
     // Provides ArFragment, and other Sceneform UX resources:
-    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.8.0"
+    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.9.0"
 
 
     // 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.8.0"
+    //implementation "com.google.ar.sceneform:core:1.9.0"
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'

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

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

diff --git a/sceneformux/ux/build.gradle b/sceneformux/ux/build.gradle
@@ -39,7 +39,7 @@ android {
 }
 
 dependencies {
-    api "com.google.ar.sceneform:core:1.8.0"
+    api "com.google.ar.sceneform:core:1.9.0"
     implementation "com.android.support:appcompat-v7:28.0.0"
     implementation "com.android.support:design:28.0.0"
 }

diff --git a/sceneformux/ux/src/main/java/com/google/ar/sceneform/ux/AugmentedFaceNode.java b/sceneformux/ux/src/main/java/com/google/ar/sceneform/ux/AugmentedFaceNode.java
@@ -37,8 +37,8 @@
 import com.google.ar.sceneform.rendering.Texture;
 import com.google.ar.sceneform.rendering.Vertex;
 import com.google.ar.sceneform.rendering.Vertex.UvCoordinate;
-import java.nio.CharBuffer;
 import java.nio.FloatBuffer;
+import java.nio.ShortBuffer;
 import java.util.ArrayList;
 import java.util.concurrent.ExecutionException;
 
@@ -372,7 +372,7 @@ private void updateFaceMeshVerticesAndTriangles() {
       vertices.remove(vertices.size() - 1);
     }
 
-    CharBuffer indicesBuffer = augmentedFace.getMeshTriangleIndices();
+    ShortBuffer indicesBuffer = augmentedFace.getMeshTriangleIndices();
     indicesBuffer.rewind();
 
     // Only do this if the size doesn't match.

diff --git a/sceneformux/ux/src/main/java/com/google/ar/sceneform/ux/PinchGesture.java b/sceneformux/ux/src/main/java/com/google/ar/sceneform/ux/PinchGesture.java
@@ -71,6 +71,12 @@ public float gapDeltaInches() {
     return gesturePointersUtility.pixelsToInches(getGapDelta());
   }
 
+  /** Cancels the gesture in progress. */
+  @Override
+  public void cancel() {
+    super.cancel();
+  }
+
   @Override
   protected boolean canStart(HitTestResult hitTestResult, MotionEvent motionEvent) {
     if (gesturePointersUtility.isPointerIdRetained(pointerId1)

diff --git a/sceneformux/ux/src/main/java/com/google/ar/sceneform/ux/ScaleController.java b/sceneformux/ux/src/main/java/com/google/ar/sceneform/ux/ScaleController.java
@@ -87,7 +87,7 @@ public void onActivated(Node node) {
 
   @Override
   public void onUpdated(Node node, FrameTime frameTime) {
-    if (isTransforming()) {
+    if (isTransforming() || !isEnabled()) {
       return;
     }