Skip to content

Commit 4bdb114

Browse files
Environment Lights (#156)
* Environment Lights * IBLPrefilter + HDRLoader + KTXLoader * Server side environments (including HDR and KTX) * Add models to docs * Better/Faster/Stronger * Handle content uri resources
1 parent 56cf752 commit 4bdb114

File tree

84 files changed

+2504
-1784
lines changed

Some content is hidden

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

84 files changed

+2504
-1784
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
ext {
3-
kotlin_version = '1.5.21'
3+
kotlin_version = '1.5.0'
44
}
55
repositories {
66
mavenCentral()
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
for /R %%G in (*.hdr) do cmgen --deploy ./output --format=ktx --size=256 --extract-blur=0.1 "%%G"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
( 1.196223497390747, 0.889960587024689, 0.520967423915863); // L00, irradiance, pre-scaled base
2+
( 0.116506360471249, 0.058094669133425, 0.003591337706894); // L1-1, irradiance, pre-scaled base
3+
( 0.646746814250946, 0.506869614124298, 0.341656088829041); // L10, irradiance, pre-scaled base
4+
(-0.358794599771500, -0.294600665569305, -0.229977309703827); // L11, irradiance, pre-scaled base
5+
(-0.022813456133008, -0.015645753592253, -0.019511476159096); // L2-2, irradiance, pre-scaled base
6+
(-0.020811639726162, -0.046015989035368, -0.046481572091579); // L2-1, irradiance, pre-scaled base
7+
( 0.083853572607040, 0.063895165920258, 0.037065032869577); // L20, irradiance, pre-scaled base
8+
(-0.281233876943588, -0.230605423450470, -0.188161328434944); // L21, irradiance, pre-scaled base
9+
( 0.006260003894567, 0.013821318745613, 0.019960639998317); // L22, irradiance, pre-scaled base
5.65 MB
Binary file not shown.

core/build.gradle

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,18 @@ android {
1111
// Sceneform requires minSdkVersion >= 24.
1212
minSdkVersion 24
1313
targetSdkVersion 31
14-
versionCode 16
15-
versionName "1.19.6"
14+
15+
buildConfigField 'int', 'VERSION_CODE', "16"
16+
buildConfigField 'String', 'VERSION_NAME', "\"1.19.6\""
1617
}
1718
compileOptions {
1819
// Sceneform libraries use language constructs from Java 8.
1920
// Add these compile options if targeting minSdkVersion < 26.
20-
sourceCompatibility JavaVersion.VERSION_11
21-
targetCompatibility JavaVersion.VERSION_11
21+
sourceCompatibility JavaVersion.VERSION_1_8
22+
targetCompatibility JavaVersion.VERSION_1_8
2223
}
2324
kotlinOptions {
24-
jvmTarget = JavaVersion.VERSION_11.toString()
25+
jvmTarget = JavaVersion.VERSION_1_8.toString()
2526
}
2627
aaptOptions {
2728
noCompress 'filamat', 'ktx'
@@ -37,23 +38,26 @@ android {
3738
dependencies {
3839
def filament_version = '1.12.0'
3940
def arcore_version = '1.26.0'
40-
def appcompat_version = '1.3.1'
41-
def material_version = '1.3.0'
4241

4342
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
44-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
45-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
46-
43+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_version"
44+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_version"
45+
4746
api "com.google.android.filament:filament-android:$filament_version"
4847
api "com.google.android.filament:gltfio-android:$filament_version"
4948
api "com.google.android.filament:filament-utils-android:$filament_version"
5049
implementation files("libs/libsceneform_runtime_schemas.jar")
5150

5251
api "com.google.ar:core:$arcore_version"
5352

53+
implementation "androidx.appcompat:appcompat:1.3.1"
54+
implementation "androidx.core:core-ktx:1.6.0"
55+
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
56+
implementation "com.google.android.material:material:1.4.0"
5457

55-
implementation "androidx.appcompat:appcompat:$appcompat_version"
56-
implementation "com.google.android.material:material:$material_version"
58+
implementation "com.github.kittinunf.fuel:fuel:2.3.1"
59+
implementation "com.github.kittinunf.fuel:fuel-android:2.3.1"
60+
implementation "com.github.kittinunf.fuel:fuel-coroutines:2.3.1"
5761
}
5862

5963
if (project.hasProperty('mavenCentralUsername') && project.hasProperty('mavenCentralPassword')) {
2 MB
Binary file not shown.
1.5 MB
Binary file not shown.

0 commit comments

Comments
 (0)