Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to ARCore 1.46.0 and filament 1.56.0 and kotlin 2 and API 35 #581

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Updates to ARCore 1.46.0 and filament 1.56.0 and kotlin 2 and API 35 #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1215d54
Update deps, fix a few crashes
kmayoral Mar 27, 2024
001e9cb
Updates to ARCore 1.46.0 and filament 1.56.0 and kotlin 2 and API 35
kmayoral Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions arsceneview/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
id 'kotlin-android'
id 'filament-tools-plugin'
id 'org.jetbrains.dokka'
id 'org.jetbrains.kotlin.plugin.compose'
}

// *************************************************************************************************
Expand Down Expand Up @@ -40,11 +41,11 @@ if (project.properties['filamentPluginEnabled']?.toBoolean()) {
android {
namespace 'io.github.sceneview.ar'

compileSdk 34
compileSdk 35

defaultConfig {
minSdk 24
targetSdk 34
targetSdk 35

consumerProguardFiles "consumer-rules.pro"
}
Expand All @@ -69,28 +70,25 @@ android {
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.14"
}
// Preserve compression of filament files
androidResources {
noCompress 'filamat', 'ktx'
}
}

dependencies {
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.core:core-ktx:1.15.0'
implementation 'androidx.appcompat:appcompat:1.7.0'

// Compose
implementation "androidx.compose.ui:ui:1.6.7"
implementation "androidx.compose.foundation:foundation:1.6.7"
implementation "androidx.compose.ui:ui:1.7.5"
implementation "androidx.compose.foundation:foundation:1.7.5"

// SceneView
api project(":sceneview")

// ARCore
api "com.google.ar:core:1.43.0"
api "com.google.ar:core:1.46.0"
}

apply plugin: "com.vanniktech.maven.publish"
Binary file modified arsceneview/src/main/assets/materials/camera_stream_depth.filamat
View file
Open in desktop
Binary file not shown.
Binary file modified arsceneview/src/main/assets/materials/camera_stream_flat.filamat
View file
Open in desktop
Binary file not shown.
Binary file modified arsceneview/src/main/assets/materials/face_mesh.filamat
View file
Open in desktop
Binary file not shown.
Binary file modified arsceneview/src/main/assets/materials/face_mesh_occluder.filamat
View file
Open in desktop
Binary file not shown.
Binary file modified arsceneview/src/main/assets/materials/plane_renderer.filamat
View file
Open in desktop
Binary file not shown.
Binary file modified arsceneview/src/main/assets/materials/plane_renderer_shadow.filamat
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions arsceneview/src/main/java/io/github/sceneview/ar/ARSceneView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,15 +578,15 @@ open class ARSceneView @JvmOverloads constructor(

override fun destroy() {
if (!isDestroyed) {
defaultCameraNode?.destroy()
defaultCameraStream?.destroy()
runCatching { defaultCameraNode?.destroy() }
runCatching { defaultCameraStream?.destroy() }

lightEstimator?.destroy()
planeRenderer.destroy()
destroyArCore()
runCatching { lightEstimator?.destroy() }
runCatching { planeRenderer.destroy() }
runCatching { destroyArCore() }
}

super.destroy()
runCatching { super.destroy() }
}

private fun destroyArCore() {
Expand Down
8 changes: 5 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
buildscript {
ext.kotlin_version = '1.9.24'
ext.kotlin_version = '2.0.21'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.4.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24"
classpath 'com.android.tools.build:gradle:8.7.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
// Maven Central Publish
classpath "com.vanniktech:gradle-maven-publish-plugin:0.25.3"
// Dokka
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.9.10"
// Compose
classpath "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.0.21"
}
}

Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Oct 15 17:50:17 CEST 2021
#Thu Nov 14 11:49:30 PST 2024
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions samples/ar-augmented-image/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ plugins {
android {
namespace "io.github.sceneview.sample.araugmentedimage"

compileSdk 34
compileSdk 35

defaultConfig {
applicationId "io.github.sceneview.sample.araugmentedimage"
minSdk 24
targetSdk 34
targetSdk 35
versionCode 1
versionName "1.0.0"
}
Expand Down
4 changes: 2 additions & 2 deletions samples/ar-cloud-anchor/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ plugins {
android {
namespace 'io.github.sceneview.sample.arcloudanchor'

compileSdk 34
compileSdk 35

defaultConfig {
applicationId "io.github.sceneview.sample.arcloudanchor"
minSdk 24
targetSdk 34
targetSdk 35
versionCode 1
versionName "1.0.0"
}
Expand Down
8 changes: 3 additions & 5 deletions samples/ar-model-viewer-compose/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
namespace "io.github.sceneview.sample.armodelviewer.compose"

compileSdk 34
compileSdk 35

defaultConfig {
applicationId "io.github.sceneview.sample.armodelviewer.compose"
minSdk 28
targetSdk 34
targetSdk 35
versionCode 1
versionName "1.0.0"
}
Expand All @@ -30,9 +31,6 @@ android {
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.14"
}
packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
Expand Down
4 changes: 2 additions & 2 deletions samples/ar-model-viewer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ plugins {
android {
namespace "io.github.sceneview.sample.armodelviewer"

compileSdk 34
compileSdk 35

defaultConfig {
applicationId "io.github.sceneview.sample.armodelviewer"
minSdk 28
targetSdk 34
targetSdk 35
versionCode 1
versionName "1.0.0"
}
Expand Down
4 changes: 2 additions & 2 deletions samples/ar-point-cloud/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ plugins {
android {
namespace "io.github.sceneview.sample.arpointcloud"

compileSdk 34
compileSdk 35

defaultConfig {
applicationId "io.github.sceneview.sample.arpointcloud"
minSdk 28
targetSdk 34
targetSdk 35
versionCode 1
versionName "1.0.0"
}
Expand Down
8 changes: 3 additions & 5 deletions samples/common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
plugins {
id 'com.android.library'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
namespace 'io.github.sceneview.sample.common'
compileSdk 34
compileSdk 35

defaultConfig {
minSdk 24
targetSdk 34
targetSdk 35
}

compileOptions {
Expand All @@ -22,9 +23,6 @@ android {
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.14"
}
}

dependencies {
Expand Down
8 changes: 3 additions & 5 deletions samples/gltf-camera/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
namespace "io.github.sceneview.sample.gltfcamera"

compileSdk 34
compileSdk 35

defaultConfig {
applicationId "io.github.sceneview.sample.gltfcamera"
minSdk 28
targetSdk 34
targetSdk 35
versionCode 1
versionName "1.0.0"
}
Expand All @@ -30,9 +31,6 @@ android {
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.14"
}
androidResources {
noCompress 'filamat', 'ktx'
}
Expand Down
8 changes: 3 additions & 5 deletions samples/model-viewer-compose-camera-manipulator/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
namespace 'io.github.sceneview.sample.modelviewer.compose.cameramanipulator'

compileSdk 34
compileSdk 35

defaultConfig {
applicationId "io.github.sceneview.sample.modelviewer.compose.cameramanipulator"
minSdk 28
targetSdk 34
targetSdk 35
versionCode 1
versionName "1.0.0"
}
Expand All @@ -30,9 +31,6 @@ android {
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.5.14'
}
androidResources {
noCompress 'filamat', 'ktx'
}
Expand Down
22 changes: 10 additions & 12 deletions samples/model-viewer-compose/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jetbrains.kotlin.plugin.compose'
}

android {
namespace "io.github.sceneview.sample.modelviewer.compose"

compileSdk 34
compileSdk 35

defaultConfig {
applicationId "io.github.sceneview.sample.modelviewer.compose"
minSdk 28
targetSdk 34
targetSdk 35
versionCode 1
versionName "1.0.0"
}
Expand All @@ -30,9 +31,6 @@ android {
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.14"
}
androidResources {
noCompress 'filamat', 'ktx'
}
Expand All @@ -41,13 +39,13 @@ android {
dependencies {
implementation project(":samples:common")

implementation "androidx.compose.ui:ui:1.6.7"
implementation "androidx.compose.foundation:foundation:1.6.7"
implementation 'androidx.activity:activity-compose:1.9.0'
implementation 'androidx.compose.material:material:1.6.7'
implementation "androidx.compose.ui:ui-tooling-preview:1.6.7"
implementation "androidx.navigation:navigation-compose:2.7.7"
debugImplementation "androidx.compose.ui:ui-tooling:1.6.7"
implementation "androidx.compose.ui:ui:1.7.5"
implementation "androidx.compose.foundation:foundation:1.7.5"
implementation 'androidx.activity:activity-compose:1.9.3'
implementation 'androidx.compose.material:material:1.7.5'
implementation "androidx.compose.ui:ui-tooling-preview:1.7.5"
implementation "androidx.navigation:navigation-compose:2.8.4"
debugImplementation "androidx.compose.ui:ui-tooling:1.7.5"

// SceneView
releaseImplementation "io.github.sceneview:sceneview:2.2.1"
Expand Down
4 changes: 2 additions & 2 deletions samples/model-viewer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ plugins {
android {
namespace "io.github.sceneview.sample.modelviewer"

compileSdk 34
compileSdk 35

defaultConfig {
applicationId "io.github.sceneview.sample.modelviewer"
minSdk 28
targetSdk 34
targetSdk 35
versionCode 1
versionName "1.0.0"
}
Expand Down
Loading
Loading