Skip to content

ARCore 1.26.0, Filament 1.12.0 Update. Refactoring #143

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

Merged
merged 17 commits into from
Aug 20, 2021
Merged

ARCore 1.26.0, Filament 1.12.0 Update. Refactoring #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
568855c
Minor refactoring
Aug 16, 2021
2aa001b
Fixed unnecessary creation of a camere Texture.
Aug 16, 2021
72e87ae
Recompiled filament materials to 1.12.0
Aug 18, 2021
dd8820e
Updated dependencies
Aug 18, 2021
173408e
Added different sample glb files.
Aug 18, 2021
d8f3c7b
Updated sample applications.
Aug 18, 2021
0556a8c
Compiled missing filament materials
Aug 18, 2021
35aca73
Updated for the augmented-images sample app the filament dependency
Aug 18, 2021
ddb41e0
replaced deprecated code
Aug 18, 2021
784519f
Instead of throwing an AssertionError if the SwapChain is null, just …
Aug 18, 2021
1248ee4
- Add a call to Session.close() an ArSceneView.destroy and ensure tha…
ThomasGorisse Aug 19, 2021
7ad4357
Add/Remove files
ThomasGorisse Aug 19, 2021
2741376
Set the TonMapper for the Filament-Renderer to FILMIC
Aug 20, 2021
382bccb
Removed the manual setted TonMapper from every sample app
Aug 20, 2021
0005ef5
gradle stuff
Aug 20, 2021
353704d
Fixed deprecation warning.
Aug 20, 2021
d975d8b
Made the second half of the layout of the sceneview-background sample…
Aug 20, 2021
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 build.gradle
View file
Open in desktop
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
View file
Open in desktop
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