Skip to content

Commit

Permalink
ARCore 1.26.0, Filament 1.12.0 Update. Refactoring (#143)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
3 people authored Aug 20, 2021
1 parent 53e70bc commit 0c59e5e
Show file tree
Hide file tree
Showing 49 changed files with 1,403 additions and 1,288 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.build:gradle:7.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
if (project.hasProperty('mavenCentralUsername') && project.hasProperty('mavenCentralPassword')) {
try {
Expand Down
27 changes: 15 additions & 12 deletions core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 30
compileSdkVersion 31
defaultConfig {
// Sceneform requires minSdkVersion >= 24.
minSdkVersion 24
targetSdkVersion 30
versionCode 15
versionName "1.19.5"
targetSdkVersion 31
}
compileOptions {
// Sceneform libraries use language constructs from Java 8.
// Add these compile options if targeting minSdkVersion < 26.
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
buildTypes {
release {
Expand All @@ -24,15 +22,20 @@ android {
}

dependencies {
api 'com.google.android.filament:filament-android:1.10.7'
api 'com.google.android.filament:gltfio-android:1.10.7'
api 'com.google.android.filament:filament-utils-android:1.10.7'
def filament_version = '1.12.0'
def arcore_version = '1.26.0'
def appcompat_version = '1.3.1'
def material_version = '1.3.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"
implementation files("libs/libsceneform_runtime_schemas.jar")

api "com.google.ar:core:1.25.0"
api "com.google.ar:core:$arcore_version"

implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.3.0'
implementation "androidx.appcompat:appcompat:$appcompat_version"
implementation "com.google.android.material:material:$material_version"
}

if (project.hasProperty('mavenCentralUsername') && project.hasProperty('mavenCentralPassword')) {
Expand Down
Loading

0 comments on commit 0c59e5e

Please sign in to comment.