diff --git a/sceneview/build.gradle b/sceneview/build.gradle index 0db6e8015..6111071ad 100644 --- a/sceneview/build.gradle +++ b/sceneview/build.gradle @@ -94,7 +94,7 @@ dependencies { api 'dev.romainguy:kotlin-math:1.6.0' // Filament - def filament_version = '1.70.0' + def filament_version = '1.56.0' api "com.google.android.filament:filament-android:$filament_version" api "com.google.android.filament:gltfio-android:$filament_version" api "com.google.android.filament:filament-utils-android:$filament_version" diff --git a/sceneview/src/main/assets/materials/image_texture.filamat b/sceneview/src/main/assets/materials/image_texture.filamat index 5343f8a82..cbca2e238 100644 Binary files a/sceneview/src/main/assets/materials/image_texture.filamat and b/sceneview/src/main/assets/materials/image_texture.filamat differ diff --git a/sceneview/src/main/assets/materials/opaque_colored.filamat b/sceneview/src/main/assets/materials/opaque_colored.filamat index e71f41a2d..6803b3c27 100644 Binary files a/sceneview/src/main/assets/materials/opaque_colored.filamat and b/sceneview/src/main/assets/materials/opaque_colored.filamat differ diff --git a/sceneview/src/main/assets/materials/opaque_textured.filamat b/sceneview/src/main/assets/materials/opaque_textured.filamat index a75574f99..83051327a 100644 Binary files a/sceneview/src/main/assets/materials/opaque_textured.filamat and b/sceneview/src/main/assets/materials/opaque_textured.filamat differ diff --git a/sceneview/src/main/assets/materials/transparent_colored.filamat b/sceneview/src/main/assets/materials/transparent_colored.filamat index 30f52a763..c1bfeb0f5 100644 Binary files a/sceneview/src/main/assets/materials/transparent_colored.filamat and b/sceneview/src/main/assets/materials/transparent_colored.filamat differ diff --git a/sceneview/src/main/assets/materials/transparent_textured.filamat b/sceneview/src/main/assets/materials/transparent_textured.filamat index 1d2897097..adcbe1520 100644 Binary files a/sceneview/src/main/assets/materials/transparent_textured.filamat and b/sceneview/src/main/assets/materials/transparent_textured.filamat differ diff --git a/sceneview/src/main/assets/materials/video_texture.filamat b/sceneview/src/main/assets/materials/video_texture.filamat index 577ed581a..31801b5f3 100644 Binary files a/sceneview/src/main/assets/materials/video_texture.filamat and b/sceneview/src/main/assets/materials/video_texture.filamat differ diff --git a/sceneview/src/main/assets/materials/video_texture_chroma_key.filamat b/sceneview/src/main/assets/materials/video_texture_chroma_key.filamat index 70fa875e8..fb17627c5 100644 Binary files a/sceneview/src/main/assets/materials/video_texture_chroma_key.filamat and b/sceneview/src/main/assets/materials/video_texture_chroma_key.filamat differ diff --git a/sceneview/src/main/assets/materials/view_renderable.filamat b/sceneview/src/main/assets/materials/view_renderable.filamat index d64425088..b67c14d94 100644 Binary files a/sceneview/src/main/assets/materials/view_renderable.filamat and b/sceneview/src/main/assets/materials/view_renderable.filamat differ diff --git a/sceneview/src/main/assets/materials/view_texture_lit.filamat b/sceneview/src/main/assets/materials/view_texture_lit.filamat index 887662032..73f030a64 100644 Binary files a/sceneview/src/main/assets/materials/view_texture_lit.filamat and b/sceneview/src/main/assets/materials/view_texture_lit.filamat differ diff --git a/sceneview/src/main/assets/materials/view_texture_unlit.filamat b/sceneview/src/main/assets/materials/view_texture_unlit.filamat index 04b349e0d..01fb7def9 100644 Binary files a/sceneview/src/main/assets/materials/view_texture_unlit.filamat and b/sceneview/src/main/assets/materials/view_texture_unlit.filamat differ diff --git a/sceneview/src/main/java/io/github/sceneview/SceneFactories.kt b/sceneview/src/main/java/io/github/sceneview/SceneFactories.kt index 53f7cd575..fc4868d43 100644 --- a/sceneview/src/main/java/io/github/sceneview/SceneFactories.kt +++ b/sceneview/src/main/java/io/github/sceneview/SceneFactories.kt @@ -145,7 +145,7 @@ fun createEnvironment( indirectLight = KTX1Loader.createIndirectLight( environmentLoader.engine, environmentLoader.context.assets.readBuffer("environments/neutral/neutral_ibl.ktx"), - ).indirectLight + ) ) fun createEnvironment( diff --git a/sceneview/src/main/java/io/github/sceneview/loaders/EnvironmentLoader.kt b/sceneview/src/main/java/io/github/sceneview/loaders/EnvironmentLoader.kt index fe266319d..e8d6ebd8b 100644 --- a/sceneview/src/main/java/io/github/sceneview/loaders/EnvironmentLoader.kt +++ b/sceneview/src/main/java/io/github/sceneview/loaders/EnvironmentLoader.kt @@ -246,8 +246,8 @@ class EnvironmentLoader( iblBuffer: Buffer? = null, skyboxBuffer: Buffer? = null ) = createEnvironment( - indirectLight = iblBuffer?.let { KTX1Loader.createIndirectLight(engine, it).indirectLight }, - skybox = skyboxBuffer?.let { KTX1Loader.createSkybox(engine, it).skybox }, + indirectLight = iblBuffer?.let { KTX1Loader.createIndirectLight(engine, it) }, + skybox = skyboxBuffer?.let { KTX1Loader.createSkybox(engine, it) }, sphericalHarmonics = iblBuffer?.rewind()?.let { KTX1Loader.getSphericalHarmonics(it) } )