diff --git a/README.md b/README.md index 976a1d7a..553f87ee 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ A Sceneform replacement in Kotlin and Jetpack Compose [![Sceneview](https://img.shields.io/maven-central/v/io.github.sceneview/sceneview.svg?label=Sceneview&color=6c35aa)](https://search.maven.org/artifact/io.github.sceneview/sceneview) [![ARSceneview](https://img.shields.io/maven-central/v/io.github.sceneview/arsceneview.svg?label=ARSceneview&color=6c35aa)](https://search.maven.org/artifact/io.github.sceneview/arsceneview) -[![Filament](https://img.shields.io/badge/Filament-v1.49.3-yellow)](https://github.com/google/filament) +[![Filament](https://img.shields.io/badge/Filament-v1.51.0-yellow)](https://github.com/google/filament) [![ARCore](https://img.shields.io/badge/ARCore-v1.42.0-c961cb)](https://github.com/google-ar/arcore-android-sdk) [![Discord](https://img.shields.io/discord/893787194295222292?color=7389D8&label=Discord&logo=Discord&logoColor=ffffff&style=flat-square)](https://discord.gg/UbNDDBTNqb) diff --git a/arsceneview/src/main/assets/materials/camera_stream_depth.filamat b/arsceneview/src/main/assets/materials/camera_stream_depth.filamat index 9a58f66d..dae319c2 100644 Binary files a/arsceneview/src/main/assets/materials/camera_stream_depth.filamat and b/arsceneview/src/main/assets/materials/camera_stream_depth.filamat differ diff --git a/arsceneview/src/main/assets/materials/camera_stream_flat.filamat b/arsceneview/src/main/assets/materials/camera_stream_flat.filamat index 53a05ecf..1a3053aa 100644 Binary files a/arsceneview/src/main/assets/materials/camera_stream_flat.filamat and b/arsceneview/src/main/assets/materials/camera_stream_flat.filamat differ diff --git a/arsceneview/src/main/assets/materials/face_mesh.filamat b/arsceneview/src/main/assets/materials/face_mesh.filamat index 7d7a4499..9061f445 100644 Binary files a/arsceneview/src/main/assets/materials/face_mesh.filamat and b/arsceneview/src/main/assets/materials/face_mesh.filamat differ diff --git a/arsceneview/src/main/assets/materials/face_mesh_occluder.filamat b/arsceneview/src/main/assets/materials/face_mesh_occluder.filamat index 69fb0e8b..ef4e28ec 100644 Binary files a/arsceneview/src/main/assets/materials/face_mesh_occluder.filamat and b/arsceneview/src/main/assets/materials/face_mesh_occluder.filamat differ diff --git a/arsceneview/src/main/assets/materials/plane_renderer.filamat b/arsceneview/src/main/assets/materials/plane_renderer.filamat index 6574f85e..fc604b50 100644 Binary files a/arsceneview/src/main/assets/materials/plane_renderer.filamat and b/arsceneview/src/main/assets/materials/plane_renderer.filamat differ diff --git a/arsceneview/src/main/assets/materials/plane_renderer_shadow.filamat b/arsceneview/src/main/assets/materials/plane_renderer_shadow.filamat index be4c3cb3..049a7da8 100644 Binary files a/arsceneview/src/main/assets/materials/plane_renderer_shadow.filamat and b/arsceneview/src/main/assets/materials/plane_renderer_shadow.filamat differ diff --git a/gradle.properties b/gradle.properties index bcf5bf81..6e597be2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,7 +36,7 @@ android.nonFinalResIds=false # Filament Plugin ###################### # See the FilamentPlugin.groovy file for the description of these properties -filamentPluginEnabled=false +filamentPluginEnabled=true # This value must point to your Filament dektop tools uncompressed dir, downloaded from here: # https://github.com/google/filament/releases com.google.android.filament.tools-dir=../../filament/out/release/filament diff --git a/sceneview/build.gradle b/sceneview/build.gradle index 6f39d034..edad19d7 100644 --- a/sceneview/build.gradle +++ b/sceneview/build.gradle @@ -111,7 +111,7 @@ dependencies { api 'dev.romainguy:kotlin-math:1.5.3' // Filament - def filament_version = '1.49.3' + def filament_version = '1.51.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/environments/neutral/neutral_ibl.ktx b/sceneview/src/main/assets/environments/neutral/neutral_ibl.ktx index c61045f7..ade606a5 100644 Binary files a/sceneview/src/main/assets/environments/neutral/neutral_ibl.ktx and b/sceneview/src/main/assets/environments/neutral/neutral_ibl.ktx differ diff --git a/sceneview/src/main/assets/environments/neutral/neutral_skybox.ktx b/sceneview/src/main/assets/environments/neutral/neutral_skybox.ktx index c85509d4..c904de60 100644 Binary files a/sceneview/src/main/assets/environments/neutral/neutral_skybox.ktx and b/sceneview/src/main/assets/environments/neutral/neutral_skybox.ktx differ diff --git a/sceneview/src/main/assets/environments/neutral/sh.txt b/sceneview/src/main/assets/environments/neutral/sh.txt index b1d76b5d..1694059a 100644 --- a/sceneview/src/main/assets/environments/neutral/sh.txt +++ b/sceneview/src/main/assets/environments/neutral/sh.txt @@ -1,9 +1,9 @@ -( 0.976625561714172, 0.976625561714172, 0.976625561714172); // L00, irradiance, pre-scaled base -( 0.552805960178375, 0.552805960178375, 0.552805960178375); // L1-1, irradiance, pre-scaled base -( 0.022355301305652, 0.022355301305652, 0.022355301305652); // L10, irradiance, pre-scaled base -(-0.031812082976103, -0.031812082976103, -0.031812082976103); // L11, irradiance, pre-scaled base -(-0.059246473014355, -0.059246473014355, -0.059246473014355); // L2-2, irradiance, pre-scaled base -( 0.062930233776569, 0.062930233776569, 0.062930233776569); // L2-1, irradiance, pre-scaled base -( 0.027763232588768, 0.027763232588768, 0.027763232588768); // L20, irradiance, pre-scaled base +( 0.976625382900238, 0.976625382900238, 0.976625382900238); // L00, irradiance, pre-scaled base +( 0.552805781364441, 0.552805781364441, 0.552805781364441); // L1-1, irradiance, pre-scaled base +( 0.022355316206813, 0.022355316206813, 0.022355316206813); // L10, irradiance, pre-scaled base +(-0.031812120229006, -0.031812120229006, -0.031812120229006); // L11, irradiance, pre-scaled base +(-0.059246446937323, -0.059246446937323, -0.059246446937323); // L2-2, irradiance, pre-scaled base +( 0.062930256128311, 0.062930256128311, 0.062930256128311); // L2-1, irradiance, pre-scaled base +( 0.027763258665800, 0.027763258665800, 0.027763258665800); // L20, irradiance, pre-scaled base ( 0.177627444267273, 0.177627444267273, 0.177627444267273); // L21, irradiance, pre-scaled base -( 0.086373746395111, 0.086373746395111, 0.086373746395111); // L22, irradiance, pre-scaled base +( 0.086373813450336, 0.086373813450336, 0.086373813450336); // L22, irradiance, pre-scaled base diff --git a/sceneview/src/main/assets/materials/image_texture.filamat b/sceneview/src/main/assets/materials/image_texture.filamat index 21db77b6..60fa6d14 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 f7c341ba..ff8a74f2 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 e2630755..d69c402b 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 0616b6e6..36751ee2 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 6454e593..18491b15 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 a6d6f720..6d0e5104 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 3114d4c5..334332e3 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 0b0686b8..fa0286d3 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 new file mode 100644 index 00000000..c71a0a22 Binary files /dev/null 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 new file mode 100644 index 00000000..6396b82b Binary files /dev/null and b/sceneview/src/main/assets/materials/view_texture_unlit.filamat differ