diff --git a/build.gradle b/build.gradle index a21a290ef..5d304682b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,20 @@ import com.vanniktech.maven.publish.SonatypeHost buildscript { - ext.kotlin_version = '2.3.20' + ext.kotlin_version = '2.1.21' repositories { google() mavenCentral() } dependencies { classpath 'com.android.tools.build:gradle:8.13.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21" // Maven Central Publish classpath "com.vanniktech:gradle-maven-publish-plugin:0.33.0" // Dokka classpath "org.jetbrains.dokka:dokka-gradle-plugin:2.0.0" // Compose - classpath "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.3.20" + classpath "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.1.21" } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 985eeaf6f..3851cdffa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] agp = "8.13.2" -kotlin = "2.3.20" -composeCompiler = "2.3.20" +kotlin = "2.1.21" +composeCompiler = "2.1.21" coreKtx = "1.18.0" appcompat = "1.7.1" fragmentKtx = "1.8.9" diff --git a/sceneview/build.gradle b/sceneview/build.gradle index 6111071ad..0db6e8015 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.56.0' + def filament_version = '1.70.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 cbca2e238..5343f8a82 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 6803b3c27..e71f41a2d 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 83051327a..a75574f99 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 c1bfeb0f5..30f52a763 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 adcbe1520..1d2897097 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 31801b5f3..577ed581a 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 fb17627c5..70fa875e8 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 b67c14d94..d64425088 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 73f030a64..887662032 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 01fb7def9..04b349e0d 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 fc4868d43..53f7cd575 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 e8d6ebd8b..fe266319d 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) }, - skybox = skyboxBuffer?.let { KTX1Loader.createSkybox(engine, it) }, + indirectLight = iblBuffer?.let { KTX1Loader.createIndirectLight(engine, it).indirectLight }, + skybox = skyboxBuffer?.let { KTX1Loader.createSkybox(engine, it).skybox }, sphericalHarmonics = iblBuffer?.rewind()?.let { KTX1Loader.getSphericalHarmonics(it) } )