SceneForm SDK v1.5.0

augmentedimage/app/build.gradle → samples/augmentedimage/app/build.gradle

@@ -27,7 +27,7 @@ android {
 
       ndk {
         /*
-         * Sceneform is available for the following ABIs: arm64-v8a, armv7a,
+         * 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).
@@ -49,11 +49,14 @@ android {
 }
 
 dependencies {
-    implementation "com.google.ar.sceneform:core:1.4.0"
-    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.4.0"
-
     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.0"
+
+    // Use the Sceneform Ux Package built from the source files included in the sceneformux folder.
+    //api project(":sceneformux")
 }
 
 apply plugin: 'com.google.ar.sceneform.plugin'

augmentedimage/app/src/main/res/values/strings.xml → samples/augmentedimage/app/src/main/res/values/strings.xml

@@ -15,6 +15,6 @@
    limitations under the License.
 -->
 <resources>
-  <string name="app_name">AugmentedImage Sample</string>
+  <string name="app_name">Augmented Images</string>
   <string name="fit_image_to_scan">Fit image to scan</string>
 </resources>

chromakeyvideo/build.gradle → samples/augmentedimage/build.gradle

@@ -22,8 +22,8 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
-        classpath 'com.google.ar.sceneform:plugin:1.4.0'
+        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.google.ar.sceneform:plugin:1.5.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

samples/augmentedimage/settings.gradle

@@ -0,0 +1,5 @@
+include ':app'
+
+// Uncomment to include the source version of the ux package in your project.
+//include ':sceneformux'
+//project(':sceneformux').projectDir=new File('../../sceneformux/ux')

chromakeyvideo/app/build.gradle → samples/chromakeyvideo/app/build.gradle

@@ -26,7 +26,7 @@ android {
         versionName "1.0"
         ndk {
             /*
-             * Sceneform is available for the following ABIs: arm64-v8a, armv7a,
+             * 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).
@@ -51,10 +51,14 @@ android {
 }
 
 dependencies {
-    implementation "com.google.ar.sceneform:core:1.4.0"
-    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.4.0"
     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.0"
+
+    // Use the Sceneform Ux Package built from the source files included in the sceneformux folder.
+    //api project(":sceneformux")
 }
 
 apply plugin: 'com.google.ar.sceneform.plugin'

hellosceneform/app/src/main/res/values/strings.xml → samples/chromakeyvideo/app/src/main/res/values/strings.xml

@@ -15,5 +15,5 @@
    limitations under the License.
 -->
 <resources>
-    <string name="app_name">Hello Sceneform</string>
+    <string name="app_name">ChromaKey Video</string>
 </resources>

solarsystem/build.gradle → samples/chromakeyvideo/build.gradle

@@ -22,8 +22,8 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
-        classpath 'com.google.ar.sceneform:plugin:1.4.0'
+        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.google.ar.sceneform:plugin:1.5.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

samples/chromakeyvideo/settings.gradle

@@ -0,0 +1,5 @@
+include ':app'
+
+// Uncomment to include the source version of the ux package in your project.
+//include ':sceneformux'
+//project(':sceneformux').projectDir=new File('../../sceneformux/ux')

samples/hellosceneform/app/build.gradle

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2018 Google LLC
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 27
+    defaultConfig {
+        applicationId "com.google.ar.sceneform.samples.hellosceneform"
+
+        // AR Optional apps must declare minSdkVersion >= 14.
+        // AR Required apps must declare 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.
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+}
+
+dependencies {
+
+    // Provides ArFragment, and other Sceneform UX resources:
+    implementation "com.google.ar.sceneform.ux:sceneform-ux:1.5.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.5.0"
+
+    implementation "com.android.support:appcompat-v7:27.1.1"
+}
+
+apply plugin: 'com.google.ar.sceneform.plugin'
+
+sceneform.asset('sampledata/models/andy.obj',
+        'default',
+        'sampledata/models/andy.sfa',
+        'src/main/res/raw/andy')
+

chromakeyvideo/app/src/main/res/values/strings.xml → samples/hellosceneform/app/src/main/res/values/strings.xml

@@ -15,5 +15,5 @@
    limitations under the License.
 -->
 <resources>
-    <string name="app_name">Chroma Key Video</string>
+    <string name="app_name">HelloSceneform</string>
 </resources>

augmentedimage/build.gradle → samples/hellosceneform/build.gradle

@@ -22,8 +22,8 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
-        classpath 'com.google.ar.sceneform:plugin:1.4.0'
+        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.google.ar.sceneform:plugin:1.5.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

samples/hellosceneform/settings.gradle

@@ -0,0 +1,5 @@
+include ':app'
+
+// Uncomment to include the source version of the ux package in your project.
+//include ':sceneformux'
+//project(':sceneformux').projectDir=new File('../../sceneformux/ux')

solarsystem/app/build.gradle → samples/solarsystem/app/build.gradle

@@ -26,7 +26,7 @@ android {
         versionName "1.0"
         ndk {
             /*
-             * Sceneform is available for the following ABIs: arm64-v8a, armv7a,
+             * 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).
@@ -51,7 +51,7 @@ android {
 }
 
 dependencies {
-  implementation "com.google.ar.sceneform:core:1.4.0"
+  implementation "com.google.ar.sceneform:core:1.5.0"
   implementation "com.android.support:appcompat-v7:27.1.1"
   implementation "com.android.support:design:27.1.1"
 }