From ca2da396146d156ea01e068ad2edb10bb0091f6b Mon Sep 17 00:00:00 2001
From: Philip Rideout <philiprideout@gmail.com>
Date: Fri, 17 Jan 2020 09:36:51 -0800
Subject: [PATCH] Migrate TextureLoader to filament-utils.

---
 .../com/google/android/filament/utils}/TextureLoader.kt   | 0
 android/samples/sample-textured-object/build.gradle       | 1 +
 .../com/google/android/filament/textured/MainActivity.kt  | 8 ++++----
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename android/{samples/sample-textured-object/src/main/java/com/google/android/filament/textured => filament-utils-android/src/main/java/com/google/android/filament/utils}/TextureLoader.kt (100%)

diff --git a/android/samples/sample-textured-object/src/main/java/com/google/android/filament/textured/TextureLoader.kt b/android/filament-utils-android/src/main/java/com/google/android/filament/utils/TextureLoader.kt
similarity index 100%
rename from android/samples/sample-textured-object/src/main/java/com/google/android/filament/textured/TextureLoader.kt
rename to android/filament-utils-android/src/main/java/com/google/android/filament/utils/TextureLoader.kt
diff --git a/android/samples/sample-textured-object/build.gradle b/android/samples/sample-textured-object/build.gradle
index 2d00b52090..7579cd38bd 100644
--- a/android/samples/sample-textured-object/build.gradle
+++ b/android/samples/sample-textured-object/build.gradle
@@ -36,4 +36,5 @@ android {
 dependencies {
     implementation deps.kotlin
     implementation project(':filament-android')
+    implementation project(':filament-utils-android')
 }
diff --git a/android/samples/sample-textured-object/src/main/java/com/google/android/filament/textured/MainActivity.kt b/android/samples/sample-textured-object/src/main/java/com/google/android/filament/textured/MainActivity.kt
index 5e7d242970..0deca68d0f 100644
--- a/android/samples/sample-textured-object/src/main/java/com/google/android/filament/textured/MainActivity.kt
+++ b/android/samples/sample-textured-object/src/main/java/com/google/android/filament/textured/MainActivity.kt
@@ -25,6 +25,7 @@ import android.view.SurfaceView
 import android.view.animation.LinearInterpolator
 
 import com.google.android.filament.*
+import com.google.android.filament.utils.*
 import com.google.android.filament.android.UiHelper
 
 import java.nio.ByteBuffer
@@ -34,11 +35,10 @@ import kotlin.math.cos
 import kotlin.math.sin
 
 class MainActivity : Activity() {
-    // Make sure to initialize Filament first
-    // This loads the JNI library needed by most API calls
+    // Make sure to initialize the correct Filament JNI layer.
     companion object {
         init {
-            Filament.init()
+            Utils.init()
         }
     }
 
@@ -218,7 +218,7 @@ class MainActivity : Activity() {
     }
 
     private fun loadImageBasedLight() {
-        ibl = loadIbl(assets, "envs/venetian_crossroads_2k", engine)
+        ibl = loadIbl(assets, "envs/flower_road_no_sun_2k", engine)
         ibl.indirectLight.intensity = 40_000.0f
     }