Skip to content

Commit 0c59e5e

Browse files
RGregatr.gregatThomasGorisse
authored
ARCore 1.26.0, Filament 1.12.0 Update. Refactoring (#143)
* Minor refactoring * Splitted up the `render` function from the Sceneform Renderer class into smaller parts. * The Filament renderer `begingFrame` function call is now before anything ArCore related is updated. * Swapped order of the `doUpdate` and `doRender` function call in SceneView. * Added `Choreographer.getInstance().removeFrameCallback(this);` to the destroy function call in SceneView. * Splitted up the `onBeginFrame`function in ArSceneView a little bit. * Added to BaseArFragment a new function to close the session and set the variable to null. ` * Fixed unnecessary creation of a camere Texture. * Recompiled filament materials to 1.12.0 * Updated dependencies * compileSdkVersion 30 -> 31 * targetSdkVersion 30 -> 31 * sourceCompatibility VERSION_1_8 -> VERSION_11 * targetCompatibility VERSION_1_8 -> VERSION_11 * filament 1.10.7 -> 1.12.0 * arcore 1.25.0 -> 1.26.0 * appcompat 1.2.0 -> 1.3.1 * Added different sample glb files. * Updated sample applications. * Compiled missing filament materials * Updated for the augmented-images sample app the filament dependency * replaced deprecated code * Instead of throwing an AssertionError if the SwapChain is null, just skip the render call * Add a call to Session.close() an ArSceneView.destroy and ensure that everything is well called * Add setters for ArFragment and ArSceneview Session and Session Config * Improve session.getConfig() calls * Review the SceneView/ArSceneView resume/pause order * Remove the ensure updateMode == Config.UpdateMode.LATEST_CAMERA_IMAGE * Cleanup * Improvements * Set the TonMapper for the Filament-Renderer to FILMIC * Removed the manual setted TonMapper from every sample app * gradle stuff * Fixed deprecation warning. * Replaced `requestPermissions` and `onRequestPermissionResult` with the new way by creating a `ActivityResultLauncher` object. The result of the request is handled via a callback function. * Made the second half of the layout of the sceneview-background sample transparent again. * Both dragons and backdrops are rendered. Co-authored-by: r.gregat <[email protected]> Co-authored-by: ThomasGorisse <[email protected]>
1 parent 53e70bc commit 0c59e5e

File tree

49 files changed

+1403
-1288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1403
-1288
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
google()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.2.2'
10+
classpath 'com.android.tools.build:gradle:7.0.0'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
if (project.hasProperty('mavenCentralUsername') && project.hasProperty('mavenCentralPassword')) {
1313
try {

core/build.gradle

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 30
4+
compileSdkVersion 31
55
defaultConfig {
66
// Sceneform requires minSdkVersion >= 24.
77
minSdkVersion 24
8-
targetSdkVersion 30
9-
versionCode 15
10-
versionName "1.19.5"
8+
targetSdkVersion 31
119
}
1210
compileOptions {
1311
// Sceneform libraries use language constructs from Java 8.
1412
// Add these compile options if targeting minSdkVersion < 26.
15-
sourceCompatibility JavaVersion.VERSION_1_8
16-
targetCompatibility JavaVersion.VERSION_1_8
13+
sourceCompatibility JavaVersion.VERSION_11
14+
targetCompatibility JavaVersion.VERSION_11
1715
}
1816
buildTypes {
1917
release {
@@ -24,15 +22,20 @@ android {
2422
}
2523

2624
dependencies {
27-
api 'com.google.android.filament:filament-android:1.10.7'
28-
api 'com.google.android.filament:gltfio-android:1.10.7'
29-
api 'com.google.android.filament:filament-utils-android:1.10.7'
25+
def filament_version = '1.12.0'
26+
def arcore_version = '1.26.0'
27+
def appcompat_version = '1.3.1'
28+
def material_version = '1.3.0'
29+
30+
api "com.google.android.filament:filament-android:$filament_version"
31+
api "com.google.android.filament:gltfio-android:$filament_version"
32+
api "com.google.android.filament:filament-utils-android:$filament_version"
3033
implementation files("libs/libsceneform_runtime_schemas.jar")
3134

32-
api "com.google.ar:core:1.25.0"
35+
api "com.google.ar:core:$arcore_version"
3336

34-
implementation 'androidx.appcompat:appcompat:1.2.0'
35-
implementation 'com.google.android.material:material:1.3.0'
37+
implementation "androidx.appcompat:appcompat:$appcompat_version"
38+
implementation "com.google.android.material:material:$material_version"
3639
}
3740

3841
if (project.hasProperty('mavenCentralUsername') && project.hasProperty('mavenCentralPassword')) {

0 commit comments

Comments
 (0)