Merge branch 'rc/1.19.0' into release

The previous code would convert each element of the source data
into 8 bit-per-element, but we wnat to preserve the original format
that the user provides.

The new solution is to use `slice()` which is a robust way to clone
all the data in a typed array.

This fixes the new regression with Triangle that Ben caught.

.github/workflows/mac-continuous.yml

@@ -21,3 +21,6 @@ jobs:
         with:
           name: filament-mac
           path: out/filament-release-darwin.tgz
+      - name: Check public headers
+        run: |
+          build/common/check-headers.sh out/release/filament/include

.github/workflows/release.yml

@@ -1,14 +1,25 @@
 name: Release
 
 # This Workflow can be triggered two ways:
-# 1. A GitHub release is created (using the GitHub web UI). This triggers all of the platforms to build and upload assets.
-# 2. A repository_dispatch API event is sent. This triggers a build for only the platform specified in the dispatch event.
+# 1. A GitHub release is created (using the GitHub web UI). This triggers all of the platforms to
+# build and upload assets.
+# 2. A workflow_dispatch event is triggered from the GitHub web UI. This triggers a build for only
+# the platform specified in the dispatch event.
 
 env:
-  RELEASE_TAG: ${{ github.event.client_payload.release_tag }}
+  RELEASE_TAG: ${{ github.event.inputs.release_tag }}
 
 on:
-  repository_dispatch:
+  workflow_dispatch:
+    inputs:
+      platform:
+        description: 'Platform to build (desktop, web, android, ios, windows)'
+        required: true
+        default: 'desktop'
+      release_tag:
+        description: 'Release tag to build (e.g., v1.13.0)'
+        required: true
+        default: 'v1.13.0'
   release:
     types: [created]
 
@@ -16,7 +27,7 @@ jobs:
   build-desktop:
     name: build-desktop
     runs-on: ${{ matrix.os }}
-    if: github.event_name == 'release' || github.event.client_payload.platform == 'desktop'
+    if: github.event_name == 'release' || github.event.inputs.platform == 'desktop'
 
     strategy:
       matrix:
@@ -51,7 +62,7 @@ jobs:
   build-web:
     name: build-web
     runs-on: macos-latest
-    if: github.event_name == 'release' || github.event.client_payload.platform == 'web'
+    if: github.event_name == 'release' || github.event.inputs.platform == 'web'
 
     steps:
       - name: Decide Git ref
@@ -80,7 +91,7 @@ jobs:
   build-android:
     name: build-android
     runs-on: macos-latest
-    if: github.event_name == 'release' || github.event.client_payload.platform == 'android'
+    if: github.event_name == 'release' || github.event.inputs.platform == 'android'
 
     steps:
       - name: Decide Git ref
@@ -129,7 +140,7 @@ jobs:
   build-ios:
     name: build-ios
     runs-on: macos-latest
-    if: github.event_name == 'release' || github.event.client_payload.platform == 'ios'
+    if: github.event_name == 'release' || github.event.inputs.platform == 'ios'
 
     steps:
       - name: Decide Git ref
@@ -158,7 +169,7 @@ jobs:
   build-windows:
     name: build-windows
     runs-on: windows-latest
-    if: github.event_name == 'release' || github.event.client_payload.platform == 'windows'
+    if: github.event_name == 'release' || github.event.inputs.platform == 'windows'
 
     steps:
       - name: Decide Git ref

BUILDING.md

@@ -15,7 +15,7 @@ To build Filament for Android you must also install the following:
 
 - Android Studio Arctic Fox or more recent
 - Android SDK
-- Android NDK "side-by-side" 22.1 or higher
+- Android NDK "side-by-side" 23.1 or higher
 
 ### Environment variables
 
@@ -291,11 +291,11 @@ Alternatively you can build the AAR from the command line by executing the follo
 `android/` directory:
 
 ```
-$ ./gradlew -Pfilament_dist_dir=../../out/android-release/filament assembleRelease
+$ ./gradlew -Pcom.google.android.filament.dist-dir=../../out/android-release/filament assembleRelease
 ```
 
-The `-Pfilament_dist_dir` can be used to specify a different installation directory (it must match
-the CMake install prefix used in the previous steps).
+The `-Pcom.google.android.filament.dist-dir` can be used to specify a different installation
+directory (it must match the CMake install prefix used in the previous steps).
 
 #### Using Filament's AAR
 

CMakeLists.txt

@@ -23,6 +23,12 @@ option(FILAMENT_SUPPORTS_XCB "Include XCB support in Linux builds" ON)
 
 option(FILAMENT_SUPPORTS_XLIB "Include XLIB support in Linux builds" ON)
 
+option(FILAMENT_SUPPORTS_WAYLAND "Include Wayland support in Linux builds" OFF)
+
+option(FILAMENT_SKIP_SDL2 "Skip dependencies of SDL2, and SDL2" OFF)
+
+option(FILAMENT_LINUX_IS_MOBILE "Treat Linux as Mobile" OFF)
+
 set(FILAMENT_NDK_VERSION "" CACHE STRING
     "Android NDK version or version prefix to be used when building for Android."
 )
@@ -94,20 +100,34 @@ if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT WEBGL)
 endif()
 
 if (LINUX)
-    if (FILAMENT_SUPPORTS_XCB)
-        add_definitions(-DFILAMENT_SUPPORTS_XCB)
-    endif()
+    if (FILAMENT_SUPPORTS_WAYLAND)
+        add_definitions(-DFILAMENT_SUPPORTS_WAYLAND)
+        set(FILAMENT_SUPPORTS_X11 FALSE)
+    else ()
+        if (FILAMENT_SUPPORTS_XCB)
+            add_definitions(-DFILAMENT_SUPPORTS_XCB)
+        endif()
 
-    if (FILAMENT_SUPPORTS_XLIB)
-        add_definitions(-DFILAMENT_SUPPORTS_XLIB)
+        if (FILAMENT_SUPPORTS_XLIB)
+            add_definitions(-DFILAMENT_SUPPORTS_XLIB)
+        endif()
+
+        if (FILAMENT_SUPPORTS_XCB OR FILAMENT_SUPORTS_XLIB)
+            add_definitions(-DFILAMENT_SUPPORTS_X11)
+            set(FILAMENT_SUPPORTS_X11 TRUE)
+        endif()
     endif()
 endif()
 
-if (ANDROID OR WEBGL OR IOS)
+if (ANDROID OR WEBGL OR IOS OR FILAMENT_LINUX_IS_MOBILE)
     set(IS_MOBILE_TARGET TRUE)
 endif()
 
-if (NOT ANDROID AND NOT WEBGL AND NOT IOS)
+if (ANDROID)
+    add_definitions(-D__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
+endif()
+
+if (NOT ANDROID AND NOT WEBGL AND NOT IOS AND NOT FILAMENT_LINUX_IS_MOBILE)
     set(IS_HOST_PLATFORM TRUE)
 endif()
 
@@ -279,7 +299,7 @@ if (LINUX)
 endif()
 
 if (ANDROID)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Werror=unguarded-availability")
 endif()
 
 if (CYGWIN)
@@ -502,11 +522,15 @@ function(list_licenses OUTPUT MODULES)
     foreach(module ${_MODULES})
         set(license_path "../../third_party/${module}/LICENSE")
         get_filename_component(fullname "${license_path}" ABSOLUTE)
-        string(APPEND CONTENT "${STR_OPENER}License and copyrights for ${module}:\n${STR_CLOSER},\n")
-        file(READ ${license_path} license_long)
-        string(REPLACE "\n" "${STR_CLOSER},\n${STR_OPENER}" license ${license_long})
-        string(APPEND CONTENT ${STR_OPENER}${license}\n${STR_CLOSER},)
-        string(APPEND CONTENT "\n\n")
+        if(EXISTS ${fullname})
+            string(APPEND CONTENT "${STR_OPENER}License and copyrights for ${module}:\n${STR_CLOSER},\n")
+            file(READ ${license_path} license_long)
+            string(REPLACE "\n" "${STR_CLOSER},\n${STR_OPENER}" license ${license_long})
+            string(APPEND CONTENT ${STR_OPENER}${license}\n${STR_CLOSER},)
+            string(APPEND CONTENT "\n\n")
+        else()
+            message(AUTHOR_WARNING "${license_path} not found. You can ignore this warning if you have devendored ${module}.")
+        endif()
     endforeach()
     configure_file(${FILAMENT}/build/licenses.inc.in ${OUTPUT})
 endfunction(list_licenses)
@@ -522,7 +546,12 @@ function(combine_static_libs TARGET OUTPUT DEPS)
     # Loop through the dependent libraries and query their location on disk.
     set(DEPS_FILES )
     foreach(DEPENDENCY ${DEPS})
-        list(APPEND DEPS_FILES "$<TARGET_FILE:${DEPENDENCY}>")
+        if(TARGET ${DEPENDENCY})
+            get_property(dep_type TARGET ${DEPENDENCY} PROPERTY TYPE)
+            if(dep_type STREQUAL "STATIC_LIBRARY")
+                list(APPEND DEPS_FILES "$<TARGET_FILE:${DEPENDENCY}>")
+            endif()
+        endif()
     endforeach()
 
     add_custom_command(
@@ -555,12 +584,14 @@ if (FILAMENT_USE_SWIFTSHADER)
     find_library(SWIFTSHADER_VK NAMES vk_swiftshader HINTS "$ENV{SWIFTSHADER_LD_LIBRARY_PATH}")
     message(STATUS "Found SwiftShader VK library in: ${SWIFTSHADER_VK}.")
     add_definitions(-DFILAMENT_VKLIBRARY_PATH=\"${SWIFTSHADER_VK}\")
-elseif (FILAMENT_SUPPORTS_VULKAN AND APPLE)
-    find_library(Vulkan_LIBRARY NAMES vulkan HINTS "$ENV{VULKAN_SDK}/lib" "$ENV{VULKAN_SDK}/macOS/lib")
-    if (Vulkan_LIBRARY)
-        set(Vulkan_FOUND ON)
-        message(STATUS "Found Vulkan library in SDK: ${Vulkan_LIBRARY}.")
-        add_definitions(-DFILAMENT_VKLIBRARY_PATH=\"${Vulkan_LIBRARY}\")
+elseif (FILAMENT_SUPPORTS_VULKAN)
+    if (APPLE OR FILAMENT_LINUX_IS_MOBILE)
+        find_library(Vulkan_LIBRARY NAMES vulkan HINTS "$ENV{VULKAN_SDK}/lib" "$ENV{VULKAN_SDK}/macOS/lib")
+        if (Vulkan_LIBRARY)
+            set(Vulkan_FOUND ON)
+            message(STATUS "Found Vulkan library in SDK: ${Vulkan_LIBRARY}.")
+            add_definitions(-DFILAMENT_VKLIBRARY_PATH=\"${Vulkan_LIBRARY}\")
+        endif()
     endif()
 endif()
 

README.md

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.12.4'
+    implementation 'com.google.android.filament:filament-android:1.19.0'
 }
 ```
 
@@ -52,7 +52,7 @@ Here are all the libraries available in the group `com.google.android.filament`:
 iOS projects can use CocoaPods to install the latest release:
 
 ```
-pod 'Filament', '~> 1.12.4'
+pod 'Filament', '~> 1.19.0'
 ```
 
 ### Snapshots
@@ -122,13 +122,14 @@ steps:
 - Specular anti-aliasing
 - Spot and directional light shadows
 - Cascaded shadows
-- EVSM or PCF shadows
+- EVSM, PCSS, DPCF, or PCF shadows
 - Transparent shadows
 - Contact shadows
 - Screen-space ambient occlusion
+- Screen-space reflections
 - Screen-space refraction
 - Global fog
-- Dynamic resolution
+- Dynamic resolution (with support for AMD FidelityFX FSR)
 
 ### Post processing
 
@@ -151,9 +152,9 @@ steps:
   - [x] Points
   - [x] Lines
   - [ ] Line Loop
-  - [ ] Line Strip
+  - [x] Line Strip
   - [x] Triangles
-  - [ ] Triangle Strip
+  - [x] Triangle Strip
   - [ ] Triangle Fan
 
 - Animation

RELEASE_NOTES.md

@@ -3,7 +3,147 @@
 This file contains one line summaries of commits that are worthy of mentioning in release notes.
 A new header is inserted each time a *tag* is created.
 
-## v1.12.5 (currently main branch)
+## v1.19.1 (currently main branch)
+
+## v1.19.0
+
+- engine: Support 256 morph targets.
+- engine: Screen-space reflection improvements.
+- engine: Morphing improvements and bug fixes.
+- gltfio: Generate morphing normals when they are missing.
+- gltfio: Support material extras.
+- Java: Add bindings for new morphing API.
+- Vulkan: Fix segfault on macOS.
+
+## v1.18.0
+
+- engine: Add support separate samplers in fragment and vertex shaders [⚠️ **Material breakage**].
+- engine: Support legacy morphing mode with vertex attributes.
+- engine: Allow more flexible quality settings for the ColorGrading LUT.
+- engine: Improve screen-space reflections quality and allow reflections and refractions together.
+- Vulkan: Bug fixes and improvements.
+
+## v1.17.0
+
+- engine: Add experimental glossy screen-space reflections.
+- engine: Add support for GPU morphing and 128 morph targets.
+- engine: Fix crash with non-shadow receiving renderables and VSM.
+- engine: Bring back the 3x3 filter for PCF shadows.
+- engine: Correct AABB calculation for skinned glTF models.
+
+## v1.16.1
+
+- engine: Added line/triangle strip support.
+
+## v1.16.0
+
+- engine: Fixes skinning calculations (#4887) [⚠️ **Material breakage**].
+- engine: Add support for the glTF extension KHR_materials_emissive_strength.
+- engine: Improvements and fixes to skinning calculations.
+- engine: Fix debug checks for compressed textures.
+- Metal: Fix `readPixels` when dimensions are greater than the render target's.
+
+## v1.15.2
+
+- engine: Add support for PCSS (Percentage Closer Soft Shadows).
+- engine: Fix spotlight shadow bias.
+- samples: Avoid leaking IBLs in Android sample-gltf-viewer.
+- libs: Fix `libibl` on mobile.
+
+## v1.15.1
+
+- engine: add support for DPCF (PCF shadows with contact hardening).
+- engine: add support for Wayland and Vulkan.
+- engine: Fade lights out when close to light far plane.
+- Java: Add missing `Engine#destroySkinningBuffer` method.
+
+## v1.15.0
+
+- engine: Fix spotlights normal bias calculation [⚠️ **Material breakage**].
+- libimage: Fix loading spherical harmonics on certain locals.
+
+## v1.14.2
+
+- Metal: Fix validation error when rendering to `RenderTarget` without depth attachment.
+- engine: Fix rendering glitch with zero-scale bone transforms.
+
+## v1.14.1
+
+- engine: Improvements to shadowing.
+
+## v1.14.0
+
+- engine: Internal materials can use structures as parameters [⚠️ **Material breakage**].
+- engine: `readPixels` on a `SwapChain` must be called within `beginFrame` / `endFrame` [⚠️ **API
+  Change**].
+- engine: Fix normal bias and improve spotlight quality.
+- Java: Fix shadow biases.
+
+## v1.13.0
+
+- Android: Gradle configuration caching is now enabled.
+- Android: Filament's Gradle properties have all been renamed to `com.google.android.filament.xxx`
+  where `xxx` is the property name. See `android/build.gradle` for a complete list [⚠️]
+- Android: The Gradle property `filament_tools_dir` (now called
+  `com.google.android.filament.tools-dir`) does not have a default value anymore. Please specify one
+  in your `gradle.properties` if you reuse the Gradle plugin in your projects [⚠️]
+- engine: Fix spotlights direction and falloff [⚠️ **Material breakage**].
+- engine: Improvements to VSM and spotlight shadows.
+
+## v1.12.11
+
+- Metal: Color grading performance improvement on M1 devices.
+- samples: Fix glitchy animation seen in gltf-viewer iOS sample.
+
+## v1.12.10
+
+- engine: rewrite dynamic resolution scaling controller for better accuracy and less jittering.
+- Java: fix missing ASTC texture enum.
+- tools: Fix normal map issues in mipgen.
+- WebGL: expose some `SurfaceOrientation` functions.
+
+## v1.12.9
+
+- engine: New API: `MultiSampleAntiAliasingOptions` and HDR-aware MSAA resolve. When `customResolve`
+  is enabled, improves anti-aliasing quality [**NEW API**].
+- engine: Fixes and improvements for FSR.
+- engine: All APIs that take a callback as argument now also take a `CallbackHandler*`, a new
+  interface that provides more flexibility around callback dispatch [**NEW API**].
+- Android: Fix JNI bindings for `DepthOfFieldOptions`.
+- Android: workarounds for Adreno-specific fraembuffer issue.
+- JavaScript: updates to JS bindings.
+
+## v1.12.8
+
+- engine: Added picking API to `View`  [⚠️ **Materials need to be rebuilt to access this new feature**].
+- engine: A new `Engine::pumpMessageQueues()` method can be used to trigger all pending user
+  callbacks right away [**NEW API**].
+- engine: new inline helpers to more easily use lambdas, functors and method callbacks with
+  `{Pixel}BufferDescriptor`.
+- Vulkan: fix vertical offset for `readPixels`.
+- Vulkan: various internal improvements.
+- Metal: support integer formats with `readPixels`.
+
+## v1.12.7
+
+- engine: Fix, apply emissive after shadowing.
+
+## v1.12.6
+
+- engine: Added concept of lod bias to materials.
+  [⚠️ **Materials need to be rebuilt to access this new feature**].
+- engine: Fix, BGRA ordering respected for external images with OpenGL on iOS.
+- engine: Use more sensible defaults for spot light inner outer cone angles.
+- engine: Fix potential race condition that caused stalls in `endFrame`.
+- gltfio: Improved handling of transparent materials.
+- Metal: Fix potential crash on earlier versions of iOS (<= 13.0).
+- Android: Fix `filament-utils-android` 'lite' flavor.
+- Java: Fix potential crash with `IBLPrefilter`.
+
+## v1.12.5
+
+- engine: work around a job scheduling issue in `endFrame` that caused stuttering on some Android
+devices.
 
 ## v1.12.4
 
@@ -20,7 +160,7 @@ A new header is inserted each time a *tag* is created.
 
 ## v1.12.2
 
-- engine: New API on `ColorGrading` to enable or disable gamut mapping at will [**New Api**].
+- engine: New API on `ColorGrading` to enable or disable gamut mapping at will [**New API**].
 - engine: Fix typo causing ShadowOptions::shadowFar to not work properly.
 - engine: Fix, CSM glitch when using shadowMultiplier materials.
 - engine: Improve precision when computing camera projection.

android/Windows.md

@@ -122,20 +122,20 @@ The Gradle project used to generate the AAR is located at `<filament>\android`.
 
 ```
 cd android
-gradlew -Pfilament_dist_dir=..\out\android-release\filament assembleRelease
+gradlew -Pcom.google.android.filament.dist-dir=..\out\android-release\filament assembleRelease
 copy filament-android\build\outputs\aar\filament-android-release.aar ..\..\out\
 ```
 
-If you're only interested in building for a single ABI, you'll need to pass a `filament_abis` parameter:
+If you're only interested in building for a single ABI, you'll need to pass a `com.google.android.filament.abis` parameter:
 
 ```
-gradlew -Pfilament_dist_dir=..\out\android-release\filament assembleRelease -Pfilament_abis=x86
+gradlew -Pcom.google.android.filament.dist-dir=..\out\android-release\filament assembleRelease -Pcom.google.android.filament.abis=x86
 ```
 
-If you're only interested in building SDK, you may skip samples build by passing a `filament_skip_samples` flag:
+If you're only interested in building SDK, you may skip samples build by passing a `com.google.android.filament.skip-samples` flag:
 
 ```
-gradlew -Pfilament_dist_dir=..\out\android-release\filament assembleRelease -Pfilament_skip_samples
+gradlew -Pcom.google.android.filament.dist-dir=..\out\android-release\filament assembleRelease -Pfilament_skip_samples
 ```
 
 

android/build.gradle

@@ -1,26 +1,28 @@
 // This script accepts the following parameters:
 //
-// filament_dist_dir
+// com.google.android.filament.dist-dir
 //     Path to the Filament distribution/install directory for Android
 //     (produced by make/ninja install). This directory must contain lib/arm64-v8a/ etc.
 //
-// filament_tools_dir
+// com.google.android.filament.tools-dir
 //     Path to the Filament distribution/install directory for desktop.
 //     This directory must contain bin/matc.
 //
-// filament_exclude_vulkan
+// com.google.android.filament.exclude-vulkan
 //     When set, support for Vulkan will be excluded.
 //
-// filament_skip_samples
+// com.google.android.filament.skip-samples
 //     Exclude samples from the project. Useful to speed up compilation.
 //
-// filament_abis
+// com.google.android.filament.abis
 //     List of supported ABIs to build as a comma separated list. Available options are:
 //         arm64-v8a, armeabi-v7a, x86_64, x86, all
 //     Defaults to all.
 //
 // Example:
-//     ./gradlew -Pfilament_dist_dir=../dist-android-release assembleRelease -Pfilament_abis=x86
+//     ./gradlew -Pcom.google.android.filament.dist-dir=../dist-android-release \
+//               -Pcom.google.android.filament.abis=x86 \
+//               assembleRelease
 
 // Publishing to Maven Central:
 //   - Build and upload artifacts with ./gradlew publish
@@ -40,44 +42,58 @@
 //
 
 buildscript {
-    def filamentPath = file("../out/android-release/filament").absolutePath
-    if (project.hasProperty("filament_dist_dir")) {
-        filamentPath = file(project.property("filament_dist_dir")).absolutePath
-    }
+    def path = providers
+            .gradleProperty("com.google.android.filament.dist-dir")
+            .forUseAtConfigurationTime().get()
+
+    def directory = objects.fileProperty().fileValue(new File(path)).getAsFile().get()
+    def filamentPath = directory.absolutePath
+
     // Our CMake scripts require a forward-slash path for the FILAMENT_DIST_DIR
     // variable, so here we convert the native path to a forward-slash path.
     filamentPath = filamentPath.replace(File.separator, '/')
 
     // Warning: changing this property does not work well with incremental builds.
-    def excludeVulkan = project.hasProperty("filament_exclude_vulkan")
+    def excludeVulkan = providers
+            .gradleProperty("com.google.android.filament.exclude-vulkan")
+            .forUseAtConfigurationTime()
+            .isPresent()
 
     def abis = ["arm64-v8a", "armeabi-v7a", "x86_64", "x86"]
-    if (project.hasProperty("filament_abis")) {
-        def newAbis = project.property("filament_abis").split(',')
-        if (!newAbis.contains("all")) {
-            abis = newAbis
-        }
+    def newAbis = providers
+            .gradleProperty("com.google.android.filament.abis")
+            .forUseAtConfigurationTime()
+            .get()
+            .split(',')
+    if (!newAbis.contains("all")) {
+        abis = newAbis
     }
 
     ext.versions = [
         'minSdk': 19,
-        'targetSdk': 30,
-        'compileSdk': 30,
-        'kotlin': '1.5.21',
-        'buildTools': '30.0.3',
-        'ndk': '22.1.7171670'
+        'targetSdk': 31,
+        'compileSdk': 31,
+        'kotlin': '1.6.0',
+        'kotlin_coroutines': '1.5.2',
+        'buildTools': '31.0.0',
+        'ndk': '23.1.7779620'
     ]
 
     ext.deps = [
         'androidx': [
-            'annotations': "androidx.annotation:annotation:1.1.0",
-            'core': "androidx.core:core:1.3.0",
+            'annotations': "androidx.annotation:annotation:1.3.0",
+            'core': "androidx.core:core:1.7.0",
         ],
-        'kotlin': "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
+        'kotlin': "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}",
+        'coroutines': [
+            'core': "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlin_coroutines}",
+            'android': "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.kotlin_coroutines}",
+        ]
     ]
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        // NOTE: See TODO in gradle.properties once we move to Gradle 7.2
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
     }
 
@@ -118,7 +134,7 @@ buildscript {
 }
 
 plugins {
-    id 'io.codearte.nexus-staging' version '0.22.0'
+    id 'io.codearte.nexus-staging' version '0.30.0'
 }
 
 // Nexus Staging configuration
@@ -187,7 +203,8 @@ subprojects {
 gradle.taskGraph.whenReady {
     gradle.taskGraph.allTasks.each {
         it.onlyIf {
-            !it.project.ext.has('isSample') || !project.hasProperty('filament_skip_samples')
+            !it.project.ext.has('isSample') ||
+                    !project.hasProperty('com.google.android.filament.skip-samples')
          }
     }
 }

android/buildSrc/build.gradle

@@ -1,3 +1,17 @@
+
+plugins {
+    id 'groovy-gradle-plugin'
+}
+
+gradlePlugin {
+    plugins {
+        create("filament-tools-plugin") {
+            id = "filament-tools-plugin"
+            implementationClass = "FilamentToolsPlugin"
+        }
+    }
+}
+
 repositories {
     mavenCentral()
 }

android/buildSrc/src/main/groovy/FilamentPlugin.groovy

@@ -1,20 +1,22 @@
 // This plugin accepts the following parameters:
 //
-// filament_tools_dir
+// com.google.android.filament.tools-dir
 //     Path to the Filament distribution/install directory for desktop.
 //     This directory must contain bin/matc.
 //
-// filament_exclude_vulkan
+// com.google.android.filament.exclude-vulkan
 //     When set, support for Vulkan will be excluded.
 //
 // Example:
-//     ./gradlew -Pfilament_tools_dir=../../dist-release assembleDebug
+//     ./gradlew -Pcom.google.android.filament.tools-dir=../../dist-release assembleDebug
 
 import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.provider.ProviderFactory
 import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.file.FileType
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.logging.LogLevel
@@ -27,14 +29,18 @@ import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.incremental.InputFileDetails
+import org.gradle.api.model.ObjectFactory
 import org.gradle.internal.os.OperatingSystem
+import org.gradle.process.ExecOperations
 import org.gradle.work.ChangeType
 import org.gradle.work.Incremental
 import org.gradle.work.InputChanges
 
 import java.nio.file.Paths
 
-class TaskWithBinary extends DefaultTask {
+import javax.inject.Inject
+
+abstract class TaskWithBinary extends DefaultTask {
     private final String binaryName
     private Property<String> binaryPath = null
 
@@ -42,15 +48,23 @@ class TaskWithBinary extends DefaultTask {
         binaryName = name
     }
 
+    @Inject abstract ObjectFactory getObjects()
+    @Inject abstract ProviderFactory getProviders()
+
     @Input
     Property<String> getBinary() {
         if (binaryPath == null) {
             def tool = ["/bin/${binaryName}.exe", "/bin/${binaryName}"]
             def fullPath = tool.collect { path ->
-                Paths.get(project.ext.filamentToolsPath.absolutePath, path).toFile()
+                def filamentToolsPath = providers
+                        .gradleProperty("com.google.android.filament.tools-dir")
+                        .forUseAtConfigurationTime().get()
+                def directory = objects.fileProperty()
+                        .fileValue(new File(filamentToolsPath)).getAsFile().get()
+                Paths.get(directory.absolutePath, path).toFile()
             }
 
-            binaryPath = project.objects.property(String.class)
+            binaryPath = objects.property(String.class)
             binaryPath.set(
                     (OperatingSystem.current().isWindows() ? fullPath[0] : fullPath[1]).toString())
         }
@@ -84,6 +98,11 @@ abstract class MaterialCompiler extends TaskWithBinary {
     @OutputDirectory
     abstract DirectoryProperty getOutputDir()
 
+    @Inject abstract FileSystemOperations getFs()
+    @Inject abstract ExecOperations getExec()
+    @Inject abstract ObjectFactory getObjects()
+    @Inject abstract ProviderFactory getProviders()
+
     MaterialCompiler() {
         super("matc")
     }
@@ -91,7 +110,9 @@ abstract class MaterialCompiler extends TaskWithBinary {
     @TaskAction
     void execute(InputChanges inputs) {
         if (!inputs.incremental) {
-            project.delete(project.fileTree(outputDir.asFile.get()).matching { include '*.filamat' })
+            fs.delete({
+                delete(objects.fileTree().from(outputDir).matching { include '*.filamat' })
+            })
         }
 
         inputs.getFileChanges(inputDir).each { InputFileDetails change ->
@@ -115,12 +136,15 @@ abstract class MaterialCompiler extends TaskWithBinary {
                 }
 
                 def matcArgs = []
-                if (!project.hasProperty("filament_exclude_vulkan")) {
+                def exclude_vulkan = providers
+                        .gradleProperty("com.google.android.filament.exclude-vulkan")
+                        .forUseAtConfigurationTime().present
+                if (!exclude_vulkan) {
                     matcArgs += ['-a', 'vulkan']
                 }
                 matcArgs += ['-a', 'opengl', '-p', 'mobile', '-o', getOutputFile(file), file]
 
-                project.exec {
+                exec.exec {
                     standardOutput out
                     errorOutput err
                     executable "${binary.get()}"
@@ -149,6 +173,10 @@ abstract class IblGenerator extends TaskWithBinary {
     @OutputDirectory
     abstract DirectoryProperty getOutputDir()
 
+    @Inject abstract FileSystemOperations getFs()
+    @Inject abstract ExecOperations getExec()
+    @Inject abstract ObjectFactory getObjects()
+
     IblGenerator() {
         super("cmgen")
     }
@@ -156,7 +184,9 @@ abstract class IblGenerator extends TaskWithBinary {
     @TaskAction
     void execute(InputChanges inputs) {
         if (!inputs.incremental) {
-            project.delete(project.fileTree(outputDir.asFile.get()).matching { include '*' })
+            fs.delete({
+                delete(objects.fileTree().from(outputDir).matching { include '*' })
+            })
         }
 
         inputs.getFileChanges(inputFile).each { InputFileDetails change ->
@@ -188,7 +218,7 @@ abstract class IblGenerator extends TaskWithBinary {
                 }
                 commandArgs = commandArgs + " " + file
 
-                project.exec {
+                exec.exec {
                     standardOutput out
                     errorOutput err
                     executable "${binary.get()}"
@@ -213,6 +243,9 @@ abstract class MeshCompiler extends TaskWithBinary {
     @OutputDirectory
     abstract DirectoryProperty getOutputDir()
 
+    @Inject abstract FileSystemOperations getFs()
+    @Inject abstract ExecOperations getExec()
+
     MeshCompiler() {
         super("filamesh")
     }
@@ -220,7 +253,9 @@ abstract class MeshCompiler extends TaskWithBinary {
     @TaskAction
     void execute(InputChanges inputs) {
         if (!inputs.incremental) {
-            project.delete(project.fileTree(outputDir.asFile.get()).matching { include '*.filamesh' })
+            fs.delete({
+                delete(objects.fileTree().from(outputDir).matching { include '*.filamesh' })
+            })
         }
 
         inputs.getFileChanges(inputFile).each { InputFileDetails change ->
@@ -243,7 +278,7 @@ abstract class MeshCompiler extends TaskWithBinary {
                             " Ensure Filament has been built/installed before building this app.")
                 }
 
-                project.exec {
+                exec.exec {
                     standardOutput out
                     errorOutput err
                     executable "${binary.get()}"
@@ -280,11 +315,6 @@ class FilamentToolsPlugin implements Plugin<Project> {
         extension.meshInputFile = project.objects.fileProperty()
         extension.meshOutputDir = project.objects.directoryProperty()
 
-        project.ext.filamentToolsPath = project.file("../../../out/release/filament")
-        if (project.hasProperty("filament_tools_dir")) {
-            project.ext.filamentToolsPath = project.file(project.property("filament_tools_dir"))
-        }
-
         project.tasks.register("filamentCompileMaterials", MaterialCompiler) {
             enabled =
                     extension.materialInputDir.isPresent() &&

android/common/CallbackUtils.cpp

@@ -16,8 +16,10 @@
 
 #include "CallbackUtils.h"
 
+#include "private/backend/VirtualMachineEnv.h"
+
 void acquireCallbackJni(JNIEnv* env, CallbackJni& callbackUtils) {
-#ifdef ANDROID
+#ifdef __ANDROID__
     callbackUtils.handlerClass = env->FindClass("android/os/Handler");
     callbackUtils.handlerClass = (jclass) env->NewGlobalRef(callbackUtils.handlerClass);
     callbackUtils.post = env->GetMethodID(callbackUtils.handlerClass,
@@ -32,7 +34,7 @@ void acquireCallbackJni(JNIEnv* env, CallbackJni& callbackUtils) {
 
 void releaseCallbackJni(JNIEnv* env, CallbackJni callbackUtils, jobject handler, jobject callback) {
     if (handler && callback) {
-#ifdef ANDROID
+#ifdef __ANDROID__
         if (env->IsInstanceOf(handler, callbackUtils.handlerClass)) {
             env->CallBooleanMethod(handler, callbackUtils.post, callback);
         }
@@ -43,59 +45,12 @@ void releaseCallbackJni(JNIEnv* env, CallbackJni callbackUtils, jobject handler,
     }
     env->DeleteGlobalRef(handler);
     env->DeleteGlobalRef(callback);
-#ifdef ANDROID
+#ifdef __ANDROID__
     env->DeleteGlobalRef(callbackUtils.handlerClass);
 #endif
     env->DeleteGlobalRef(callbackUtils.executorClass);
 }
 
-JniBufferCallback* JniBufferCallback::make(filament::Engine* engine,
-        JNIEnv* env, jobject handler, jobject callback, AutoBuffer&& buffer) {
-    return new JniBufferCallback(env, handler, callback, std::move(buffer));
-}
-
-JniBufferCallback::JniBufferCallback(JNIEnv* env, jobject handler, jobject callback,
-        AutoBuffer&& buffer)
-        : mEnv(env)
-        , mHandler(env->NewGlobalRef(handler))
-        , mCallback(env->NewGlobalRef(callback))
-        , mBuffer(std::move(buffer)) {
-    acquireCallbackJni(env, mCallbackUtils);
-}
-
-JniBufferCallback::~JniBufferCallback() {
-    releaseCallbackJni(mEnv, mCallbackUtils, mHandler, mCallback);
-}
-
-void JniBufferCallback::invoke(void*, size_t, void* user) {
-    JniBufferCallback* data = reinterpret_cast<JniBufferCallback*>(user);
-    delete data;
-}
-
-// -----------------------------------------------------------------------------------------------
-
-JniImageCallback* JniImageCallback::make(filament::Engine* engine,
-        JNIEnv* env, jobject handler, jobject callback, long image) {
-    return new JniImageCallback(env, handler, callback, image);
-}
-
-JniImageCallback::JniImageCallback(JNIEnv* env, jobject handler, jobject callback, long image)
-        : mEnv(env)
-        , mHandler(env->NewGlobalRef(handler))
-        , mCallback(env->NewGlobalRef(callback))
-        , mImage(image) {
-    acquireCallbackJni(env, mCallbackUtils);
-}
-
-JniImageCallback::~JniImageCallback() {
-    releaseCallbackJni(mEnv, mCallbackUtils, mHandler, mCallback);
-}
-
-void JniImageCallback::invoke(void*, void* user) {
-    JniImageCallback* data = reinterpret_cast<JniImageCallback*>(user);
-    delete data;
-}
-
 // -----------------------------------------------------------------------------------------------
 
 JniCallback* JniCallback::make(JNIEnv* env, jobject handler, jobject callback) {
@@ -103,17 +58,63 @@ JniCallback* JniCallback::make(JNIEnv* env, jobject handler, jobject callback) {
 }
 
 JniCallback::JniCallback(JNIEnv* env, jobject handler, jobject callback)
-        : mEnv(env)
-        , mHandler(env->NewGlobalRef(handler))
-        , mCallback(env->NewGlobalRef(callback)) {
+        : mHandler(env->NewGlobalRef(handler)),
+          mCallback(env->NewGlobalRef(callback)) {
     acquireCallbackJni(env, mCallbackUtils);
 }
 
-JniCallback::~JniCallback() {
-    releaseCallbackJni(mEnv, mCallbackUtils, mHandler, mCallback);
+JniCallback::~JniCallback() = default;
+
+void JniCallback::post(void* user, filament::backend::CallbackHandler::Callback callback) {
+    callback(user);
 }
 
-void JniCallback::invoke(void* user) {
-    JniCallback* data = reinterpret_cast<JniCallback*>(user);
-    delete data;
+void JniCallback::postToJavaAndDestroy(JniCallback* callback) {
+    JNIEnv* env = filament::VirtualMachineEnv::get().getEnvironment();
+    releaseCallbackJni(env, callback->mCallbackUtils, callback->mHandler, callback->mCallback);
+    delete callback;
+}
+
+// -----------------------------------------------------------------------------------------------
+
+JniBufferCallback* JniBufferCallback::make(filament::Engine*,
+        JNIEnv* env, jobject handler, jobject callback, AutoBuffer&& buffer) {
+    return new JniBufferCallback(env, handler, callback, std::move(buffer));
+}
+
+JniBufferCallback::JniBufferCallback(JNIEnv* env, jobject handler, jobject callback,
+        AutoBuffer&& buffer)
+        : JniCallback(env, handler, callback),
+        mBuffer(std::move(buffer)) {
+}
+
+JniBufferCallback::~JniBufferCallback() = default;
+
+void JniBufferCallback::postToJavaAndDestroy(void*, size_t, void* user) {
+    JniBufferCallback* callback = (JniBufferCallback*)user;
+    JNIEnv* env = filament::VirtualMachineEnv::get().getEnvironment();
+    callback->mBuffer.attachToJniThread(env);
+    releaseCallbackJni(env, callback->mCallbackUtils, callback->mHandler, callback->mCallback);
+    delete callback;
+}
+
+// -----------------------------------------------------------------------------------------------
+
+JniImageCallback* JniImageCallback::make(filament::Engine*,
+        JNIEnv* env, jobject handler, jobject callback, long image) {
+    return new JniImageCallback(env, handler, callback, image);
+}
+
+JniImageCallback::JniImageCallback(JNIEnv* env, jobject handler, jobject callback, long image)
+        : JniCallback(env, handler, callback),
+        mImage(image) {
+}
+
+JniImageCallback::~JniImageCallback() = default;
+
+void JniImageCallback::postToJavaAndDestroy(void*, void* user) {
+    JniImageCallback* callback = (JniImageCallback*)user;
+    JNIEnv* env = filament::VirtualMachineEnv::get().getEnvironment();
+    releaseCallbackJni(env, callback->mCallbackUtils, callback->mHandler, callback->mCallback);
+    delete callback;
 }

android/common/CallbackUtils.h

@@ -18,13 +18,14 @@
 
 #include <jni.h>
 
-#include "common/CallbackUtils.h"
 #include "common/NioUtils.h"
 
+#include <backend/CallbackHandler.h>
+
 #include <filament/Engine.h>
 
 struct CallbackJni {
-#ifdef ANDROID
+#ifdef __ANDROID__
     jclass handlerClass = nullptr;
     jmethodID post = nullptr;
 #endif
@@ -35,57 +36,60 @@ struct CallbackJni {
 void acquireCallbackJni(JNIEnv* env, CallbackJni& callbackUtils);
 void releaseCallbackJni(JNIEnv* env, CallbackJni callbackUtils, jobject handler, jobject callback);
 
-struct JniBufferCallback {
+struct JniCallback : private filament::backend::CallbackHandler {
+    JniCallback(JniCallback const &) = delete;
+    JniCallback(JniCallback&&) = delete;
+    JniCallback& operator=(JniCallback const &) = delete;
+    JniCallback& operator=(JniCallback&&) = delete;
+
+    // create a JniCallback
+    static JniCallback* make(JNIEnv* env, jobject handler, jobject runnable);
+
+    // execute the callback on the java thread and destroy ourselves
+    static void postToJavaAndDestroy(JniCallback* callback);
+
+    // CallbackHandler interface.
+    void post(void* user, Callback callback) override;
+
+    // Get the CallbackHandler interface
+    filament::backend::CallbackHandler* getHandler() noexcept { return this; }
+
+    jobject getCallbackObject() { return mCallback; }
+
+protected:
+    JniCallback(JNIEnv* env, jobject handler, jobject runnable);
+    explicit JniCallback() = default; // this version does nothing
+    virtual ~JniCallback();
+    jobject mHandler{};
+    jobject mCallback{};
+    CallbackJni mCallbackUtils{};
+};
+
+
+struct JniBufferCallback : public JniCallback {
+    // create a JniBufferCallback
     static JniBufferCallback* make(filament::Engine* engine,
             JNIEnv* env, jobject handler, jobject callback, AutoBuffer&& buffer);
 
-    static void invoke(void* buffer, size_t n, void* user);
+    // execute the callback on the java thread and destroy ourselves
+    static void postToJavaAndDestroy(void*, size_t, void* user);
 
 private:
     JniBufferCallback(JNIEnv* env, jobject handler, jobject callback, AutoBuffer&& buffer);
-    JniBufferCallback(JniBufferCallback const &) = delete;
-    JniBufferCallback(JniBufferCallback&&) = delete;
-    ~JniBufferCallback();
-
-    JNIEnv* mEnv;
-    jobject mHandler;
-    jobject mCallback;
+    virtual ~JniBufferCallback();
     AutoBuffer mBuffer;
-    CallbackJni mCallbackUtils;
 };
 
-struct JniImageCallback {
+struct JniImageCallback : public JniCallback {
+    // create a JniImageCallback
     static JniImageCallback* make(filament::Engine* engine, JNIEnv* env, jobject handler,
             jobject runnable, long image);
 
-    static void invoke(void* image, void* user);
+    // execute the callback on the java thread and destroy ourselves
+    static void postToJavaAndDestroy(void*, void* user);
 
 private:
     JniImageCallback(JNIEnv* env, jobject handler, jobject runnable, long image);
-    JniImageCallback(JniImageCallback const &) = delete;
-    JniImageCallback(JniImageCallback&&) = delete;
-    ~JniImageCallback();
-
-    JNIEnv* mEnv;
-    jobject mHandler;
-    jobject mCallback;
+    virtual ~JniImageCallback();
     long mImage;
-    CallbackJni mCallbackUtils;
-};
-
-struct JniCallback {
-    static JniCallback* make(JNIEnv* env, jobject handler, jobject runnable);
-
-    static void invoke(void* user);
-
-private:
-    JniCallback(JNIEnv* env, jobject handler, jobject runnable);
-    JniCallback(JniCallback const &) = delete;
-    JniCallback(JniCallback&&) = delete;
-    ~JniCallback();
-
-    JNIEnv* mEnv;
-    jobject mHandler;
-    jobject mCallback;
-    CallbackJni mCallbackUtils;
 };

android/common/NioUtils.h

@@ -38,6 +38,10 @@ public:
     AutoBuffer(AutoBuffer&& rhs) noexcept;
     ~AutoBuffer() noexcept;
 
+    void attachToJniThread(JNIEnv* env) noexcept {
+        mEnv = env;
+    }
+
     void* getData() const noexcept {
         return mUserData;
     }

android/filamat-android/src/main/cpp/MaterialBuilder.cpp

@@ -370,3 +370,10 @@ Java_com_google_android_filament_filamat_MaterialBuilder_nMaterialBuilderVariant
     auto builder = (MaterialBuilder*) nativeBuilder;
     builder->variantFilter((uint8_t) variantFilter);
 }
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_filamat_MaterialBuilder_nMaterialBuilderUseLegacyMorphing(JNIEnv*,
+        jclass, jlong nativeBuilder) {
+    auto builder = (MaterialBuilder*) nativeBuilder;
+    builder->useLegacyMorphing();
+}

android/filamat-android/src/main/java/com/google/android/filament/filamat/MaterialBuilder.java

@@ -459,6 +459,19 @@ public class MaterialBuilder {
     @NonNull
     public MaterialBuilder variantFilter(int variantFilter) {
         nMaterialBuilderVariantFilter(mNativeObject, variantFilter);
+        useLegacyMorphing();
+        return this;
+    }
+
+    /**
+     * Legacy morphing uses the data in the {@link VertexBuffer.VertexAttribute} slots
+     * (<code>MORPH_POSITION_0</code>, etc) and is limited to 4 morph targets.
+     *
+     * @see RenderableManager.Builder#morphing()
+     */
+    @NonNull
+    public MaterialBuilder useLegacyMorphing() {
+        nMaterialBuilderUseLegacyMorphing(mNativeObject);
         return this;
     }
 
@@ -599,4 +612,5 @@ public class MaterialBuilder {
     private static native void nMaterialBuilderOptimization(long nativeBuilder, int optimization);
     private static native void nMaterialBuilderVariantFilter(long nativeBuilder,
             int variantFilter);
+    private static native void nMaterialBuilderUseLegacyMorphing(long nativeBuilder);
 }

android/filament-android/CMakeLists.txt

@@ -74,6 +74,7 @@ add_library(filament-jni SHARED
     src/main/cpp/Material.cpp
     src/main/cpp/MaterialInstance.cpp
     src/main/cpp/MathUtils.cpp
+    src/main/cpp/MorphTargetBuffer.cpp
     src/main/cpp/RenderableManager.cpp
     src/main/cpp/Renderer.cpp
     src/main/cpp/RenderTarget.cpp
@@ -125,6 +126,7 @@ target_link_libraries(filament-jni
 target_include_directories(filament-jni PRIVATE
         ..
         ${FILAMENT_DIR}/include
+        ../../filament/backend/include
         ../../third_party/robin-map
         ../../libs/utils/include)
 

android/filament-android/src/main/cpp/BufferObject.cpp

@@ -91,7 +91,8 @@ Java_com_google_android_filament_BufferObject_nSetBuffer(JNIEnv *env, jclass typ
 
     auto* callback = JniBufferCallback::make(engine, env, handler, runnable, std::move(nioBuffer));
 
-    BufferDescriptor desc(data, sizeInBytes, &JniBufferCallback::invoke, callback);
+    BufferDescriptor desc(data, sizeInBytes,
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     bufferObject->setBuffer(*engine, std::move(desc), (uint32_t) destOffsetInBytes);
 

android/filament-android/src/main/cpp/ColorGrading.cpp

@@ -50,6 +50,19 @@ Java_com_google_android_filament_ColorGrading_nBuilderQuality(JNIEnv*, jclass, j
     builder->quality(quality);
 }
 
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_ColorGrading_nBuilderFormat(JNIEnv*, jclass, jlong nativeBuilder, jint format_) {
+    ColorGrading::Builder* builder = (ColorGrading::Builder*) nativeBuilder;
+    ColorGrading::LutFormat format = (ColorGrading::LutFormat) format_;
+    builder->format(format);
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_ColorGrading_nBuilderDimensions(JNIEnv*, jclass, jlong nativeBuilder, jint dim_) {
+    ColorGrading::Builder* builder = (ColorGrading::Builder*) nativeBuilder;
+    builder->dimensions((uint8_t)dim_);
+}
+
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_ColorGrading_nBuilderToneMapper(JNIEnv*, jclass,
         jlong nativeBuilder, jlong toneMapper_) {

android/filament-android/src/main/cpp/Engine.cpp

@@ -45,12 +45,11 @@ extern "C" {
 // handle. Whatever object is returned from this method must match what is in
 // folder filament/src/driver/opengl/Context* in particular pay attention to
 // the object type in makeCurrent method.
-extern void *getNativeWindow(JNIEnv *env, jclass, jobject surface);
+extern void* getNativeWindow(JNIEnv* env, jclass, jobject surface);
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_Engine_nGetBackend(JNIEnv* env,
-        jclass klass, jlong nativeEngine) {
+Java_com_google_android_filament_Engine_nGetBackend(JNIEnv*, jclass, jlong nativeEngine) {
     Engine* engine = (Engine*) nativeEngine;
     return (jlong) engine->getBackend();
 }
@@ -64,8 +63,8 @@ Java_com_google_android_filament_Engine_nCreateSwapChain(JNIEnv* env,
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_Engine_nCreateSwapChainHeadless(JNIEnv* env,
-        jclass klass, jlong nativeEngine, jint width, jint height, jlong flags) {
+Java_com_google_android_filament_Engine_nCreateSwapChainHeadless(JNIEnv*,
+        jclass, jlong nativeEngine, jint width, jint height, jlong flags) {
     Engine* engine = (Engine*) nativeEngine;
     return (jlong) engine->createSwapChain(width, height, (uint64_t) flags);
 }
@@ -81,7 +80,7 @@ extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nDestroySwapChain(JNIEnv*, jclass,
         jlong nativeEngine, jlong nativeSwapChain) {
     Engine* engine = (Engine*) nativeEngine;
-    SwapChain *swapChain = (SwapChain *) nativeSwapChain;
+    SwapChain* swapChain = (SwapChain*) nativeSwapChain;
     return engine->destroy(swapChain);
 }
 
@@ -98,7 +97,7 @@ extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nDestroyView(JNIEnv*, jclass,
         jlong nativeEngine, jlong nativeView) {
     Engine* engine = (Engine*) nativeEngine;
-    View *view = (View *) nativeView;
+    View* view = (View*) nativeView;
     return engine->destroy(view);
 }
 
@@ -115,7 +114,7 @@ extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nDestroyRenderer(JNIEnv*, jclass,
         jlong nativeEngine, jlong nativeRenderer) {
     Engine* engine = (Engine*) nativeEngine;
-    Renderer *renderer = (Renderer *) nativeRenderer;
+    Renderer* renderer = (Renderer*) nativeRenderer;
     return engine->destroy(renderer);
 }
 
@@ -158,7 +157,7 @@ extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nDestroyScene(JNIEnv*, jclass,
         jlong nativeEngine, jlong nativeScene) {
     Engine* engine = (Engine*) nativeEngine;
-    Scene *scene = (Scene *) nativeScene;
+    Scene* scene = (Scene*) nativeScene;
     return engine->destroy(scene);
 }
 
@@ -175,7 +174,7 @@ extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nDestroyFence(JNIEnv*, jclass,
         jlong nativeEngine, jlong nativeFence) {
     Engine* engine = (Engine*) nativeEngine;
-    Fence *fence = (Fence *) nativeFence;
+    Fence* fence = (Fence*) nativeFence;
     return engine->destroy(fence);
 }
 
@@ -185,7 +184,7 @@ extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nDestroyStream(JNIEnv*, jclass,
         jlong nativeEngine, jlong nativeStream) {
     Engine* engine = (Engine*) nativeEngine;
-    Stream *stream = (Stream *) nativeStream;
+    Stream* stream = (Stream*) nativeStream;
     return engine->destroy(stream);
 }
 
@@ -195,7 +194,7 @@ extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nDestroyIndexBuffer(JNIEnv*, jclass,
         jlong nativeEngine, jlong nativeIndexBuffer) {
     Engine* engine = (Engine*) nativeEngine;
-    IndexBuffer *indexBuffer = (IndexBuffer *) nativeIndexBuffer;
+    IndexBuffer* indexBuffer = (IndexBuffer*) nativeIndexBuffer;
     return engine->destroy(indexBuffer);
 }
 
@@ -203,15 +202,23 @@ extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nDestroyVertexBuffer(JNIEnv*, jclass,
         jlong nativeEngine, jlong nativeVertexBuffer) {
     Engine* engine = (Engine*) nativeEngine;
-    VertexBuffer *vertexBuffer = (VertexBuffer *) nativeVertexBuffer;
+    VertexBuffer* vertexBuffer = (VertexBuffer*) nativeVertexBuffer;
     return engine->destroy(vertexBuffer);
 }
 
+extern "C" JNIEXPORT jboolean JNICALL
+Java_com_google_android_filament_Engine_nDestroySkinningBuffer(JNIEnv*, jclass,
+        jlong nativeEngine, jlong nativeSkinningBuffer) {
+    Engine* engine = (Engine*) nativeEngine;
+    SkinningBuffer* skinningBuffer = (SkinningBuffer*) nativeSkinningBuffer;
+    return engine->destroy(skinningBuffer);
+}
+
 extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nDestroyIndirectLight(JNIEnv*, jclass,
         jlong nativeEngine, jlong nativeIndirectLight) {
     Engine* engine = (Engine*) nativeEngine;
-    IndirectLight *indirectLight = (IndirectLight *) nativeIndirectLight;
+    IndirectLight* indirectLight = (IndirectLight*) nativeIndirectLight;
     return engine->destroy(indirectLight);
 }
 
@@ -219,7 +226,7 @@ extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nDestroyMaterial(JNIEnv*, jclass,
         jlong nativeEngine, jlong nativeMaterial) {
     Engine* engine = (Engine*) nativeEngine;
-    Material *material = (Material *) nativeMaterial;
+    Material* material = (Material*) nativeMaterial;
     return engine->destroy(material);
 }
 
@@ -235,7 +242,7 @@ extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nDestroySkybox(JNIEnv*, jclass,
         jlong nativeEngine, jlong nativeSkybox) {
     Engine* engine = (Engine*) nativeEngine;
-    Skybox *skybox = (Skybox *) nativeSkybox;
+    Skybox* skybox = (Skybox*) nativeSkybox;
     return engine->destroy(skybox);
 }
 
@@ -251,7 +258,7 @@ extern "C" JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_Engine_nDestroyTexture(JNIEnv*, jclass,
         jlong nativeEngine, jlong nativeTexture) {
     Engine* engine = (Engine*) nativeEngine;
-    Texture *texture = (Texture *) nativeTexture;
+    Texture* texture = (Texture*) nativeTexture;
     return engine->destroy(texture);
 }
 
@@ -272,7 +279,7 @@ Java_com_google_android_filament_Engine_nDestroyEntity(JNIEnv*, jclass,
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Engine_nFlushAndWait(JNIEnv *env, jclass clazz,
+Java_com_google_android_filament_Engine_nFlushAndWait(JNIEnv*, jclass,
         jlong nativeEngine) {
     Engine* engine = (Engine*) nativeEngine;
     engine->flushAndWait();
@@ -281,22 +288,19 @@ Java_com_google_android_filament_Engine_nFlushAndWait(JNIEnv *env, jclass clazz,
 // Managers...
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_Engine_nGetTransformManager(JNIEnv*, jclass,
-        jlong nativeEngine) {
+Java_com_google_android_filament_Engine_nGetTransformManager(JNIEnv*, jclass, jlong nativeEngine) {
     Engine* engine = (Engine*) nativeEngine;
     return (jlong) &engine->getTransformManager();
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_Engine_nGetLightManager(JNIEnv*, jclass,
-        jlong nativeEngine) {
+Java_com_google_android_filament_Engine_nGetLightManager(JNIEnv*, jclass, jlong nativeEngine) {
     Engine* engine = (Engine*) nativeEngine;
     return (jlong) &engine->getLightManager();
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_Engine_nGetRenderableManager(JNIEnv*, jclass,
-        jlong nativeEngine) {
+Java_com_google_android_filament_Engine_nGetRenderableManager(JNIEnv*, jclass, jlong nativeEngine) {
     Engine* engine = (Engine*) nativeEngine;
     return (jlong) &engine->getRenderableManager();
 }

android/filament-android/src/main/cpp/Filament.cpp

@@ -16,9 +16,7 @@
 
 #include <jni.h>
 
-namespace filament {
-    extern jint JNI_OnLoad(JavaVM* vm, void* reserved);
-};
+#include "private/backend/VirtualMachineEnv.h"
 
 JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     JNIEnv* env;
@@ -26,9 +24,9 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
         return -1;
     }
 
-#if ANDROID
-    ::filament::JNI_OnLoad(vm, reserved);
-#endif
+    // This must be called when the library is loaded. We need this to get a reference to the
+    // global VM
+    ::filament::VirtualMachineEnv::JNI_OnLoad(vm);
 
     return JNI_VERSION_1_6;
 }

android/filament-android/src/main/cpp/IndexBuffer.cpp

@@ -91,7 +91,8 @@ Java_com_google_android_filament_IndexBuffer_nSetBuffer(JNIEnv *env, jclass type
 
     auto* callback = JniBufferCallback::make(engine, env, handler, runnable, std::move(nioBuffer));
 
-    BufferDescriptor desc(data, sizeInBytes, &JniBufferCallback::invoke, callback);
+    BufferDescriptor desc(data, sizeInBytes,
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     indexBuffer->setBuffer(*engine, std::move(desc), (uint32_t) destOffsetInBytes);
 

android/filament-android/src/main/cpp/LightManager.cpp

@@ -76,8 +76,10 @@ extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_LightManager_nBuilderShadowOptions(JNIEnv* env, jclass,
         jlong nativeBuilder, jint mapSize, jint cascades, jfloatArray splitPositions,
         jfloat constantBias, jfloat normalBias, jfloat shadowFar, jfloat shadowNearHint,
-        jfloat shadowFarHint, jboolean stable, jboolean screenSpaceContactShadows, jint stepCount,
-        jfloat maxShadowDistance, jint vsmMsaaSamples, jfloat blurWidth) {
+        jfloat shadowFarHint, jboolean stable,
+        jfloat polygonOffsetConstant, jfloat polygonOffsetSlope,
+        jboolean screenSpaceContactShadows, jint stepCount,
+        jfloat maxShadowDistance, jint vsmMsaaSamples, jfloat blurWidth, jfloat shadowBulbRadius) {
     LightManager::Builder *builder = (LightManager::Builder *) nativeBuilder;
     LightManager::ShadowOptions shadowOptions {
             .mapSize = (uint32_t)mapSize,
@@ -88,13 +90,16 @@ Java_com_google_android_filament_LightManager_nBuilderShadowOptions(JNIEnv* env,
             .shadowNearHint = shadowNearHint,
             .shadowFarHint = shadowFarHint,
             .stable = (bool)stable,
+            .polygonOffsetConstant = polygonOffsetConstant,
+            .polygonOffsetSlope = polygonOffsetConstant,
             .screenSpaceContactShadows = (bool)screenSpaceContactShadows,
             .stepCount = uint8_t(stepCount),
             .maxShadowDistance = maxShadowDistance,
             .vsm = {
                     .msaaSamples = (uint8_t) vsmMsaaSamples,
                     .blurWidth = blurWidth
-            }
+            },
+            .shadowBulbRadius = shadowBulbRadius
     };
     jfloat *nativeSplits = env->GetFloatArrayElements(splitPositions, NULL);
     const jsize splitCount = std::min((jsize) 3, env->GetArrayLength(splitPositions));

android/filament-android/src/main/cpp/MorphTargetBuffer.cpp

@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <jni.h>
+
+#include <functional>
+#include <stdlib.h>
+#include <string.h>
+
+#include <filament/MorphTargetBuffer.h>
+
+#include "common/CallbackUtils.h"
+#include "common/NioUtils.h"
+
+using namespace filament;
+using namespace backend;
+
+extern "C"
+JNIEXPORT jlong JNICALL
+Java_com_google_android_filament_MorphTargetBuffer_nCreateBuilder(JNIEnv*, jclass) {
+    return (jlong) new MorphTargetBuffer::Builder();
+}
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_google_android_filament_MorphTargetBuffer_nDestroyBuilder(JNIEnv*, jclass,
+        jlong nativeBuilder) {
+    MorphTargetBuffer::Builder* builder = (MorphTargetBuffer::Builder *) nativeBuilder;
+    delete builder;
+}
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_google_android_filament_MorphTargetBuffer_nBuilderVertexCount(JNIEnv*, jclass,
+        jlong nativeBuilder, jint vertexCount) {
+    MorphTargetBuffer::Builder* builder = (MorphTargetBuffer::Builder *) nativeBuilder;
+    builder->vertexCount((size_t) vertexCount);
+}
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_google_android_filament_MorphTargetBuffer_nBuilderCount(JNIEnv*, jclass,
+        jlong nativeBuilder, jint count) {
+    MorphTargetBuffer::Builder* builder = (MorphTargetBuffer::Builder *) nativeBuilder;
+    builder->count((size_t) count);
+}
+
+extern "C"
+JNIEXPORT jlong JNICALL
+Java_com_google_android_filament_MorphTargetBuffer_nBuilderBuild(JNIEnv*, jclass,
+        jlong nativeBuilder, jlong nativeEngine) {
+    MorphTargetBuffer::Builder* builder = (MorphTargetBuffer::Builder *) nativeBuilder;
+    Engine *engine = (Engine *) nativeEngine;
+    return (jlong) builder->build(*engine);
+}
+
+// ------------------------------------------------------------------------------------------------
+
+extern "C"
+JNIEXPORT jint JNICALL
+Java_com_google_android_filament_MorphTargetBuffer_nSetPositionsAt(JNIEnv* env, jclass,
+        jlong nativeObject, jlong nativeEngine,
+        jint targetIndex, jfloatArray positions, jint count) {
+    MorphTargetBuffer *morphTargetBuffer = (MorphTargetBuffer *) nativeObject;
+    Engine *engine = (Engine *) nativeEngine;
+    jfloat* data = env->GetFloatArrayElements(positions, NULL);
+    morphTargetBuffer->setPositionsAt(*engine, targetIndex,
+            (math::float4*) data, size_t(count));
+    env->ReleaseFloatArrayElements(positions, data, JNI_ABORT);
+    return 0;
+}
+
+extern "C"
+JNIEXPORT jint JNICALL
+Java_com_google_android_filament_MorphTargetBuffer_nSetTangentsAt(JNIEnv* env, jclass,
+        jlong nativeObject, jlong nativeEngine,
+        jint targetIndex, jshortArray tangents, jint count) {
+    MorphTargetBuffer *morphTargetBuffer = (MorphTargetBuffer *) nativeObject;
+    Engine *engine = (Engine *) nativeEngine;
+    jshort* data = env->GetShortArrayElements(tangents, NULL);
+    morphTargetBuffer->setTangentsAt(*engine, targetIndex,
+            (math::short4*) data, size_t(count));
+    env->ReleaseShortArrayElements(tangents, data, JNI_ABORT);
+    return 0;
+}
+
+extern "C"
+JNIEXPORT jint JNICALL
+Java_com_google_android_filament_MorphTargetBuffer_nGetVertexCount(JNIEnv*, jclass,
+        jlong nativeObject) {
+    MorphTargetBuffer *morphTargetBuffer = (MorphTargetBuffer *) nativeObject;
+    return (jint)morphTargetBuffer->getVertexCount();
+}
+
+extern "C"
+JNIEXPORT jint JNICALL
+Java_com_google_android_filament_MorphTargetBuffer_nGetCount(JNIEnv*, jclass,
+        jlong nativeObject) {
+    MorphTargetBuffer *morphTargetBuffer = (MorphTargetBuffer *) nativeObject;
+    return (jint)morphTargetBuffer->getCount();
+}

android/filament-android/src/main/cpp/RenderableManager.cpp

@@ -209,9 +209,9 @@ Java_com_google_android_filament_RenderableManager_nBuilderSkinningBones(JNIEnv*
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_RenderableManager_nBuilderMorphing(JNIEnv*, jclass,
-        jlong nativeBuilder, jboolean enabled) {
+        jlong nativeBuilder, jint targetCount) {
     RenderableManager::Builder *builder = (RenderableManager::Builder *) nativeBuilder;
-    builder->morphing(enabled);
+    builder->morphing(targetCount);
 }
 
 extern "C" JNIEXPORT void JNICALL
@@ -267,12 +267,29 @@ Java_com_google_android_filament_RenderableManager_nSetBonesAsQuaternions(JNIEnv
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_RenderableManager_nSetMorphWeights(JNIEnv* env, jclass,
-        jlong nativeRenderableManager, jint instance, jfloatArray weights) {
+        jlong nativeRenderableManager, jint instance, jfloatArray weights, jint offset) {
     RenderableManager *rm = (RenderableManager *) nativeRenderableManager;
     jfloat* vec = env->GetFloatArrayElements(weights, NULL);
-    math::float4 floatvec(vec[0], vec[1], vec[2], vec[3]);
+    jsize count = env->GetArrayLength(weights);
+    rm->setMorphWeights((RenderableManager::Instance)instance, vec, count, offset);
     env->ReleaseFloatArrayElements(weights, vec, JNI_ABORT);
-    rm->setMorphWeights((RenderableManager::Instance)instance, floatvec);
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_RenderableManager_nSetMorphTargetBufferAt(JNIEnv*,
+        jclass, jlong nativeRenderableManager, jint i, int level, jint primitiveIndex,
+        jlong nativeMorphTargetBuffer, jint offset, jint count) {
+    RenderableManager *rm = (RenderableManager *) nativeRenderableManager;
+    MorphTargetBuffer *morphTargetBuffer = (MorphTargetBuffer *) nativeMorphTargetBuffer;
+    rm->setMorphTargetBufferAt((RenderableManager::Instance) i, (uint8_t) level,
+            (size_t) primitiveIndex, morphTargetBuffer, (size_t) offset, (size_t) count);
+}
+
+extern "C" JNIEXPORT jint JNICALL
+Java_com_google_android_filament_RenderableManager_nGetMorphTargetCount(JNIEnv* env, jclass,
+        jlong nativeRenderableManager, jint instance) {
+    RenderableManager *rm = (RenderableManager *) nativeRenderableManager;
+    return rm->getMorphTargetCount((RenderableManager::Instance)instance);
 }
 
 extern "C" JNIEXPORT void JNICALL

android/filament-android/src/main/cpp/Renderer.cpp

@@ -97,7 +97,8 @@ Java_com_google_android_filament_Renderer_nReadPixels(JNIEnv *env, jclass,
 
     PixelBufferDescriptor desc(buffer, sizeInBytes, (backend::PixelDataFormat) format,
             (backend::PixelDataType) type, (uint8_t) alignment, (uint32_t) left, (uint32_t) top,
-            (uint32_t) stride, &JniBufferCallback::invoke, callback);
+            (uint32_t) stride,
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     renderer->readPixels(uint32_t(xoffset), uint32_t(yoffset), uint32_t(width), uint32_t(height),
             std::move(desc));
@@ -132,7 +133,8 @@ Java_com_google_android_filament_Renderer_nReadPixelsEx(JNIEnv *env, jclass,
 
     PixelBufferDescriptor desc(buffer, sizeInBytes, (backend::PixelDataFormat) format,
             (backend::PixelDataType) type, (uint8_t) alignment, (uint32_t) left, (uint32_t) top,
-            (uint32_t) stride, &JniBufferCallback::invoke, callback);
+            (uint32_t) stride,
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     renderer->readPixels(renderTarget,
             uint32_t(xoffset), uint32_t(yoffset), uint32_t(width), uint32_t(height),

android/filament-android/src/main/cpp/SkyBox.cpp

@@ -100,7 +100,7 @@ Java_com_google_android_filament_Skybox_nSetColor(JNIEnv *, jclass,
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_Skybix_nGetTexture(JNIEnv* env, jclass,
+Java_com_google_android_filament_Skybox_nGetTexture(JNIEnv* env, jclass,
         jlong nativeSkybox) {
     Skybox *skybox = (Skybox *) nativeSkybox;
     Texture const *tex = skybox->getTexture();

android/filament-android/src/main/cpp/Stream.cpp

@@ -24,7 +24,7 @@
 #include "common/NioUtils.h"
 #include "common/CallbackUtils.h"
 
-#ifdef ANDROID
+#ifdef __ANDROID__
 
 #if __has_include(<android/hardware_buffer_jni.h>)
 #include <android/hardware_buffer_jni.h>
@@ -169,7 +169,8 @@ Java_com_google_android_filament_Stream_nReadPixels(JNIEnv *env, jclass,
 
     PixelBufferDescriptor desc(buffer, sizeInBytes, (backend::PixelDataFormat) format,
             (backend::PixelDataType) type, (uint8_t) alignment, (uint32_t) left, (uint32_t) top,
-            (uint32_t) stride, &JniBufferCallback::invoke, callback);
+            (uint32_t) stride,
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     stream->readPixels(uint32_t(xoffset), uint32_t(yoffset), uint32_t(width), uint32_t(height),
             std::move(desc));
@@ -189,7 +190,7 @@ Java_com_google_android_filament_Stream_nSetAcquiredImage(JNIEnv* env, jclass, j
     Engine* engine = (Engine*) nativeEngine;
     Stream* stream = (Stream*) nativeStream;
 
-#ifdef ANDROID
+#ifdef __ANDROID__
 
     // This function is not available before NDK 15 or before Android 8.
     if (UTILS_UNLIKELY(!AHardwareBuffer_fromHardwareBuffer_fn)) {
@@ -221,5 +222,6 @@ Java_com_google_android_filament_Stream_nSetAcquiredImage(JNIEnv* env, jclass, j
 
 #endif
 
-    stream->setAcquiredImage((void*) nativeBuffer, &JniImageCallback::invoke, callback);
+    stream->setAcquiredImage((void*) nativeBuffer,
+            callback->getHandler(), &JniImageCallback::postToJavaAndDestroy, callback);
 }

android/filament-android/src/main/cpp/SwapChain.cpp

@@ -27,5 +27,8 @@ Java_com_google_android_filament_SwapChain_nSetFrameCompletedCallback(JNIEnv* en
         jlong nativeSwapChain, jobject handler, jobject runnable) {
     SwapChain* swapChain = (SwapChain*) nativeSwapChain;
     auto *callback = JniCallback::make(env, handler, runnable);
-    swapChain->setFrameCompletedCallback(&JniCallback::invoke, callback);
+    swapChain->setFrameCompletedCallback([](void* user) {
+        JniCallback* callback = (JniCallback*)user;
+        JniCallback::postToJavaAndDestroy(callback);
+    }, callback);
 }

android/filament-android/src/main/cpp/Texture.cpp

@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <functional>
 
-#ifdef ANDROID
+#ifdef __ANDROID__
 #include <android/bitmap.h>
 #endif
 
@@ -31,6 +31,8 @@
 #include "common/CallbackUtils.h"
 #include "common/NioUtils.h"
 
+#include "private/backend/VirtualMachineEnv.h"
+
 using namespace filament;
 using namespace backend;
 
@@ -210,7 +212,8 @@ Java_com_google_android_filament_Texture_nSetImage(JNIEnv* env, jclass, jlong na
 
     Texture::PixelBufferDescriptor desc(buffer, sizeInBytes, (backend::PixelDataFormat) format,
             (backend::PixelDataType) type, (uint8_t) alignment, (uint32_t) left, (uint32_t) top,
-            (uint32_t) stride, &JniBufferCallback::invoke, callback);
+            (uint32_t) stride,
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     texture->setImage(*engine, (size_t) level, (uint32_t) xoffset, (uint32_t) yoffset,
             (uint32_t) width, (uint32_t) height, std::move(desc));
@@ -240,7 +243,7 @@ Java_com_google_android_filament_Texture_nSetImageCompressed(JNIEnv *env, jclass
 
     Texture::PixelBufferDescriptor desc(buffer, sizeInBytes,
             (backend::CompressedPixelDataType) compressedFormat, (uint32_t) compressedSizeInBytes,
-            &JniBufferCallback::invoke, callback);
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     texture->setImage(*engine, (size_t) level, (uint32_t) xoffset, (uint32_t) yoffset,
             (uint32_t) width, (uint32_t) height, std::move(desc));
@@ -274,7 +277,8 @@ Java_com_google_android_filament_Texture_nSetImage3D(JNIEnv* env, jclass, jlong
 
     Texture::PixelBufferDescriptor desc(buffer, sizeInBytes, (backend::PixelDataFormat) format,
             (backend::PixelDataType) type, (uint8_t) alignment, (uint32_t) left, (uint32_t) top,
-            (uint32_t) stride, &JniBufferCallback::invoke, callback);
+            (uint32_t) stride,
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     texture->setImage(*engine, (size_t) level,
             (uint32_t) xoffset, (uint32_t) yoffset, (uint32_t) zoffset,
@@ -308,7 +312,7 @@ Java_com_google_android_filament_Texture_nSetImage3DCompressed(JNIEnv *env, jcla
 
     Texture::PixelBufferDescriptor desc(buffer, sizeInBytes,
             (backend::CompressedPixelDataType) compressedFormat, (uint32_t) compressedSizeInBytes,
-            &JniBufferCallback::invoke, callback);
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     texture->setImage(*engine, (size_t) level,
             (uint32_t) xoffset, (uint32_t) yoffset, (uint32_t) zoffset,
@@ -346,7 +350,8 @@ Java_com_google_android_filament_Texture_nSetImageCubemap(JNIEnv *env, jclass,
 
     Texture::PixelBufferDescriptor desc(buffer, sizeInBytes, (backend::PixelDataFormat) format,
             (backend::PixelDataType) type, (uint8_t) alignment, (uint32_t) left, (uint32_t) top,
-            (uint32_t) stride, &JniBufferCallback::invoke, callback);
+            (uint32_t) stride,
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     texture->setImage(*engine, (size_t) level, std::move(desc), faceOffsets);
 
@@ -381,7 +386,7 @@ Java_com_google_android_filament_Texture_nSetImageCubemapCompressed(JNIEnv *env,
 
     Texture::PixelBufferDescriptor desc(buffer, sizeInBytes,
             (backend::CompressedPixelDataType) compressedFormat, (uint32_t) compressedSizeInBytes,
-            &JniBufferCallback::invoke, callback);
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     texture->setImage(*engine, (size_t) level, std::move(desc), faceOffsets);
 
@@ -454,7 +459,7 @@ Java_com_google_android_filament_Texture_nGeneratePrefilterMipmap(JNIEnv *env, j
     Texture::PixelBufferDescriptor desc(buffer, sizeInBytes, (backend::PixelDataFormat) format,
             (backend::PixelDataType) type, (uint8_t) alignment,
             (uint32_t) left, (uint32_t) top, (uint32_t) stride,
-            &JniBufferCallback::invoke, callback);
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     Texture::PrefilterOptions options;
     options.sampleCount = sampleCount;
@@ -468,7 +473,7 @@ Java_com_google_android_filament_Texture_nGeneratePrefilterMipmap(JNIEnv *env, j
 // ANDROID SPECIFIC BITS
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifdef ANDROID
+#ifdef __ANDROID__
 
 #define BITMAP_CONFIG_ALPHA_8   0
 #define BITMAP_CONFIG_RGB_565   1
@@ -477,46 +482,37 @@ Java_com_google_android_filament_Texture_nGeneratePrefilterMipmap(JNIEnv *env, j
 #define BITMAP_CONFIG_RGBA_F16  4
 #define BITMAP_CONFIG_HARDWARE  5
 
-class AutoBitmap {
-public:
+class AutoBitmap : public JniCallback {
+private:
+
     AutoBitmap(JNIEnv* env, jobject bitmap) noexcept
-            : mEnv(env)
-            , mBitmap(env->NewGlobalRef(bitmap))
-    {
+            : JniCallback(),
+              mBitmap(env->NewGlobalRef(bitmap)) {
         if (mBitmap) {
-            AndroidBitmap_getInfo(mEnv, mBitmap, &mInfo);
-            AndroidBitmap_lockPixels(mEnv, mBitmap, &mData);
+            AndroidBitmap_getInfo(env, mBitmap, &mInfo);
+            AndroidBitmap_lockPixels(env, mBitmap, &mData);
         }
     }
 
     AutoBitmap(JNIEnv* env, jobject bitmap, jobject handler, jobject runnable) noexcept
-            : mEnv(env)
-            , mBitmap(env->NewGlobalRef(bitmap))
-            , mHandler(env->NewGlobalRef(handler))
-            , mCallback(env->NewGlobalRef(runnable))
-    {
-        acquireCallbackJni(env, mCallbackUtils);
+            : JniCallback(env, handler, runnable),
+              mBitmap(env->NewGlobalRef(bitmap)) {
         if (mBitmap) {
-            AndroidBitmap_getInfo(mEnv, mBitmap, &mInfo);
-            AndroidBitmap_lockPixels(mEnv, mBitmap, &mData);
+            AndroidBitmap_getInfo(env, mBitmap, &mInfo);
+            AndroidBitmap_lockPixels(env, mBitmap, &mData);
         }
     }
 
-    ~AutoBitmap() noexcept {
-        releaseCallbackJni(mEnv, mCallbackUtils, mHandler, mCallback);
+    void release(JNIEnv* env) {
         if (mBitmap) {
-            AndroidBitmap_unlockPixels(mEnv, mBitmap);
-            mEnv->DeleteGlobalRef(mBitmap);
+            AndroidBitmap_unlockPixels(env, mBitmap);
+            env->DeleteGlobalRef(mBitmap);
         }
     }
 
-    AutoBitmap(AutoBitmap &&rhs) noexcept {
-        mEnv = rhs.mEnv;
-        std::swap(mData, rhs.mData);
-        std::swap(mBitmap, rhs.mBitmap);
-        std::swap(mInfo, rhs.mInfo);
-    }
+    ~AutoBitmap() override = default;
 
+public:
     void* getData() const noexcept {
         return mData;
     }
@@ -543,28 +539,39 @@ public:
         }
     }
 
-    static void invoke(void* buffer, size_t n, void* user) {
-        AutoBitmap* data = reinterpret_cast<AutoBitmap*>(user);
-        delete data;
-    }
-
-    static AutoBitmap* make(Engine* engine, JNIEnv* env, jobject bitmap) {
-        return new AutoBitmap(env, bitmap);
-    }
-
-    static AutoBitmap* make(Engine* engine, JNIEnv* env, jobject bitmap,
-            jobject handler, jobject runnable) {
+    // create a AutoBitmap
+    static AutoBitmap* make(JNIEnv* env, jobject bitmap, jobject handler, jobject runnable) {
         return new AutoBitmap(env, bitmap, handler, runnable);
     }
 
+    // execute the callback on the java thread and destroy ourselves
+    static void invoke(void*, size_t, void* user) {
+        auto* autoBitmap = reinterpret_cast<AutoBitmap*>(user);
+        JNIEnv* env = filament::VirtualMachineEnv::get().getEnvironment();
+        releaseCallbackJni(env, autoBitmap->mCallbackUtils, autoBitmap->mHandler, autoBitmap->mCallback);
+        autoBitmap->release(env);
+        delete autoBitmap;
+    }
+
+    // create a AutoBitmap without a handler
+    static AutoBitmap* make(JNIEnv* env, jobject bitmap) {
+        return new AutoBitmap(env, bitmap);
+    }
+
+    // just destroy ourselves
+    static void invokeNoCallback(void*, size_t, void* user) {
+        auto* autoBitmap = reinterpret_cast<AutoBitmap*>(user);
+        JNIEnv* env = filament::VirtualMachineEnv::get().getEnvironment();
+        autoBitmap->release(env);
+        delete autoBitmap;
+    }
+
 private:
-    JNIEnv* mEnv;
     void* mData = nullptr;
     jobject mBitmap = nullptr;
     jobject mHandler = nullptr;
     jobject mCallback = nullptr;
-    AndroidBitmapInfo mInfo;
-    CallbackJni mCallbackUtils;
+    AndroidBitmapInfo mInfo{};
 };
 
 extern "C"
@@ -575,14 +582,14 @@ Java_com_google_android_filament_android_TextureHelper_nSetBitmap(JNIEnv* env, j
     Texture* texture = (Texture*) nativeTexture;
     Engine *engine = (Engine *) nativeEngine;
 
-    auto* autoBitmap = AutoBitmap::make(engine, env, bitmap);
+    auto* autoBitmap = AutoBitmap::make(env, bitmap);
 
     Texture::PixelBufferDescriptor desc(
             autoBitmap->getData(),
             autoBitmap->getSizeInBytes(),
             autoBitmap->getFormat(format),
             autoBitmap->getType(format),
-            &AutoBitmap::invoke, autoBitmap);
+            &AutoBitmap::invokeNoCallback, autoBitmap);
 
     texture->setImage(*engine, (size_t) level,
             (uint32_t) xoffset, (uint32_t) yoffset,
@@ -598,14 +605,14 @@ Java_com_google_android_filament_android_TextureHelper_nSetBitmapWithCallback(JN
     Texture* texture = (Texture*) nativeTexture;
     Engine *engine = (Engine *) nativeEngine;
 
-    auto* autoBitmap = AutoBitmap::make(engine, env, bitmap, handler, runnable);
+    auto* autoBitmap = AutoBitmap::make(env, bitmap, handler, runnable);
 
     Texture::PixelBufferDescriptor desc(
             autoBitmap->getData(),
             autoBitmap->getSizeInBytes(),
             autoBitmap->getFormat(format),
             autoBitmap->getType(format),
-            &AutoBitmap::invoke, autoBitmap);
+            autoBitmap->getHandler(), &AutoBitmap::invoke, autoBitmap);
 
     texture->setImage(*engine, (size_t) level,
             (uint32_t) xoffset, (uint32_t) yoffset,

android/filament-android/src/main/cpp/ToneMapper.cpp

@@ -49,8 +49,8 @@ Java_com_google_android_filament_ToneMapper_nCreateFilmicToneMapper(JNIEnv*, jcl
 
 extern "C" JNIEXPORT jlong JNICALL
 Java_com_google_android_filament_ToneMapper_nCreateGenericToneMapper(JNIEnv*, jclass,
-        jfloat contrast, jfloat shoulder, jfloat midGrayIn, jfloat midGrayOut, jfloat hdrMax) {
-    return (jlong) new GenericToneMapper(contrast, shoulder, midGrayIn, midGrayOut, hdrMax);
+        jfloat contrast, jfloat midGrayIn, jfloat midGrayOut, jfloat hdrMax) {
+    return (jlong) new GenericToneMapper(contrast, midGrayIn, midGrayOut, hdrMax);
 }
 
 extern "C" JNIEXPORT jfloat JNICALL
@@ -58,11 +58,6 @@ Java_com_google_android_filament_ToneMapper_nGenericGetContrast(JNIEnv*, jclass,
     return ((GenericToneMapper*) nativeObject)->getContrast();
 }
 
-extern "C" JNIEXPORT jfloat JNICALL
-Java_com_google_android_filament_ToneMapper_nGenericGetShoulder(JNIEnv*, jclass, jlong nativeObject) {
-    return ((GenericToneMapper*) nativeObject)->getShoulder();
-}
-
 extern "C" JNIEXPORT jfloat JNICALL
 Java_com_google_android_filament_ToneMapper_nGenericGetMidGrayIn(JNIEnv*, jclass, jlong nativeObject) {
     return ((GenericToneMapper*) nativeObject)->getMidGrayIn();
@@ -84,12 +79,6 @@ Java_com_google_android_filament_ToneMapper_nGenericSetContrast(JNIEnv*, jclass,
     ((GenericToneMapper*) nativeObject)->setContrast(contrast);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_ToneMapper_nGenericSetShoulder(JNIEnv*, jclass,
-        jlong nativeObject, jfloat shoulder) {
-    ((GenericToneMapper*) nativeObject)->setShoulder(shoulder);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_ToneMapper_nGenericSetMidGrayIn(JNIEnv*, jclass,
         jlong nativeObject, jfloat midGrayIn) {

android/filament-android/src/main/cpp/VertexBuffer.cpp

@@ -32,40 +32,40 @@ using namespace filament::math;
 using namespace backend;
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_VertexBuffer_nCreateBuilder(JNIEnv *env, jclass type) {
+Java_com_google_android_filament_VertexBuffer_nCreateBuilder(JNIEnv*, jclass) {
     return (jlong) new VertexBuffer::Builder();
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_VertexBuffer_nDestroyBuilder(JNIEnv *env, jclass type,
+Java_com_google_android_filament_VertexBuffer_nDestroyBuilder(JNIEnv*, jclass,
         jlong nativeBuilder) {
     VertexBuffer::Builder* builder = (VertexBuffer::Builder *) nativeBuilder;
     delete builder;
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_VertexBuffer_nBuilderVertexCount(JNIEnv *env, jclass type,
+Java_com_google_android_filament_VertexBuffer_nBuilderVertexCount(JNIEnv*, jclass,
         jlong nativeBuilder, jint vertexCount) {
     VertexBuffer::Builder* builder = (VertexBuffer::Builder *) nativeBuilder;
     builder->vertexCount((uint32_t) vertexCount);
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_VertexBuffer_nBuilderEnableBufferObjects(JNIEnv *env, jclass type,
+Java_com_google_android_filament_VertexBuffer_nBuilderEnableBufferObjects(JNIEnv*, jclass,
         jlong nativeBuilder, jboolean enabled) {
     VertexBuffer::Builder* builder = (VertexBuffer::Builder *) nativeBuilder;
     builder->enableBufferObjects(enabled);
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_VertexBuffer_nBuilderBufferCount(JNIEnv *env, jclass type,
+Java_com_google_android_filament_VertexBuffer_nBuilderBufferCount(JNIEnv*, jclass,
         jlong nativeBuilder, jint bufferCount) {
     VertexBuffer::Builder* builder = (VertexBuffer::Builder *) nativeBuilder;
     builder->bufferCount((uint8_t) bufferCount);
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_VertexBuffer_nBuilderAttribute(JNIEnv *env, jclass type,
+Java_com_google_android_filament_VertexBuffer_nBuilderAttribute(JNIEnv*, jclass,
         jlong nativeBuilder, jint attribute, jint bufferIndex, jint attributeType, jint byteOffset,
         jint byteStride) {
     VertexBuffer::Builder* builder = (VertexBuffer::Builder *) nativeBuilder;
@@ -75,14 +75,14 @@ Java_com_google_android_filament_VertexBuffer_nBuilderAttribute(JNIEnv *env, jcl
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_VertexBuffer_nBuilderNormalized(JNIEnv *env, jclass type,
+Java_com_google_android_filament_VertexBuffer_nBuilderNormalized(JNIEnv*, jclass,
         jlong nativeBuilder, jint attribute, jboolean normalized) {
     VertexBuffer::Builder* builder = (VertexBuffer::Builder *) nativeBuilder;
     builder->normalized((VertexAttribute) attribute, normalized);
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_VertexBuffer_nBuilderBuild(JNIEnv *env, jclass type,
+Java_com_google_android_filament_VertexBuffer_nBuilderBuild(JNIEnv*, jclass,
         jlong nativeBuilder, jlong nativeEngine) {
     VertexBuffer::Builder* builder = (VertexBuffer::Builder *) nativeBuilder;
     Engine *engine = (Engine *) nativeEngine;
@@ -90,14 +90,14 @@ Java_com_google_android_filament_VertexBuffer_nBuilderBuild(JNIEnv *env, jclass
 }
 
 extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_VertexBuffer_nGetVertexCount(JNIEnv *env, jclass type,
+Java_com_google_android_filament_VertexBuffer_nGetVertexCount(JNIEnv*, jclass,
         jlong nativeVertexBuffer) {
     VertexBuffer *vertexBuffer = (VertexBuffer *) nativeVertexBuffer;
     return (jint) vertexBuffer->getVertexCount();
 }
 
 extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_VertexBuffer_nSetBufferAt(JNIEnv *env, jclass type,
+Java_com_google_android_filament_VertexBuffer_nSetBufferAt(JNIEnv *env, jclass,
         jlong nativeVertexBuffer, jlong nativeEngine, jint bufferIndex,
         jobject buffer, jint remaining,
         jint destOffsetInBytes, jint count, jobject handler, jobject runnable) {
@@ -114,7 +114,8 @@ Java_com_google_android_filament_VertexBuffer_nSetBufferAt(JNIEnv *env, jclass t
 
     auto* callback = JniBufferCallback::make(engine, env, handler, runnable, std::move(nioBuffer));
 
-    BufferDescriptor desc(data, sizeInBytes, &JniBufferCallback::invoke, callback);
+    BufferDescriptor desc(data, sizeInBytes,
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
 
     vertexBuffer->setBufferAt(*engine, (uint8_t) bufferIndex, std::move(desc),
             (uint32_t) destOffsetInBytes);
@@ -123,7 +124,7 @@ Java_com_google_android_filament_VertexBuffer_nSetBufferAt(JNIEnv *env, jclass t
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_VertexBuffer_nSetBufferObjectAt(JNIEnv *env, jclass type,
+Java_com_google_android_filament_VertexBuffer_nSetBufferObjectAt(JNIEnv*, jclass,
         jlong nativeVertexBuffer, jlong nativeEngine, jint bufferIndex, jlong nativeBufferObject) {
     VertexBuffer *vertexBuffer = (VertexBuffer *) nativeVertexBuffer;
     Engine *engine = (Engine *) nativeEngine;

android/filament-android/src/main/cpp/View.cpp

@@ -20,6 +20,10 @@
 #include <filament/View.h>
 #include <filament/Viewport.h>
 
+#include "common/CallbackUtils.h"
+
+#include "private/backend/VirtualMachineEnv.h"
+
 using namespace filament;
 
 extern "C" JNIEXPORT void JNICALL
@@ -82,13 +86,19 @@ Java_com_google_android_filament_View_nSetRenderTarget(JNIEnv*, jclass,
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetSampleCount(JNIEnv*, jclass, jlong nativeView, jint count) {
     View* view = (View*) nativeView;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     view->setSampleCount((uint8_t) count);
+#pragma clang diagnostic pop
 }
 
 extern "C" JNIEXPORT jint JNICALL
 Java_com_google_android_filament_View_nGetSampleCount(JNIEnv*, jclass, jlong nativeView) {
     View* view = (View*) nativeView;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     return view->getSampleCount();
+#pragma clang diagnostic pop
 }
 
 extern "C" JNIEXPORT void JNICALL
@@ -139,18 +149,27 @@ Java_com_google_android_filament_View_nSetShadowType(JNIEnv*, jclass, jlong nati
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetVsmShadowOptions(JNIEnv*, jclass, jlong nativeView,
-        jint anisotropy, jboolean mipmapping, jfloat exponent, jfloat minVarianceScale,
+        jint anisotropy, jboolean mipmapping, jfloat minVarianceScale,
         jfloat lightBleedReduction) {
     View* view = (View*) nativeView;
     View::VsmShadowOptions options;
     options.anisotropy = (uint8_t)anisotropy;
     options.mipmapping = (bool)mipmapping;
-    options.exponent = exponent;
     options.minVarianceScale = minVarianceScale;
     options.lightBleedReduction = lightBleedReduction;
     view->setVsmShadowOptions(options);
 }
 
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_View_nSetSoftShadowOptions(JNIEnv*, jclass, jlong nativeView,
+        jfloat penumbraScale, jfloat penumbraRatioScale) {
+    View* view = (View*) nativeView;
+    View::SoftShadowOptions options;
+    options.penumbraScale = penumbraScale;
+    options.penumbraRatioScale = penumbraRatioScale;
+    view->setSoftShadowOptions(options);
+}
+
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetRenderQuality(JNIEnv*, jclass,
@@ -321,8 +340,8 @@ Java_com_google_android_filament_View_nSetBlendMode(JNIEnv *, jclass , jlong nat
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_View_nSetDepthOfFieldOptions(JNIEnv *, jclass ,
-        jlong nativeView, jfloat focusDistance, jfloat cocScale, jfloat maxApertureDiameter, jboolean enabled, jint filter,
+Java_com_google_android_filament_View_nSetDepthOfFieldOptions(JNIEnv *, jclass,
+        jlong nativeView, jfloat cocScale, jfloat maxApertureDiameter, jboolean enabled, jint filter,
         jboolean nativeResolution, jint foregroundRingCount, jint backgroundRingCount, jint fastGatherRingCount,
         jint maxForegroundCOC, jint maxBackgroundCOC) {
     View* view = (View*) nativeView;
@@ -351,6 +370,17 @@ Java_com_google_android_filament_View_nSetVignetteOptions(JNIEnv*, jclass, jlong
             .color = LinearColorA{r, g, b, a}, .enabled = (bool)enabled});
 }
 
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_google_android_filament_View_nSetMultiSampleAntiAliasingOptions(JNIEnv* env, jclass clazz,
+        jlong nativeView, jboolean enabled, jint sampleCount, jboolean customResolve) {
+    View* view = (View*) nativeView;
+    view->setMultiSampleAntiAliasingOptions({
+            .enabled = (bool)enabled,
+            .sampleCount = (uint8_t)sampleCount,
+            .customResolve = (bool)customResolve});
+}
+
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetTemporalAntiAliasingOptions(JNIEnv *, jclass,
@@ -360,6 +390,16 @@ Java_com_google_android_filament_View_nSetTemporalAntiAliasingOptions(JNIEnv *,
             .filterWidth = filterWidth, .feedback = feedback, .enabled = (bool) enabled});
 }
 
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_google_android_filament_View_nSetScreenSpaceReflectionsOptions(JNIEnv*, jclass,
+        jlong nativeView, jfloat thickness, jfloat bias, jfloat maxDistance, jfloat stride, jboolean enabled) {
+    View* view = (View*) nativeView;
+    view->setScreenSpaceReflectionsOptions({.thickness = thickness, .bias = bias,
+            .maxDistance = maxDistance, .stride = stride, .enabled = (bool) enabled
+    });
+}
+
 extern "C"
 JNIEXPORT jboolean JNICALL
 Java_com_google_android_filament_View_nIsShadowingEnabled(JNIEnv *, jclass, jlong nativeView) {
@@ -382,3 +422,42 @@ Java_com_google_android_filament_View_nIsScreenSpaceRefractionEnabled(JNIEnv *,
     View* view = (View*) nativeView;
     return (jboolean)view->isScreenSpaceRefractionEnabled();
 }
+
+extern "C"
+JNIEXPORT void JNICALL
+Java_com_google_android_filament_View_nPick(JNIEnv* env, jclass,
+        jlong nativeView,
+        jint x, jint y, jobject handler, jobject internalCallback) {
+
+    // jniState will be initialized the first time this method is called
+    static const struct JniState {
+        jclass internalOnPickCallbackClass;
+        jfieldID renderableFieldId;
+        jfieldID depthFieldId;
+        jfieldID fragCoordXFieldId;
+        jfieldID fragCoordYFieldId;
+        jfieldID fragCoordZFieldId;
+        explicit JniState(JNIEnv* env) noexcept {
+            internalOnPickCallbackClass = env->FindClass("com/google/android/filament/View$InternalOnPickCallback");
+            renderableFieldId = env->GetFieldID(internalOnPickCallbackClass, "mRenderable", "I");
+            depthFieldId = env->GetFieldID(internalOnPickCallbackClass, "mDepth", "F");
+            fragCoordXFieldId = env->GetFieldID(internalOnPickCallbackClass, "mFragCoordsX", "F");
+            fragCoordYFieldId = env->GetFieldID(internalOnPickCallbackClass, "mFragCoordsY", "F");
+            fragCoordZFieldId = env->GetFieldID(internalOnPickCallbackClass, "mFragCoordsZ", "F");
+        }
+    } jniState(env);
+
+    View* view = (View*) nativeView;
+    JniCallback *callback = JniCallback::make(env, handler, internalCallback);
+    view->pick(x, y, [callback](View::PickingQueryResult const& result) {
+        // this is executed on the backend/service thread
+        jobject obj = callback->getCallbackObject();
+        JNIEnv* env = filament::VirtualMachineEnv::get().getEnvironment();
+        env->SetIntField(obj, jniState.renderableFieldId, (jint)result.renderable.getId());
+        env->SetFloatField(obj, jniState.depthFieldId, result.depth);
+        env->SetFloatField(obj, jniState.fragCoordXFieldId, result.fragCoords.x);
+        env->SetFloatField(obj, jniState.fragCoordYFieldId, result.fragCoords.y);
+        env->SetFloatField(obj, jniState.fragCoordZFieldId, result.fragCoords.z);
+        JniCallback::postToJavaAndDestroy(callback);
+    }, callback->getHandler());
+}

android/filament-android/src/main/java/com/google/android/filament/ColorGrading.java

@@ -105,6 +105,14 @@ public class ColorGrading {
         ULTRA
     }
 
+    /**
+     * Color grading LUT format.
+     */
+    public enum LutFormat {
+        INTEGER,
+        FLOAT
+    }
+
     /**
      * List of available tone-mapping operators.
      *
@@ -162,6 +170,36 @@ public class ColorGrading {
             return this;
         }
 
+        /**
+         * When color grading is implemented using a 3D LUT, this sets the texture format of
+         * of the LUT. This overrides the value set by quality().
+         *
+         * The default is INTEGER
+         *
+         * @param format The desired format of the 3D LUT.
+         *
+         * @return This Builder, for chaining calls
+         */
+        public Builder format(LutFormat format) {
+            nBuilderFormat(mNativeBuilder, format.ordinal());
+            return this;
+        }
+
+        /**
+         * When color grading is implemented using a 3D LUT, this sets the dimension of the LUT.
+         * This overrides the value set by quality().
+         *
+         * The default is 32
+         *
+         * @param dim The desired dimension of the LUT. Between 16 and 64.
+         *
+         * @return This Builder, for chaining calls
+         */
+        public Builder dimensions(int dim) {
+            nBuilderDimensions(mNativeBuilder, dim);
+            return this;
+        }
+
         /**
          * Selects the tone mapping operator to apply to the HDR color buffer as the last
          * operation of the color grading post-processing step.
@@ -557,6 +595,8 @@ public class ColorGrading {
     private static native void nDestroyBuilder(long nativeBuilder);
 
     private static native void nBuilderQuality(long nativeBuilder, int quality);
+    private static native void nBuilderFormat(long nativeBuilder, int format);
+    private static native void nBuilderDimensions(long nativeBuilder, int dim);
     private static native void nBuilderToneMapper(long nativeBuilder, long toneMapper);
     private static native void nBuilderToneMapping(long nativeBuilder, int toneMapping);
     private static native void nBuilderLuminanceScaling(long nativeBuilder, boolean luminanceScaling);

android/filament-android/src/main/java/com/google/android/filament/Engine.java

@@ -106,7 +106,10 @@ import com.google.android.filament.proguard.UsedByReflection;
  * @see Renderer
  */
 public class Engine {
+    private static final Backend[] sBackendValues = Backend.values();
+
     private long mNativeObject;
+
     @NonNull private final TransformManager mTransformManager;
     @NonNull private final LightManager mLightManager;
     @NonNull private final RenderableManager mRenderableManager;
@@ -252,7 +255,7 @@ public class Engine {
      */
     @NonNull
     public Backend getBackend() {
-        return Backend.values()[(int) nGetBackend(getNativeObject())];
+        return sBackendValues[(int) nGetBackend(getNativeObject())];
     }
 
     // SwapChain
@@ -513,6 +516,15 @@ public class Engine {
         vertexBuffer.clearNativeObject();
     }
 
+    /**
+     * Destroys a {@link SkinningBuffer} and frees all its associated resources.
+     * @param skinningBuffer the {@link SkinningBuffer} to destroy
+     */
+    public void destroySkinningBuffer(@NonNull SkinningBuffer skinningBuffer) {
+        assertDestroy(nDestroySkinningBuffer(getNativeObject(), skinningBuffer.getNativeObject()));
+        skinningBuffer.clearNativeObject();
+    }
+
     /**
      * Destroys a {@link IndirectLight} and frees all its associated resources.
      * @param ibl the {@link IndirectLight} to destroy
@@ -631,7 +643,7 @@ public class Engine {
 
     /**
      * Kicks the hardware thread (e.g.: the OpenGL, Vulkan or Metal thread) and blocks until
-     * all commands to this point are executed. Note that this doesn't guarantee that the
+     * all commands to this point are executed. Note that this does guarantee that the
      * hardware is actually finished.
      *
      * <p>This is typically used right after destroying the <code>SwapChain</code>,
@@ -690,6 +702,7 @@ public class Engine {
     private static native boolean nDestroyStream(long nativeEngine, long nativeStream);
     private static native boolean nDestroyIndexBuffer(long nativeEngine, long nativeIndexBuffer);
     private static native boolean nDestroyVertexBuffer(long nativeEngine, long nativeVertexBuffer);
+    private static native boolean nDestroySkinningBuffer(long nativeEngine, long nativeSkinningBuffer);
     private static native boolean nDestroyIndirectLight(long nativeEngine, long nativeIndirectLight);
     private static native boolean nDestroyMaterial(long nativeEngine, long nativeMaterial);
     private static native boolean nDestroyMaterialInstance(long nativeEngine, long nativeMaterialInstance);

android/filament-android/src/main/java/com/google/android/filament/LightManager.java

@@ -117,6 +117,8 @@ import androidx.annotation.Size;
  * </ul>
  */
 public class LightManager {
+    private static final Type[] sTypeValues = Type.values();
+
     private long mNativeObject;
 
     LightManager(long nativeLightManager) {
@@ -244,13 +246,13 @@ public class LightManager {
          * light. 1mm by default.
          * This is ignored when the View's ShadowType is set to VSM.
          */
-        public float constantBias = 0.05f;
+        public float constantBias = 0.001f;
 
         /** Amount by which the maximum sampling error is scaled. The resulting value is used
          * to move the shadow away from the fragment normal. Should be 1.0.
          * This is ignored when the View's ShadowType is set to VSM.
          */
-        public float normalBias = 0.4f;
+        public float normalBias = 1.0f;
 
         /** Distance from the camera after which shadows are clipped. This is used to clip
          * shadows that are too far and wouldn't contribute to the scene much, improving
@@ -279,7 +281,24 @@ public class LightManager {
          * When set to true, all resolution enhancing features that can affect stability are
          * disabling, resulting in significantly lower resolution shadows, albeit stable ones.
          */
-        public boolean stable = true;
+        public boolean stable = false;
+
+        /**
+         * Constant bias in depth-resolution units by which shadows are moved away from the
+         * light. The default value of 0.5 is used to round depth values up.
+         * Generally this value shouldn't be changed or at least be small and positive.
+         * This is ignored when the View's ShadowType is set to VSM.
+         */
+        float polygonOffsetConstant = 0.5f;
+
+        /**
+         * Bias based on the change in depth in depth-resolution units by which shadows are moved
+         * away from the light. The default value of 2.0 works well with SHADOW_SAMPLING_PCF_LOW.
+         * Generally this value is between 0.5 and the size in texel of the PCF filter.
+         * Setting this value correctly is essential for LISPSM shadow-maps.
+         * This is ignored when the View's ShadowType is set to VSM.
+         */
+        float polygonOffsetSlope = 2.0f;
 
         /**
          * Whether screen-space contact shadows are used. This applies regardless of whether a
@@ -332,6 +351,12 @@ public class LightManager {
          * The maximum value is 125.
          */
         public float blurWidth = 0.0f;
+
+        /**
+         * Light bulb radius used for soft shadows. Currently this is only used when DPCF is
+         * enabled. (2cm by default).
+         */
+        public float shadowBulbRadius = 0.02f;
     }
 
     public static class ShadowCascades {
@@ -471,9 +496,11 @@ public class LightManager {
             nBuilderShadowOptions(mNativeBuilder,
                     options.mapSize, options.shadowCascades, options.cascadeSplitPositions,
                     options.constantBias, options.normalBias, options.shadowFar, options.shadowNearHint,
-                    options.shadowFarHint, options.stable, options.screenSpaceContactShadows,
+                    options.shadowFarHint, options.stable,
+                    options.polygonOffsetConstant, options.polygonOffsetSlope,
+                    options.screenSpaceContactShadows,
                     options.stepCount, options.maxShadowDistance, options.vsmMsaaSamples,
-                    options.blurWidth);
+                    options.blurWidth, options.shadowBulbRadius);
             return this;
         }
 
@@ -762,7 +789,7 @@ public class LightManager {
 
     @NonNull
     public Type getType(@EntityInstance int i) {
-        return Type.values()[nGetType(mNativeObject, i)];
+        return sTypeValues[nGetType(mNativeObject, i)];
     }
 
     /**
@@ -1131,7 +1158,7 @@ public class LightManager {
     private static native void nDestroyBuilder(long nativeBuilder);
     private static native boolean nBuilderBuild(long nativeBuilder, long nativeEngine, int entity);
     private static native void nBuilderCastShadows(long nativeBuilder, boolean enable);
-    private static native void nBuilderShadowOptions(long nativeBuilder, int mapSize, int cascades, float[] splitPositions, float constantBias, float normalBias, float shadowFar, float shadowNearHint, float shadowFarhint, boolean stable, boolean screenSpaceContactShadows, int stepCount, float maxShadowDistance, int vsmMsaaSamples, float blurWidth);
+    private static native void nBuilderShadowOptions(long nativeBuilder, int mapSize, int cascades, float[] splitPositions, float constantBias, float normalBias, float shadowFar, float shadowNearHint, float shadowFarhint, boolean stable, float polygonOffsetConstant, float polygonOffsetSlope, boolean screenSpaceContactShadows, int stepCount, float maxShadowDistance, int vsmMsaaSamples, float blurWidth, float shadowBulbRadius);
     private static native void nBuilderCastLight(long nativeBuilder, boolean enabled);
     private static native void nBuilderPosition(long nativeBuilder, float x, float y, float z);
     private static native void nBuilderDirection(long nativeBuilder, float x, float y, float z);

android/filament-android/src/main/java/com/google/android/filament/Material.java

@@ -37,6 +37,20 @@ import java.util.Set;
  * @see <a href="https://google.github.io/filament/Materials.html">Filament Materials Guide</a>
  */
 public class Material {
+    static final class EnumCache {
+        private EnumCache() { }
+
+        static final Shading[] sShadingValues = Shading.values();
+        static final Interpolation[] sInterpolationValues = Interpolation.values();
+        static final BlendingMode[] sBlendingModeValues = BlendingMode.values();
+        static final RefractionMode[] sRefractionModeValues = RefractionMode.values();
+        static final RefractionType[] sRefractionTypeValues = RefractionType.values();
+        static final VertexDomain[] sVertexDomainValues = VertexDomain.values();
+        static final CullingMode[] sCullingModeValues = CullingMode.values();
+        static final VertexBuffer.VertexAttribute[] sVertexAttributeValues =
+                VertexBuffer.VertexAttribute.values();
+    }
+
     private long mNativeObject;
     private final MaterialInstance mDefaultInstance;
 
@@ -210,6 +224,8 @@ public class Material {
 
     @UsedByNative("Material.cpp")
     public static class Parameter {
+        private static final Type[] sTypeValues = Type.values();
+
         public enum Type {
             BOOL,
             BOOL2,
@@ -275,7 +291,7 @@ public class Material {
                 @IntRange(from = 0) int type, @IntRange(from = 0) int precision,
                 @IntRange(from = 1) int count) {
             parameters.add(
-                    new Parameter(name, Type.values()[type], Precision.values()[precision], count));
+                    new Parameter(name, sTypeValues[type], Precision.values()[precision], count));
         }
     }
 
@@ -373,7 +389,7 @@ public class Material {
      * Material Models</a>
      */
     public Shading getShading() {
-        return Shading.values()[nGetShading(getNativeObject())];
+        return EnumCache.sShadingValues[nGetShading(getNativeObject())];
     }
 
     /**
@@ -384,7 +400,7 @@ public class Material {
      * Vertex and attributes: interpolation</a>
      */
     public Interpolation getInterpolation() {
-        return Interpolation.values()[nGetInterpolation(getNativeObject())];
+        return EnumCache.sInterpolationValues[nGetInterpolation(getNativeObject())];
     }
 
     /**
@@ -395,7 +411,7 @@ public class Material {
      * Blending and transparency: blending</a>
      */
     public BlendingMode getBlendingMode() {
-        return BlendingMode.values()[nGetBlendingMode(getNativeObject())];
+        return EnumCache.sBlendingModeValues[nGetBlendingMode(getNativeObject())];
     }
 
     /**
@@ -406,7 +422,7 @@ public class Material {
      * Blending and transparency: refraction</a>
      */
     public RefractionMode getRefractionMode() {
-        return RefractionMode.values()[nGetRefractionMode(getNativeObject())];
+        return EnumCache.sRefractionModeValues[nGetRefractionMode(getNativeObject())];
     }
 
     /**
@@ -417,10 +433,9 @@ public class Material {
      * Blending and transparency: refractionType</a>
      */
     public RefractionType getRefractionType() {
-        return RefractionType.values()[nGetRefractionType(getNativeObject())];
+        return EnumCache.sRefractionTypeValues[nGetRefractionType(getNativeObject())];
     }
 
-
     /**
      * Returns the vertex domain of this material.
      *
@@ -429,7 +444,7 @@ public class Material {
      * Vertex and attributes: vertexDomain</a>
      */
     public VertexDomain getVertexDomain() {
-        return VertexDomain.values()[nGetVertexDomain(getNativeObject())];
+        return EnumCache.sVertexDomainValues[nGetVertexDomain(getNativeObject())];
     }
 
     /**
@@ -440,7 +455,7 @@ public class Material {
      * Rasterization: culling</a>
      */
     public CullingMode getCullingMode() {
-        return CullingMode.values()[nGetCullingMode(getNativeObject())];
+        return EnumCache.sCullingModeValues[nGetCullingMode(getNativeObject())];
     }
 
     /**
@@ -531,7 +546,7 @@ public class Material {
         if (mRequiredAttributes == null) {
             int bitSet = nGetRequiredAttributes(getNativeObject());
             mRequiredAttributes = EnumSet.noneOf(VertexBuffer.VertexAttribute.class);
-            VertexBuffer.VertexAttribute[] values = VertexBuffer.VertexAttribute.values();
+            VertexBuffer.VertexAttribute[] values = EnumCache.sVertexAttributeValues;
             for (int i = 0; i < values.length; i++) {
                 if ((bitSet & (1 << i)) != 0) {
                     mRequiredAttributes.add(values[i]);

android/filament-android/src/main/java/com/google/android/filament/MaterialInstance.java

@@ -78,7 +78,7 @@ public class MaterialInstance {
     public static MaterialInstance duplicate(@NonNull MaterialInstance other, String name) {
         long nativeInstance = nDuplicate(other.mNativeObject, name);
         if (nativeInstance == 0) throw new IllegalStateException("Couldn't duplicate MaterialInstance");
-        return new MaterialInstance(other.mMaterial, nativeInstance);
+        return new MaterialInstance(other.getMaterial(), nativeInstance);
     }
 
     /** @return the {@link Material} associated with this instance */
@@ -239,6 +239,10 @@ public class MaterialInstance {
 
     /**
      * Sets a texture and sampler parameter on this material's default instance.
+     * <p>
+     * Note: Depth textures can't be sampled with a linear filter unless the comparison mode is set
+     *       to COMPARE_TO_TEXTURE.
+     * </p>
      *
      * @param name The name of the material texture parameter
      * @param texture The texture to set as parameter

android/filament-android/src/main/java/com/google/android/filament/MorphTargetBuffer.java

@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.filament;
+
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+
+import java.nio.Buffer;
+import java.nio.BufferOverflowException;
+import java.nio.FloatBuffer;
+
+public class MorphTargetBuffer {
+    private long mNativeObject;
+    private MorphTargetBuffer(long nativeMorphTargetBuffer) {
+        mNativeObject = nativeMorphTargetBuffer;
+    }
+
+    public static class Builder {
+        @SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"})
+        // Keep to finalize native resources
+        private final MorphTargetBuffer.Builder.BuilderFinalizer mFinalizer;
+        private final long mNativeBuilder;
+
+        public Builder() {
+            mNativeBuilder = nCreateBuilder();
+            mFinalizer = new MorphTargetBuffer.Builder.BuilderFinalizer(mNativeBuilder);
+        }
+
+        /**
+         * Size of the morph targets in vertex counts.
+         *
+         * @param vertexCount Number of vertex counts the morph targets can hold.
+         * @return this <code>Builder</code> object for chaining calls
+         */
+        @NonNull
+        public Builder vertexCount(@IntRange(from = 1) int vertexCount) {
+            nBuilderVertexCount(mNativeBuilder, vertexCount);
+            return this;
+        }
+
+        /**
+         * Size of the morph targets in targets.
+         *
+         * @param count Number of targets the morph targets can hold.
+         * @return this <code>Builder</code> object for chaining calls
+         */
+        @NonNull
+        public Builder count(@IntRange(from = 1) int count) {
+            nBuilderCount(mNativeBuilder, count);
+            return this;
+        }
+
+        /**
+         * Creates and returns the <code>MorphTargetBuffer</code> object.
+         *
+         * @param engine reference to the {@link Engine} to associate this <code>MorphTargetBuffer</code>
+         *               with.
+         *
+         * @return the newly created <code>MorphTargetBuffer</code> object
+         *
+         * @exception IllegalStateException if the MorphTargetBuffer could not be created
+         *
+         * @see #setMorphTargetBufferAt
+         */
+        @NonNull
+        public MorphTargetBuffer build(@NonNull Engine engine) {
+            long nativeMorphTargetBuffer = nBuilderBuild(mNativeBuilder, engine.getNativeObject());
+            if (nativeMorphTargetBuffer == 0)
+                throw new IllegalStateException("Couldn't create MorphTargetBuffer");
+            return new MorphTargetBuffer(nativeMorphTargetBuffer);
+        }
+
+        private static class BuilderFinalizer {
+            private final long mNativeObject;
+
+            BuilderFinalizer(long nativeObject) {
+                mNativeObject = nativeObject;
+            }
+
+            @Override
+            public void finalize() {
+                try {
+                    super.finalize();
+                } catch (Throwable t) { // Ignore
+                } finally {
+                    nDestroyBuilder(mNativeObject);
+                }
+            }
+        }
+    }
+
+    /**
+     * Updates positions of morph target at the index.
+     *
+     * @param engine {@link Engine} instance
+     * @param targetIndex The index of morph target to be updated
+     * @param positions Pointer to at least count positions
+     * @param count Number of position elements in positions
+     */
+    public void setPositionsAt(@NonNull Engine engine,
+            @IntRange(from = 0) int targetIndex,
+            @NonNull float[] positions, @IntRange(from = 0, to = 125) int count) {
+        int result = nSetPositionsAt(mNativeObject, engine.getNativeObject(), targetIndex,
+                positions, count);
+        if (result < 0) {
+            throw new BufferOverflowException();
+        }
+    }
+
+    /**
+     * Updates tangents of morph target at the index.
+     *
+     * @param engine {@link Engine} instance
+     * @param targetIndex The index of morph target to be updated
+     * @param tangents Pointer to at least count tangents
+     * @param count Number of tangent elements in tangents
+     */
+    public void setTangentsAt(@NonNull Engine engine,
+            @IntRange(from = 0) int targetIndex,
+            @NonNull short[] tangents, @IntRange(from = 0, to = 125) int count) {
+        int result = nSetTangentsAt(mNativeObject, engine.getNativeObject(), targetIndex,
+                tangents, count);
+        if (result < 0) {
+            throw new BufferOverflowException();
+        }
+    }
+
+    /**
+     * @return number of vertex count in this {@link MorphTargetBuffer}
+     */
+    public int getVertexCount() {
+        return nGetVertexCount(mNativeObject);
+    }
+
+    /**
+     * @return number of target count in this {@link MorphTargetBuffer}
+     */
+    public int getCount() {
+        return nGetCount(mNativeObject);
+    }
+
+    public long getNativeObject() {
+        if (mNativeObject == 0) {
+            throw new IllegalStateException("Calling method on destroyed MorphTargetBuffer");
+        }
+        return mNativeObject;
+    }
+
+    void clearNativeObject() {
+        mNativeObject = 0;
+    }
+
+    private static native long nCreateBuilder();
+    private static native void nDestroyBuilder(long nativeBuilder);
+    private static native void nBuilderVertexCount(long nativeBuilder, int vertexCount);
+    private static native void nBuilderCount(long nativeBuilder, int count);
+    private static native long nBuilderBuild(long nativeBuilder, long nativeEngine);
+
+    private static native int nSetPositionsAt(long nativeObject, long nativeEngine, int targetIndex, float[] positions, int count);
+    private static native int nSetTangentsAt(long nativeObject, long nativeEngine, int targetIndex, short[] tangents, int count);
+    private static native int nGetVertexCount(long nativeObject);
+    private static native int nGetCount(long nativeObject);
+}

android/filament-android/src/main/java/com/google/android/filament/RenderTarget.java

@@ -31,8 +31,10 @@ import androidx.annotation.Nullable;
  * @see View
  */
 public class RenderTarget {
-    private long mNativeObject;
     private static final int ATTACHMENT_COUNT = AttachmentPoint.values().length;
+    private static final Texture.CubemapFace[] sCubemapFaceValues = Texture.CubemapFace.values();
+
+    private long mNativeObject;
     private final Texture[] mTextures = new Texture[ATTACHMENT_COUNT];
 
     private RenderTarget(long nativeRenderTarget, Builder builder) {
@@ -194,7 +196,7 @@ public class RenderTarget {
      * a cubemap.
      */
     public Texture.CubemapFace getFace(AttachmentPoint attachment) {
-        return Texture.CubemapFace.values()[nGetFace(getNativeObject(), attachment.ordinal())];
+        return sCubemapFaceValues[nGetFace(getNativeObject(), attachment.ordinal())];
     }
 
     /**

android/filament-android/src/main/java/com/google/android/filament/RenderableManager.java

@@ -58,6 +58,10 @@ import java.util.Set;
  */
 public class RenderableManager {
     private static final String LOG_TAG = "Filament";
+
+    private static final VertexBuffer.VertexAttribute[] sVertexAttributeValues =
+            VertexBuffer.VertexAttribute.values();
+
     private long mNativeObject;
 
     RenderableManager(long nativeRenderableManager) {
@@ -92,7 +96,9 @@ public class RenderableManager {
     public enum PrimitiveType {
         POINTS(0),
         LINES(1),
-        TRIANGLES(4);
+        LINE_STRIP(3),
+        TRIANGLES(4),
+        TRIANGLE_STRIP(5);
 
         private final int mType;
         PrimitiveType(int value) { mType = value; }
@@ -394,17 +400,28 @@ public class RenderableManager {
         }
 
         /**
-         * Controls if the renderable has vertex morphing targets, false by default.
+         * Controls if the renderable has vertex morphing targets, zero by default. This is
+         * required to enable GPU morphing.
          *
-         * <p>This is required to enable GPU morphing for up to 4 attributes. The attached VertexBuffer
-         * must provide data in the appropriate VertexAttribute slots (<code>MORPH_POSITION_0</code> etc).</p>
+         * <p>Filament supports two morphing modes: standard (default) and legacy.</p>
+         *
+         * <p>For standard morphing, A {@link MorphTargetBuffer} must be created and provided via
+         * {@link RenderableManager#setMorphTargetBufferAt}. Standard morphing supports up to
+         * <code>CONFIG_MAX_MORPH_TARGET_COUNT</code> morph targets.</p>
+         *
+         * For legacy morphing, the attached {@link VertexBuffer} must provide data in the
+         * appropriate {@link VertexBuffer.VertexAttribute} slots (<code>MORPH_POSITION_0</code> etc).
+         * Legacy morphing only supports up to 4 morph targets and will be deprecated in the future.
+         * Legacy morphing must be enabled on the material definition: either via the
+         * <code>legacyMorphing</code> material attribute or by calling
+         * {@link MaterialBuilder::useLegacyMorphing}.
          *
          * <p>See also {@link RenderableManager#setMorphWeights}, which can be called on a per-frame basis
          * to advance the animation.</p>
          */
         @NonNull
-        public Builder morphing(boolean enabled) {
-            nBuilderMorphing(mNativeBuilder, enabled);
+        public Builder morphing(@IntRange(from = 0, to = 125) int targetCount) {
+            nBuilderMorphing(mNativeBuilder, targetCount);
             return this;
         }
 
@@ -491,15 +508,54 @@ public class RenderableManager {
     /**
      * Updates the vertex morphing weights on a renderable, all zeroes by default.
      *
-     * <p>This is specified using a 4-tuple, one float per morph target. If the renderable has fewer
-     * than 4 morph targets, then clients should fill the unused components with zeroes.</p>
+     * <p>The renderable must be built with morphing enabled. In legacy morphing mode, only the
+     * first 4 weights are considered.</p>
+     *
+     * @see Builder#morphing
+     */
+    public void setMorphWeights(@EntityInstance int i, @NonNull float[] weights, @IntRange(from = 0) int offset) {
+        nSetMorphWeights(mNativeObject, i, weights, offset);
+    }
+
+    /**
+     * Changes the morph target buffer for the given primitive.
      *
      * <p>The renderable must be built with morphing enabled.</p>
      *
      * @see Builder#morphing
      */
-    public void setMorphWeights(@EntityInstance int i, @NonNull @Size(min = 4) float[] weights) {
-        nSetMorphWeights(mNativeObject, i, weights);
+    public void setMorphTargetBufferAt(@EntityInstance int i,
+                                       @IntRange(from = 0) int level,
+                                       @IntRange(from = 0) int primitiveIndex,
+                                       @NonNull MorphTargetBuffer morphTargetBuffer,
+                                       @IntRange(from = 0) int offset,
+                                       @IntRange(from = 0) int count) {
+        nSetMorphTargetBufferAt(mNativeObject, i, level, primitiveIndex,
+                morphTargetBuffer.getNativeObject(), offset, count);
+    }
+
+    /**
+     * Gets the morph target count on a renderable.
+     */
+    @IntRange(from = 0)
+    public int getMorphTargetCount(@EntityInstance int i) {
+        return nGetMorphTargetCount(mNativeObject, i);
+    }
+
+    /**
+     * Changes the morph target buffer for the given primitive.
+     *
+     * <p>The renderable must be built with morphing enabled.</p>
+     *
+     * @see Builder#morphing
+     */
+    public void setMorphTargetBufferAt(@EntityInstance int i,
+                                       @IntRange(from = 0) int level,
+                                       @IntRange(from = 0) int primitiveIndex,
+                                       @NonNull MorphTargetBuffer morphTargetBuffer,
+                                       @IntRange(from = 0) int count) {
+        nSetMorphTargetBufferAt(mNativeObject, i, level, primitiveIndex,
+                morphTargetBuffer.getNativeObject(), 0, count);
     }
 
     /**
@@ -712,15 +768,19 @@ public class RenderableManager {
     /**
      * Retrieves the set of enabled attribute slots in the given primitive's VertexBuffer.
      */
-    public Set<VertexBuffer.VertexAttribute> getEnabledAttributesAt(@EntityInstance int i, @IntRange(from = 0) int primitiveIndex) {
+    public Set<VertexBuffer.VertexAttribute> getEnabledAttributesAt(
+            @EntityInstance int i, @IntRange(from = 0) int primitiveIndex) {
         int bitSet = nGetEnabledAttributesAt(mNativeObject, i, primitiveIndex);
-        Set<VertexBuffer.VertexAttribute> requiredAttributes = EnumSet.noneOf(VertexBuffer.VertexAttribute.class);
-        VertexBuffer.VertexAttribute[] values = VertexBuffer.VertexAttribute.values();
+        Set<VertexBuffer.VertexAttribute> requiredAttributes =
+                EnumSet.noneOf(VertexBuffer.VertexAttribute.class);
+        VertexBuffer.VertexAttribute[] values = sVertexAttributeValues;
+
         for (int j = 0; j < values.length; j++) {
             if ((bitSet & (1 << j)) != 0) {
                 requiredAttributes.add(values[j]);
             }
         }
+
         requiredAttributes = Collections.unmodifiableSet(requiredAttributes);
         return requiredAttributes;
     }
@@ -752,14 +812,16 @@ public class RenderableManager {
     private static native void nBuilderSkinning(long nativeBuilder, int boneCount);
     private static native int nBuilderSkinningBones(long nativeBuilder, int boneCount, Buffer bones, int remaining);
     private static native void nBuilderSkinningBuffer(long nativeBuilder, long nativeSkinningBuffer, int boneCount, int offset);
-    private static native void nBuilderMorphing(long nativeBuilder, boolean enabled);
+    private static native void nBuilderMorphing(long nativeBuilder, int targetCount);
     private static native void nEnableSkinningBuffers(long nativeBuilder, boolean enabled);
     private static native void nBuilderLightChannel(long nativeRenderableManager, int channel, boolean enable);
 
     private static native void nSetSkinningBuffer(long nativeObject, int i, long nativeSkinningBuffer, int count, int offset);
     private static native int nSetBonesAsMatrices(long nativeObject, int i, Buffer matrices, int remaining, int boneCount, int offset);
     private static native int nSetBonesAsQuaternions(long nativeObject, int i, Buffer quaternions, int remaining, int boneCount, int offset);
-    private static native void nSetMorphWeights(long nativeObject, int instance, float[] weights);
+    private static native void nSetMorphWeights(long nativeObject, int instance, float[] weights, int offset);
+    private static native void nSetMorphTargetBufferAt(long nativeObject, int i, int level, int primitiveIndex, long nativeMorphTargetBuffer, int offset, int count);
+    private static native int nGetMorphTargetCount(long nativeObject, int i);
     private static native void nSetAxisAlignedBoundingBox(long nativeRenderableManager, int i, float cx, float cy, float cz, float ex, float ey, float ez);
     private static native void nSetLayerMask(long nativeRenderableManager, int i, int select, int value);
     private static native void nSetPriority(long nativeRenderableManager, int i, int priority);

android/filament-android/src/main/java/com/google/android/filament/Renderer.java

@@ -107,12 +107,12 @@ public class Renderer {
         /**
          * Rate at which the scale will change to reach the target frame rate.
          */
-        public float scaleRate = 0.125f;
+        public float scaleRate = 1.0f / 15.0f;
 
         /**
-         * History size. higher values, tend to filter more (clamped to 30).
+         * History size. higher values, tend to filter more (clamped to 31).
          */
-        public int history = 9;
+        public int history = 15;
     }
 
     /**
@@ -309,7 +309,7 @@ public class Renderer {
      *
      * <p><code>render()</code> generates commands for each of the following stages:</p>
      * <ul>
-     * <li>Shadow map pass, if needed (currently only a single shadow map is supported)</li>
+     * <li>Shadow map passes, if needed</li>
      * <li>Depth pre-pass</li>
      * <li>SSAO pass, if enabled</li>
      * <li>Color pass</li>
@@ -437,8 +437,9 @@ public class Renderer {
      *</pre>
      *
      *
-     * <p>Typically <code>readPixels</code> will be called after {@link #render} and before
-     * {@link #endFrame}.</p>
+     * <p><code>readPixels</code> must be called within a frame, meaning after {@link #beginFrame}
+     * and before {@link #endFrame}. Typically, <code>readPixels</code> will be called after
+     * {@link #render}.</p>
      * <br>
      * <p>After calling this method, the callback associated with <code>buffer</code>
      * will be invoked on the main thread, indicating that the read-back has completed.

android/filament-android/src/main/java/com/google/android/filament/SkinningBuffer.java

@@ -118,8 +118,8 @@ public class SkinningBuffer {
      * @param offset Index of the first bone to set
      */
     public void setBonesAsMatrices(@NonNull Engine engine,
-                                   @NonNull Buffer matrices, @IntRange(from = 0, to = 255) int boneCount,
-                                   @IntRange(from = 0) int offset) {
+            @NonNull Buffer matrices, @IntRange(from = 0, to = 255) int boneCount,
+            @IntRange(from = 0) int offset) {
         int result = nSetBonesAsMatrices(mNativeObject, engine.getNativeObject(),
                 matrices, matrices.remaining(), boneCount, offset);
         if (result < 0) {
@@ -138,8 +138,8 @@ public class SkinningBuffer {
      * @param offset Index of the first bone to set
      */
     public void setBonesAsQuaternions(@NonNull Engine engine,
-                                      @NonNull Buffer quaternions, @IntRange(from = 0, to = 255) int boneCount,
-                                      @IntRange(from = 0) int offset) {
+            @NonNull Buffer quaternions, @IntRange(from = 0, to = 255) int boneCount,
+            @IntRange(from = 0) int offset) {
         int result = nSetBonesAsQuaternions(mNativeObject, engine.getNativeObject(),
                 quaternions, quaternions.remaining(), boneCount, offset);
         if (result < 0) {

android/filament-android/src/main/java/com/google/android/filament/Stream.java

@@ -91,6 +91,8 @@ import java.nio.ReadOnlyBufferException;
  * @see Engine#destroyStream
  */
 public class Stream {
+    private static final StreamType[] sStreamTypeValues = StreamType.values();
+
     private long mNativeObject;
     private long mNativeEngine;
 
@@ -236,7 +238,7 @@ public class Stream {
      * Indicates whether this <code>Stream</code> is NATIVE, TEXTURE_ID, or ACQUIRED.
      */
     public StreamType getStreamType() {
-        return StreamType.values()[nGetStreamType(getNativeObject())];
+        return sStreamTypeValues[nGetStreamType(getNativeObject())];
     }
 
     /**

android/filament-android/src/main/java/com/google/android/filament/Texture.java

@@ -71,6 +71,9 @@ import static com.google.android.filament.Texture.Type.COMPRESSED;
  * @see MaterialInstance#setParameter(String, Texture, TextureSampler)
  */
 public class Texture {
+    private static final Sampler[] sSamplerValues = Sampler.values();
+    private static final InternalFormat[] sInternalFormatValues = InternalFormat.values();
+
     private long mNativeObject;
 
     public Texture(long nativeTexture) {
@@ -216,7 +219,38 @@ public class Texture {
         ETC2_EAC_RGBA8, ETC2_EAC_SRGBA8,
 
         // Available everywhere except Android/iOS
-        DXT1_RGB, DXT1_RGBA, DXT3_RGBA, DXT5_RGBA
+        DXT1_RGB, DXT1_RGBA, DXT3_RGBA, DXT5_RGBA,
+        DXT1_SRGB, DXT1_SRGBA, DXT3_SRGBA, DXT5_SRGBA,
+
+        // ASTC formats are available with a GLES extension
+        RGBA_ASTC_4x4,
+        RGBA_ASTC_5x4,
+        RGBA_ASTC_5x5,
+        RGBA_ASTC_6x5,
+        RGBA_ASTC_6x6,
+        RGBA_ASTC_8x5,
+        RGBA_ASTC_8x6,
+        RGBA_ASTC_8x8,
+        RGBA_ASTC_10x5,
+        RGBA_ASTC_10x6,
+        RGBA_ASTC_10x8,
+        RGBA_ASTC_10x10,
+        RGBA_ASTC_12x10,
+        RGBA_ASTC_12x12,
+        SRGB8_ALPHA8_ASTC_4x4,
+        SRGB8_ALPHA8_ASTC_5x4,
+        SRGB8_ALPHA8_ASTC_5x5,
+        SRGB8_ALPHA8_ASTC_6x5,
+        SRGB8_ALPHA8_ASTC_6x6,
+        SRGB8_ALPHA8_ASTC_8x5,
+        SRGB8_ALPHA8_ASTC_8x6,
+        SRGB8_ALPHA8_ASTC_8x8,
+        SRGB8_ALPHA8_ASTC_10x5,
+        SRGB8_ALPHA8_ASTC_10x6,
+        SRGB8_ALPHA8_ASTC_10x8,
+        SRGB8_ALPHA8_ASTC_10x10,
+        SRGB8_ALPHA8_ASTC_12x10,
+        SRGB8_ALPHA8_ASTC_12x12
     }
 
     /**
@@ -231,7 +265,38 @@ public class Texture {
         ETC2_EAC_RGBA8, ETC2_EAC_SRGBA8,
 
         // Available everywhere except Android/iOS
-        DXT1_RGB, DXT1_RGBA, DXT3_RGBA, DXT5_RGBA
+        DXT1_RGB, DXT1_RGBA, DXT3_RGBA, DXT5_RGBA,
+        DXT1_SRGB, DXT1_SRGBA, DXT3_SRGBA, DXT5_SRGBA,
+
+        // ASTC formats are available with a GLES extension
+        RGBA_ASTC_4x4,
+        RGBA_ASTC_5x4,
+        RGBA_ASTC_5x5,
+        RGBA_ASTC_6x5,
+        RGBA_ASTC_6x6,
+        RGBA_ASTC_8x5,
+        RGBA_ASTC_8x6,
+        RGBA_ASTC_8x8,
+        RGBA_ASTC_10x5,
+        RGBA_ASTC_10x6,
+        RGBA_ASTC_10x8,
+        RGBA_ASTC_10x10,
+        RGBA_ASTC_12x10,
+        RGBA_ASTC_12x12,
+        SRGB8_ALPHA8_ASTC_4x4,
+        SRGB8_ALPHA8_ASTC_5x4,
+        SRGB8_ALPHA8_ASTC_5x5,
+        SRGB8_ALPHA8_ASTC_6x5,
+        SRGB8_ALPHA8_ASTC_6x6,
+        SRGB8_ALPHA8_ASTC_8x5,
+        SRGB8_ALPHA8_ASTC_8x6,
+        SRGB8_ALPHA8_ASTC_8x8,
+        SRGB8_ALPHA8_ASTC_10x5,
+        SRGB8_ALPHA8_ASTC_10x6,
+        SRGB8_ALPHA8_ASTC_10x8,
+        SRGB8_ALPHA8_ASTC_10x10,
+        SRGB8_ALPHA8_ASTC_12x10,
+        SRGB8_ALPHA8_ASTC_12x12
     }
 
     /**
@@ -805,7 +870,7 @@ public class Texture {
      */
     @NonNull
     public Sampler getTarget() {
-        return Sampler.values()[nGetTarget(getNativeObject())];
+        return sSamplerValues[nGetTarget(getNativeObject())];
     }
 
     /**
@@ -813,7 +878,7 @@ public class Texture {
      */
     @NonNull
     public InternalFormat getFormat() {
-        return InternalFormat.values()[nGetInternalFormat(getNativeObject())];
+        return sInternalFormatValues[nGetInternalFormat(getNativeObject())];
     }
 
     // TODO: add a setImage() version that takes an android Bitmap

android/filament-android/src/main/java/com/google/android/filament/TextureSampler.java

@@ -22,6 +22,14 @@ import androidx.annotation.NonNull;
  * <code>TextureSampler</code> defines how a texture is accessed.
  */
 public class TextureSampler {
+    static final class EnumCache {
+        static final MinFilter[] sMinFilterValues = MinFilter.values();
+        static final MagFilter[] sMagFilterValues = MagFilter.values();
+        static final WrapMode[] sWrapModeValues = WrapMode.values();
+        static final CompareMode[] sCompareModeValues = CompareMode.values();
+        static final CompareFunction[] sCompareFunctionValues = CompareFunction.values();
+    }
+
     public enum WrapMode {
         /**
          * The edge of the texture extends to infinity.
@@ -202,7 +210,7 @@ public class TextureSampler {
      * @return the minification filter
      */
     public MinFilter getMinFilter() {
-        return MinFilter.values()[nGetMinFilter(mSampler)];
+        return EnumCache.sMinFilterValues[nGetMinFilter(mSampler)];
     }
 
     /**
@@ -218,7 +226,7 @@ public class TextureSampler {
      * @return the magnification filter
      */
     public MagFilter getMagFilter() {
-        return MagFilter.values()[nGetMagFilter(mSampler)];
+        return EnumCache.sMagFilterValues[nGetMagFilter(mSampler)];
     }
 
     /**
@@ -234,7 +242,7 @@ public class TextureSampler {
      * @return the wrapping mode in the s (horizontal) direction
      */
     public WrapMode getWrapModeS() {
-        return WrapMode.values()[nGetWrapModeS(mSampler)];
+        return EnumCache.sWrapModeValues[nGetWrapModeS(mSampler)];
     }
 
     /**
@@ -249,7 +257,7 @@ public class TextureSampler {
      * @return the wrapping mode in the t (vertical) direction
      */
     public WrapMode getWrapModeT() {
-        return WrapMode.values()[nGetWrapModeT(mSampler)];
+        return EnumCache.sWrapModeValues[nGetWrapModeT(mSampler)];
     }
 
     /**
@@ -264,7 +272,7 @@ public class TextureSampler {
      * @return the wrapping mode in the r (depth) direction
      */
     public WrapMode getWrapModeR() {
-        return WrapMode.values()[nGetWrapModeR(mSampler)];
+        return EnumCache.sWrapModeValues[nGetWrapModeR(mSampler)];
     }
 
     /**
@@ -297,7 +305,7 @@ public class TextureSampler {
      * @return the comparison mode
      */
     public CompareMode getCompareMode() {
-        return CompareMode.values()[nGetCompareMode(mSampler)];
+        return EnumCache.sCompareModeValues[nGetCompareMode(mSampler)];
     }
 
     /**
@@ -313,7 +321,7 @@ public class TextureSampler {
      * @return the comparison function
      */
     public CompareFunction getCompareFunction() {
-        return CompareFunction.values()[nGetCompareFunction(mSampler)];
+        return EnumCache.sCompareFunctionValues[nGetCompareFunction(mSampler)];
     }
 
     /**

android/filament-android/src/main/java/com/google/android/filament/ToneMapper.java

@@ -109,7 +109,6 @@ public class ToneMapper {
      * The tone mapping curve is defined by 5 parameters:
      * <ul>
      * <li>contrast: controls the contrast of the curve</li>
-     * <li>shoulder: controls the shoulder of the curve, i.e. how quickly scene
      * referred values map to output white</li>
      * <li>midGrayIn: sets the input middle gray</li>
      * <li>midGrayOut: sets the output middle gray</li>
@@ -123,15 +122,14 @@ public class ToneMapper {
          * the {@link ACESLegacy} tone mapper. The default values are:
          *
          * <ul>
-         * <li>contrast = 1.585f</li>
-         * <li>shoulder = 0.5f</li>
+         * <li>contrast = 1.55f</li>
          * <li>midGrayIn = 0.18f</li>
-         * <li>midGrayOut = 0.268f</li>
+         * <li>midGrayOut = 0.215f</li>
          * <li>hdrMax = 10.0f</li>
          * </ul>
          */
         public Generic() {
-            this(1.585f, 0.5f, 0.18f, 0.268f, 10.0f);
+            this(1.55f, 0.18f, 0.215f, 10.0f);
         }
 
         /**
@@ -139,16 +137,14 @@ public class ToneMapper {
          *
          * @param contrast: controls the contrast of the curve, must be > 0.0, values
          *                  in the range 0.5..2.0 are recommended.
-         * @param shoulder: controls the shoulder of the curve, i.e. how quickly scene
-         *                  referred values map to output white, between 0.0 and 1.0.
          * @param midGrayIn: sets the input middle gray, between 0.0 and 1.0.
          * @param midGrayOut: sets the output middle gray, between 0.0 and 1.0.
          * @param hdrMax: defines the maximum input value that will be mapped to
          *                output white. Must be >= 1.0.
          */
         public Generic(
-                float contrast, float shoulder, float midGrayIn, float midGrayOut, float hdrMax) {
-            super(nCreateGenericToneMapper(contrast, shoulder, midGrayIn, midGrayOut, hdrMax));
+                float contrast, float midGrayIn, float midGrayOut, float hdrMax) {
+            super(nCreateGenericToneMapper(contrast, midGrayIn, midGrayOut, hdrMax));
         }
 
         /** Returns the contrast of the curve as a strictly positive value. */
@@ -161,16 +157,6 @@ public class ToneMapper {
             nGenericSetContrast(getNativeObject(), contrast);
         }
 
-        /** Returns how fast scene referred values map to output white as a value between 0.0 and 1.0. */
-        public float getShoulder() {
-            return nGenericGetShoulder(getNativeObject());
-        }
-
-        /** Sets how quickly scene referred values map to output white, between 0.0 and 1.0. */
-        public void setShoulder(float shoulder) {
-            nGenericSetShoulder(getNativeObject(), shoulder);
-        }
-
         /** Returns the middle gray point for input values as a value between 0.0 and 1.0. */
         public float getMidGrayIn() {
             return nGenericGetMidGrayIn(getNativeObject());
@@ -209,17 +195,15 @@ public class ToneMapper {
     private static native long nCreateACESLegacyToneMapper();
     private static native long nCreateFilmicToneMapper();
     private static native long nCreateGenericToneMapper(
-            float contrast, float shoulder, float midGrayIn, float midGrayOut, float hdrMax);
+            float contrast, float midGrayIn, float midGrayOut, float hdrMax);
 
     // Generic tone mappper
     private static native float nGenericGetContrast(long nativeObject);
-    private static native float nGenericGetShoulder(long nativeObject);
     private static native float nGenericGetMidGrayIn(long nativeObject);
     private static native float nGenericGetMidGrayOut(long nativeObject);
     private static native float nGenericGetHdrMax(long nativeObject);
 
     private static native void nGenericSetContrast(long nativeObject, float contrast);
-    private static native void nGenericSetShoulder(long nativeObject, float shoulder);
     private static native void nGenericSetMidGrayIn(long nativeObject, float midGrayIn);
     private static native void nGenericSetMidGrayOut(long nativeObject, float midGrayOut);
     private static native void nGenericSetHdrMax(long nativeObject, float hdrMax);

android/filament-android/src/main/java/com/google/android/filament/View.java

@@ -59,6 +59,10 @@ import static com.google.android.filament.Colors.LinearColor;
  * @see RenderTarget
  */
 public class View {
+    private static final AntiAliasing[] sAntiAliasingValues = AntiAliasing.values();
+    private static final Dithering[] sDitheringValues = Dithering.values();
+    private static final AmbientOcclusion[] sAmbientOcclusionValues = AmbientOcclusion.values();
+
     private long mNativeObject;
     private String mName;
     private Scene mScene;
@@ -75,7 +79,10 @@ public class View {
     private VignetteOptions mVignetteOptions;
     private ColorGrading mColorGrading;
     private TemporalAntiAliasingOptions mTemporalAntiAliasingOptions;
+    private ScreenSpaceReflectionsOptions mScreenSpaceReflectionsOptions;
+    private MultiSampleAntiAliasingOptions mMultiSampleAntiAliasingOptions;
     private VsmShadowOptions mVsmShadowOptions;
+    private SoftShadowOptions mSoftShadowOptions;
 
     /**
      * Generic quality level.
@@ -291,6 +298,29 @@ public class View {
        public boolean ssctEnabled = false;
     }
 
+    /**
+     * Options for Multi-sample Anti-aliasing (MSAA)
+     * @see View#setMultiSampleAntiAliasingOptions
+     */
+    public static class MultiSampleAntiAliasingOptions {
+        /** enables or disables temporal anti-aliasing */
+        public boolean enabled = false;
+
+        /**
+         * number of samples to use for multi-sampled anti-aliasing.\n
+         *      0: treated as 1
+         *      1: no anti-aliasing
+         *      n: sample count. Effective sample could be different depending on the
+         *         GPU capabilities.
+         */
+        public int sampleCount = 4;
+
+        /**
+         * custom resolve improves quality for HDR scenes, but may impact performance.
+         */
+        public boolean customResolve = false;
+    };
+
     /**
      * Options for Temporal Anti-aliasing (TAA)
      * @see View#setTemporalAntiAliasingOptions
@@ -306,6 +336,28 @@ public class View {
         public boolean enabled = false;
     };
 
+    /**
+     * Options for Screen-space Reflections.
+     * @see View#setScreenSpaceReflectionOptions
+     */
+    public static class ScreenSpaceReflectionsOptions {
+        /** ray thickness, in world units */
+        public float thickness = 0.5f;
+
+        /** bias, in world units, to prevent self-intersections */
+        public float bias = 0.01f;
+
+        /** maximum distance, in world units, to raycast */
+        public float maxDistance = 3.0f;
+
+        /** stride, in texels, for samples along the ray. */
+        public float stride = 1.0f;
+
+        /** enables or disables screen-space reflections */
+        public boolean enabled = false;
+    };
+
+
     /**
      * Options for controlling the Bloom effect
      *
@@ -708,7 +760,17 @@ public class View {
         /**
          * Variance shadows.
          */
-        VSM
+        VSM,
+
+        /**
+         * Percentage-closer filtered shadows, with contact hardening simulation.
+         */
+        DPCF,
+
+        /**
+         * Percentage-closer soft shadows
+         */
+        PCSS
     }
 
     /**
@@ -736,13 +798,6 @@ public class View {
          */
         public boolean mipmapping = false;
 
-        /**
-         * EVSM exponent
-         * The maximum value permissible is 5.54 for a shadow map in fp16, or 42.0 for a
-         * shadow map in fp32. Currently the shadow map bit depth is always fp16.
-         */
-        public float exponent = 5.54f;
-
         /**
          * VSM minimum variance scale, must be positive.
          */
@@ -754,6 +809,29 @@ public class View {
         public float lightBleedReduction = 0.2f;
     }
 
+    /**
+     * View-level options for DPCF and PCSS Shadowing.
+     *
+     * <strong>Warning: This API is still experimental and subject to change.</strong>
+     *
+     * @see View#setSoftShadowOptions
+     */
+    public static class SoftShadowOptions {
+        /**
+         * Globally scales the penumbra of all DPCF and PCSS shadows
+         * Acceptable values are greater than 0
+         */
+        public float penumbraScale = 1.0f;
+
+        /**
+         * Globally scales the computed penumbra ratio of all DPCF and PCSS shadows.
+         * This effectively controls the strength of contact hardening effect and is useful for
+         * artistic purposes. Higher values make the shadows become softer faster.
+         * Acceptable values are equal to or greater than 1.
+         */
+        public float penumbraRatioScale = 1.0f;
+    }
+
     /**
      * Used to select buffers.
      */
@@ -1047,7 +1125,10 @@ public class View {
      * </p>
      *
      * @param count number of samples to use for multi-sampled anti-aliasing.
+     *
+     * @deprecated use setMultiSampleAntiAliasingOptions instead
      */
+    @Deprecated
     public void setSampleCount(int count) {
         nSetSampleCount(getNativeObject(), count);
     }
@@ -1060,7 +1141,10 @@ public class View {
      * </p>
      *
      * @return value set by {@link #setSampleCount}
+     *
+     * @deprecated use getMultiSampleAntiAliasingOptions instead
      */
+    @Deprecated
     public int getSampleCount() {
         return nGetSampleCount(getNativeObject());
     }
@@ -1086,7 +1170,31 @@ public class View {
      */
     @NonNull
     public AntiAliasing getAntiAliasing() {
-        return AntiAliasing.values()[nGetAntiAliasing(getNativeObject())];
+        return sAntiAliasingValues[nGetAntiAliasing(getNativeObject())];
+    }
+
+    /**
+     * Enables or disable multi-sample anti-aliasing (MSAA). Disabled by default.
+     *
+     * @param options multi-sample anti-aliasing options
+     */
+    public void setMultiSampleAntiAliasingOptions(@NonNull MultiSampleAntiAliasingOptions options) {
+        mMultiSampleAntiAliasingOptions = options;
+        nSetMultiSampleAntiAliasingOptions(getNativeObject(),
+                options.enabled, options.sampleCount, options.customResolve);
+    }
+
+    /**
+     * Returns multi-sample anti-aliasing options.
+     *
+     * @return multi-sample anti-aliasing options
+     */
+    @NonNull
+    public MultiSampleAntiAliasingOptions getMultiSampleAntiAliasingOptions() {
+        if (mMultiSampleAntiAliasingOptions == null) {
+            mMultiSampleAntiAliasingOptions = new MultiSampleAntiAliasingOptions();
+        }
+        return mMultiSampleAntiAliasingOptions;
     }
 
     /**
@@ -1100,6 +1208,17 @@ public class View {
                 options.feedback, options.filterWidth, options.enabled);
     }
 
+    /**
+     * Enables or disable screen-space reflections. Disabled by default.
+     *
+     * @param options screen-space reflections options
+     */
+    public void setScreenSpaceReflectionsOptions(@NonNull ScreenSpaceReflectionsOptions options) {
+        mScreenSpaceReflectionsOptions = options;
+        nSetScreenSpaceReflectionsOptions(getNativeObject(), options.thickness, options.bias,
+                options.maxDistance, options.stride, options.enabled);
+    }
+
     /**
      * Returns temporal anti-aliasing options.
      *
@@ -1113,6 +1232,19 @@ public class View {
         return mTemporalAntiAliasingOptions;
     }
 
+    /**
+     * Returns screen-space reflections options.
+     *
+     * @return screen-space reflections options
+     */
+    @NonNull
+    public ScreenSpaceReflectionsOptions getScreenSpaceReflectionsOptions() {
+        if (mScreenSpaceReflectionsOptions == null) {
+            mScreenSpaceReflectionsOptions = new ScreenSpaceReflectionsOptions();
+        }
+        return mScreenSpaceReflectionsOptions;
+    }
+
     /**
      * Enables or disables tone-mapping in the post-processing stage. Enabled by default.
      *
@@ -1175,7 +1307,7 @@ public class View {
      */
     @NonNull
     public Dithering getDithering() {
-        return Dithering.values()[nGetDithering(getNativeObject())];
+        return sDitheringValues[nGetDithering(getNativeObject())];
     }
 
     /**
@@ -1252,21 +1384,26 @@ public class View {
      *
      * <p>Post-processing includes:</p>
      * <ul>
-     * <li>Tone-mapping & gamma encoding</li>
+     * <li>Depth-of-field</li>
+     * <li>Bloom</li>
+     * <li>Vignetting</li>
+     * <li>Temporal Anti-aliasing (TAA)</li>
+     * <li>Color grading & gamma encoding</li>
      * <li>Dithering</li>
-     * <li>MSAA</li>
      * <li>FXAA</li>
      * <li>Dynamic scaling</li>
      * </ul>
      *
      * <p>
-     * Disabling post-processing forgoes color correctness as well as anti-aliasing and
-     * should only be used experimentally (e.g., for UI overlays).
+     * Disabling post-processing forgoes color correctness as well as some anti-aliasing techniques
+     * and should only be used for debugging, UI overlays or when using custom render targets
+     * (see RenderTarget).
      * </p>
      *
      * @param enabled true enables post processing, false disables it
      *
-     * @see #setToneMapping
+     * @see #setBloomOptions
+     * @see #setColorGrading
      * @see #setAntiAliasing
      * @see #setDithering
      * @see #setSampleCount
@@ -1361,7 +1498,7 @@ public class View {
     public void setVsmShadowOptions(@NonNull VsmShadowOptions options) {
         mVsmShadowOptions = options;
         nSetVsmShadowOptions(getNativeObject(), options.anisotropy, options.mipmapping,
-                options.exponent, options.minVarianceScale, options.lightBleedReduction);
+                options.minVarianceScale, options.lightBleedReduction);
     }
 
     /**
@@ -1377,6 +1514,37 @@ public class View {
         return mVsmShadowOptions;
     }
 
+    /**
+     * Sets soft shadowing options that apply across the entire View.
+     *
+     * Additional light-specific VSM options can be set with
+     * {@link LightManager.Builder#shadowOptions}.
+     *
+     * Only applicable when shadow type is set to ShadowType.DPCF.
+     *
+     * <strong>Warning: This API is still experimental and subject to change.</strong>
+     *
+     * @param options Options for shadowing.
+     * @see #setShadowType
+     */
+    public void setSoftShadowOptions(@NonNull SoftShadowOptions options) {
+        mSoftShadowOptions = options;
+        nSetSoftShadowOptions(getNativeObject(), options.penumbraScale, options.penumbraRatioScale);
+    }
+
+    /**
+     * Gets soft shadowing options associated with this View.
+     * @see #setSoftShadowOptions
+     * @return soft shadow options currently set.
+     */
+    @NonNull
+    public SoftShadowOptions getSoftShadowOptions() {
+        if (mSoftShadowOptions == null) {
+            mSoftShadowOptions = new SoftShadowOptions();
+        }
+        return mSoftShadowOptions;
+    }
+
     /**
      * Activates or deactivates ambient occlusion.
      * @see #setAmbientOcclusionOptions
@@ -1395,7 +1563,7 @@ public class View {
     @Deprecated
     @NonNull
     public AmbientOcclusion getAmbientOcclusion() {
-        return AmbientOcclusion.values()[nGetAmbientOcclusion(getNativeObject())];
+        return sAmbientOcclusionValues[nGetAmbientOcclusion(getNativeObject())];
     }
 
     /**
@@ -1548,6 +1716,71 @@ public class View {
         return mDepthOfFieldOptions;
     }
 
+    /**
+     * A class containing the result of a picking query
+     */
+    public static class PickingQueryResult {
+        /** The entity of the renderable at the picking query location */
+        @Entity public int renderable;
+        /** The value of the depth buffer at the picking query location */
+        public float depth;
+        /** The fragment coordinate in GL convention at the picking query location */
+        @NonNull public float[] fragCoords = new float[3];
+    };
+
+    /**
+     * An interface to implement a custom class to receive results of picking queries.
+     */
+    public interface OnPickCallback {
+        /**
+         * onPick() is called by the specified Handler in {@link View#pick} when the picking query
+         * result is available.
+         * @param result An instance of {@link PickingQueryResult}.
+         */
+        void onPick(@NonNull PickingQueryResult result);
+    }
+
+    /**
+     * Creates a picking query. Multiple queries can be created (e.g.: multi-touch).
+     * Picking queries are all executed when {@link Renderer#render} is called on this View.
+     * The provided callback is guaranteed to be called at some point in the future.
+     *
+     * Typically it takes a couple frames to receive the result of a picking query.
+     *
+     * @param x        Horizontal coordinate to query in the viewport with origin on the left.
+     * @param y        Vertical coordinate to query on the viewport with origin at the bottom.
+     * @param handler  An {@link java.util.concurrent.Executor Executor}.
+     *                 On Android this can also be a {@link android.os.Handler Handler}.
+     * @param callback User callback executed by <code>handler</code> when the picking query
+     *                 result is available.
+     */
+    public void pick(int x, int y,
+            @Nullable Object handler, @Nullable OnPickCallback callback) {
+        InternalOnPickCallback internalCallback = new InternalOnPickCallback(callback);
+        nPick(getNativeObject(), x, y, handler, internalCallback);
+    }
+
+    private static class InternalOnPickCallback implements Runnable {
+        public InternalOnPickCallback(OnPickCallback mUserCallback) {
+            this.mUserCallback = mUserCallback;
+        }
+        @Override
+        public void run() {
+            mPickingQueryResult.renderable = mRenderable;
+            mPickingQueryResult.depth = mDepth;
+            mPickingQueryResult.fragCoords[0] = mFragCoordsX;
+            mPickingQueryResult.fragCoords[1] = mFragCoordsY;
+            mPickingQueryResult.fragCoords[2] = mFragCoordsZ;
+            mUserCallback.onPick(mPickingQueryResult);
+        }
+        private final OnPickCallback mUserCallback;
+        private final PickingQueryResult mPickingQueryResult = new PickingQueryResult();
+        @Entity int mRenderable;
+        float mDepth;
+        float mFragCoordsX;
+        float mFragCoordsY;
+        float mFragCoordsZ;
+    }
 
     public long getNativeObject() {
         if (mNativeObject == 0) {
@@ -1577,7 +1810,8 @@ public class View {
     private static native void nSetRenderQuality(long nativeView, int hdrColorBufferQuality);
     private static native void nSetDynamicLightingOptions(long nativeView, float zLightNear, float zLightFar);
     private static native void nSetShadowType(long nativeView, int type);
-    private static native void nSetVsmShadowOptions(long nativeView, int anisotropy, boolean mipmapping, float exponent, float minVarianceScale, float lightBleedReduction);
+    private static native void nSetVsmShadowOptions(long nativeView, int anisotropy, boolean mipmapping, float minVarianceScale, float lightBleedReduction);
+    private static native void nSetSoftShadowOptions(long nativeView, float penumbraScale, float penumbraRatioScale);
     private static native void nSetColorGrading(long nativeView, long nativeColorGrading);
     private static native void nSetPostProcessingEnabled(long nativeView, boolean enabled);
     private static native boolean nIsPostProcessingEnabled(long nativeView);
@@ -1595,7 +1829,10 @@ public class View {
             boolean nativeResolution, int foregroundRingCount, int backgroundRingCount, int fastGatherRingCount, int maxForegroundCOC, int maxBackgroundCOC);
     private static native void nSetVignetteOptions(long nativeView, float midPoint, float roundness, float feather, float r, float g, float b, float a, boolean enabled);
     private static native void nSetTemporalAntiAliasingOptions(long nativeView, float feedback, float filterWidth, boolean enabled);
+    private static native void nSetScreenSpaceReflectionsOptions(long nativeView, float thickness, float bias, float maxDistance, float stride, boolean enabled);
+    private static native void nSetMultiSampleAntiAliasingOptions(long nativeView, boolean enabled, int sampleCount, boolean customResolve);
     private static native boolean nIsShadowingEnabled(long nativeView);
     private static native void nSetScreenSpaceRefractionEnabled(long nativeView, boolean enabled);
     private static native boolean nIsScreenSpaceRefractionEnabled(long nativeView);
+    private static native void nPick(long nativeView, int x, int y, Object handler, InternalOnPickCallback internalCallback);
 }

android/filament-utils-android/CMakeLists.txt

@@ -50,6 +50,7 @@ target_compile_definitions(filament-utils-jni PUBLIC IMAGEIO_LITE=1)
 target_include_directories(filament-utils-jni PRIVATE
         ${FILAMENT_DIR}/include
         ..
+        ../../filament/backend/include
         ${IMAGEIO_DIR}/include
         ../../libs/utils/include)
 

android/filament-utils-android/build.gradle

@@ -9,6 +9,13 @@ android {
 
         lite {
             dimension "functionality"
+            externalNativeBuild {
+                cmake {
+                    // hack: this is needed because filament-utils-android/CMakeLists.txt builds
+                    // gltfio from source, which needs this defined
+                    arguments.add("-DGLTFIO_LITE=ON")
+                }
+            }
         }
     }
 
@@ -43,13 +50,14 @@ configurations.all { config ->
 dependencies {
     implementation deps.kotlin
     implementation deps.androidx.annotations
-    implementation project(':filament-android')
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    implementation deps.coroutines.core
+    implementation deps.coroutines.android
 
-    fullImplementation module("com.google.android.filament:gltfio-android:${VERSION_NAME}")
-    liteImplementation module("com.google.android.filament:gltfio-android-lite:${VERSION_NAME}")
+    api project(':filament-android')
+
+    fullApi module("com.google.android.filament:gltfio-android:${VERSION_NAME}")
+    liteApi module("com.google.android.filament:gltfio-android-lite:${VERSION_NAME}")
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

android/filament-utils-android/src/main/java/com/google/android/filament/utils/IBLPrefilterContext.java

@@ -32,9 +32,13 @@ import com.google.android.filament.Texture;
  * Texture equirect = HDRLoader.createTexture("foo.hdr");
  * Texture skyboxTexture = equirectangularToCubemap.run(equirect);
  * engine.destroy(equirect);
+ * equirectangularToCubemap.destroy();
  *
  * specularFilter = new IBLPrefilterContext.SpecularFilter(context);
  * Texture reflections = specularFilter.run(skyboxTexture);
+ * specularFilter.destroy();
+ *
+ * context.destroy();
  *
  * IndirectLight ibl = IndirectLight.Builder()
  *         .reflections(reflections)
@@ -43,81 +47,74 @@ import com.google.android.filament.Texture;
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 public class IBLPrefilterContext {
-    private final long mNativeObject;
+    private long mNativeObject;
 
     public IBLPrefilterContext(Engine engine) {
         mNativeObject = nCreate(engine.getNativeObject());
         if (mNativeObject == 0) throw new IllegalStateException("Couldn't create IBLPrefilterContext");
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        nDestroy(mNativeObject);
-        super.finalize();
+    public void destroy() {
+        nDestroy(getNativeObject());
+        mNativeObject = 0;
     }
 
     public static class EquirectangularToCubemap {
-        @SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"}) // Keep to finalize native resources
-        private final HelperFinalizer mFinalizer;
-        private final long mNativeHelper;
+        private long mNativeObject;
 
         public EquirectangularToCubemap(IBLPrefilterContext context) {
-            mNativeHelper = nCreateEquirectHelper(context.mNativeObject);
-            mFinalizer = new HelperFinalizer(mNativeHelper);
+            mNativeObject = nCreateEquirectHelper(context.getNativeObject());
         }
 
         public Texture run(Texture equirect) {
-            long nativeTexture = nEquirectHelperRun(mNativeHelper, equirect.getNativeObject());
+            long nativeTexture = nEquirectHelperRun(getNativeObject(), equirect.getNativeObject());
             return new Texture(nativeTexture);
         }
 
-        private static class HelperFinalizer {
-            private final long mNativeObject;
+        public void destroy() {
+            nDestroyEquirectHelper(getNativeObject());
+            mNativeObject = 0;
+        }
 
-            HelperFinalizer(long nativeObject) { mNativeObject = nativeObject; }
-
-            @Override
-            public void finalize() {
-                try {
-                    super.finalize();
-                } catch (Throwable t) { // Ignore
-                } finally {
-                    nDestroyEquirectHelper(mNativeObject);
-                }
+        protected long getNativeObject() {
+            if (mNativeObject == 0) {
+                throw new IllegalStateException("Calling method on destroyed EquirectangularToCubemap");
             }
+            return mNativeObject;
         }
     }
 
     public static class SpecularFilter {
-        @SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"}) // Keep to finalize native resources
-        private final HelperFinalizer mFinalizer;
-        private final long mNativeHelper;
+        private long mNativeObject;
 
         public SpecularFilter(IBLPrefilterContext context) {
-            mNativeHelper = nCreateSpecularFilter(context.mNativeObject);
-            mFinalizer = new HelperFinalizer(mNativeHelper);
+            mNativeObject = nCreateSpecularFilter(context.getNativeObject());
         }
 
         public Texture run(Texture skybox) {
-            long nativeTexture = nSpecularFilterRun(mNativeHelper, skybox.getNativeObject());
+            long nativeTexture = nSpecularFilterRun(getNativeObject(), skybox.getNativeObject());
             return new Texture(nativeTexture);
         }
 
-        private static class HelperFinalizer {
-            private final long mNativeObject;
-
-            HelperFinalizer(long nativeObject) { mNativeObject = nativeObject; }
-
-            @Override
-            public void finalize() {
-                try {
-                    super.finalize();
-                } catch (Throwable t) { // Ignore
-                } finally {
-                    nDestroySpecularFilter(mNativeObject);
-                }
-            }
+        public void destroy() {
+            nDestroySpecularFilter(getNativeObject());
+            mNativeObject = 0;
         }
+
+        protected long getNativeObject() {
+            if (mNativeObject == 0) {
+                throw new IllegalStateException("Calling method on destroyed SpecularFilter");
+            }
+            return mNativeObject;
+        }
+    }
+
+
+    protected long getNativeObject() {
+        if (mNativeObject == 0) {
+            throw new IllegalStateException("Calling method on destroyed IBLPrefilterContext");
+        }
+        return mNativeObject;
     }
 
     private static native long nCreate(long nativeEngine);

android/filament-utils-android/src/main/java/com/google/android/filament/utils/Manipulator.java

@@ -32,7 +32,9 @@ import androidx.annotation.Size;
  * @see Bookmark
  */
 public class Manipulator {
-    private long mNativeObject;
+    private static final Mode[] sModeValues = Mode.values();
+
+    private final long mNativeObject;
 
     private Manipulator(long nativeIndexBuffer) {
         mNativeObject = nativeIndexBuffer;
@@ -320,7 +322,7 @@ public class Manipulator {
     /**
      * Gets the immutable mode of the manipulator.
      */
-    public Mode getMode() { return Mode.values()[nGetMode(mNativeObject)]; }
+    public Mode getMode() { return sModeValues[nGetMode(mNativeObject)]; }
 
     /**
      * Sets the viewport dimensions in terms of pixels.

android/filament-utils-android/src/main/java/com/google/android/filament/utils/Matrix.kt

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:Suppress("unused")
+
 package com.google.android.filament.utils
 
 import kotlin.math.*
@@ -22,6 +24,10 @@ enum class MatrixColumn {
     X, Y, Z, W
 }
 
+enum class RotationsOrder {
+    XYZ, XZY, YXZ, YZX, ZXY, ZYX
+}
+
 data class Mat2(
         var x: Float2 = Float2(x = 1.0f),
         var y: Float2 = Float2(y = 1.0f)) {
@@ -39,14 +45,14 @@ data class Mat2(
         fun identity() = Mat2()
     }
 
-    operator fun get(column: Int) = when(column) {
+    operator fun get(column: Int) = when (column) {
         0 -> x
         1 -> y
         else -> throw IllegalArgumentException("column must be in 0..1")
     }
     operator fun get(column: Int, row: Int) = get(column)[row]
 
-    operator fun get(column: MatrixColumn) = when(column) {
+    operator fun get(column: MatrixColumn) = when (column) {
         MatrixColumn.X -> x
         MatrixColumn.Y -> y
         else -> throw IllegalArgumentException("column must be X or Y")
@@ -64,16 +70,8 @@ data class Mat2(
     }
 
     operator fun unaryMinus() = Mat2(-x, -y)
-    operator fun inc(): Mat2 {
-        x++
-        y++
-        return this
-    }
-    operator fun dec(): Mat2 {
-        x--
-        y--
-        return this
-    }
+    operator fun inc() = Mat2(x++, y++)
+    operator fun dec() = Mat2(x--, y--)
 
     operator fun plus(v: Float) = Mat2(x + v, y + v)
     operator fun minus(v: Float) = Mat2(x - v, y - v)
@@ -130,7 +128,7 @@ data class Mat3(
         fun identity() = Mat3()
     }
 
-    operator fun get(column: Int) = when(column) {
+    operator fun get(column: Int) = when (column) {
         0 -> x
         1 -> y
         2 -> z
@@ -138,7 +136,7 @@ data class Mat3(
     }
     operator fun get(column: Int, row: Int) = get(column)[row]
 
-    operator fun get(column: MatrixColumn) = when(column) {
+    operator fun get(column: MatrixColumn) = when (column) {
         MatrixColumn.X -> x
         MatrixColumn.Y -> y
         MatrixColumn.Z -> z
@@ -157,18 +155,8 @@ data class Mat3(
     }
 
     operator fun unaryMinus() = Mat3(-x, -y, -z)
-    operator fun inc(): Mat3 {
-        x++
-        y++
-        z++
-        return this
-    }
-    operator fun dec(): Mat3 {
-        x--
-        y--
-        z--
-        return this
-    }
+    operator fun inc() = Mat3(x++, y++, z++)
+    operator fun dec() = Mat3(x--, y--, z--)
 
     operator fun plus(v: Float) = Mat3(x + v, y + v, z + v)
     operator fun minus(v: Float) = Mat3(x - v, y - v, z - v)
@@ -279,7 +267,7 @@ data class Mat4(
     inline val upperLeft: Mat3
         get() = Mat3(x.xyz, y.xyz, z.xyz)
 
-    operator fun get(column: Int) = when(column) {
+    operator fun get(column: Int) = when (column) {
         0 -> x
         1 -> y
         2 -> z
@@ -288,7 +276,7 @@ data class Mat4(
     }
     operator fun get(column: Int, row: Int) = get(column)[row]
 
-    operator fun get(column: MatrixColumn) = when(column) {
+    operator fun get(column: MatrixColumn) = when (column) {
         MatrixColumn.X -> x
         MatrixColumn.Y -> y
         MatrixColumn.Z -> z
@@ -307,20 +295,8 @@ data class Mat4(
     }
 
     operator fun unaryMinus() = Mat4(-x, -y, -z, -w)
-    operator fun inc(): Mat4 {
-        x++
-        y++
-        z++
-        w++
-        return this
-    }
-    operator fun dec(): Mat4 {
-        x--
-        y--
-        z--
-        w--
-        return this
-    }
+    operator fun inc() = Mat4(x++, y++, z++, w++)
+    operator fun dec() = Mat4(x--, y--, z--, w--)
 
     operator fun plus(v: Float) = Mat4(x + v, y + v, z + v, w + v)
     operator fun minus(v: Float) = Mat4(x - v, y - v, z - v, w - v)
@@ -361,6 +337,8 @@ data class Mat4(
             x.w * v.x + y.w * v.y + z.w * v.z+ w.w * v.w
     )
 
+    fun toQuaternion() = quaternion(this)
+
     fun toFloatArray() = floatArrayOf(
             x.x, y.x, z.x, w.x,
             x.y, y.y, z.y, w.y,
@@ -408,7 +386,7 @@ fun inverse(m: Mat3): Mat3 {
     val det = a * A + b * B + c * C
 
     return Mat3.of(
-            A / det,               B / det,               C / det,
+            A / det, B / det, C / det,
             (c * h - b * i) / det, (a * i - c * g) / det, (b * g - a * h) / det,
             (b * f - c * e) / det, (c * d - a * f) / det, (a * e - b * d) / det
     )
@@ -496,18 +474,90 @@ fun translation(t: Float3) = Mat4(w = Float4(t, 1.0f))
 fun translation(m: Mat4) = translation(m.translation)
 
 fun rotation(m: Mat4) = Mat4(normalize(m.right), normalize(m.up), normalize(m.forward))
-fun rotation(d: Float3): Mat4 {
-    val r = transform(d, ::radians)
-    val c = transform(r) { x -> cos(x) }
-    val s = transform(r) { x -> sin(x) }
 
-    return Mat4.of(
-             c.y * c.z, -c.x * s.z + s.x * s.y * c.z,  s.x * s.z + c.x * s.y * c.z, 0.0f,
-             c.y * s.z,  c.x * c.z + s.x * s.y * s.z, -s.x * c.z + c.x * s.y * s.z, 0.0f,
-            -s.y      ,  s.x * c.y                  ,  c.x * c.y                  , 0.0f,
-             0.0f     ,  0.0f                       ,  0.0f                       , 1.0f
-    )
+/**
+ * Construct a rotation matrix from Euler angles using YPR around a specified order
+ *
+ * Uses intrinsic Tait-Bryan angles. This means that rotations are performed with respect to the
+ * local coordinate system.
+ * That is, for order 'XYZ', the rotation is first around the X axis (which is the same as the
+ * world-X axis), then around local-Y (which may now be different from the world Y-axis),
+ * then local-Z (which may be different from the world Z-axis)
+ *
+ * @param d Per axis Euler angles in degrees
+ * Yaw, pitch, roll (YPR) are taken accordingly to the rotations order input.
+ * @param order The order in which to apply rotations.
+ * Default is [RotationsOrder.ZYX] which means that the object will first be rotated around its Z
+ * axis, then its Y axis and finally its X axis.
+ *
+ * @return The rotation matrix
+ */
+fun rotation(d: Float3, order: RotationsOrder = RotationsOrder.ZYX): Mat4 {
+    val r = transform(d, ::radians)
+    return when(order) {
+        RotationsOrder.XZY -> rotation(r.x, r.z, r.y)
+        RotationsOrder.XYZ -> rotation(r.x, r.y, r.z)
+        RotationsOrder.YXZ -> rotation(r.y, r.x, r.z)
+        RotationsOrder.YZX -> rotation(r.y, r.z, r.x)
+        RotationsOrder.ZYX -> rotation(r.z, r.y, r.x)
+        RotationsOrder.ZXY -> rotation(r.z, r.x, r.y)
+    }
 }
+
+/**
+ * Construct a rotation matrix from Euler yaw, pitch, roll around a specified order.
+ *
+ * @param roll about 1st rotation axis in radians. Z in case of ZYX order
+ * @param pitch about 2nd rotation axis in radians. Y in case of ZYX order
+ * @param yaw about 3rd rotation axis in radians. X in case of ZYX order
+ * @param order The order in which to apply rotations.
+ * Default is [RotationsOrder.ZYX] which means that the object will first be rotated around its Z
+ * axis, then its Y axis and finally its X axis.
+ *
+ * @return The rotation matrix
+ */
+fun rotation(yaw: Float = 0.0f, pitch: Float = 0.0f, roll: Float = 0.0f, order: RotationsOrder = RotationsOrder.ZYX): Mat4 {
+    val c1 = cos(yaw)
+    val s1 = sin(yaw)
+    val c2 = cos(pitch)
+    val s2 = sin(pitch)
+    val c3 = cos(roll)
+    val s3 = sin(roll)
+
+    return when (order) {
+        RotationsOrder.XZY -> Mat4.of(
+                c2 * c3, -s2, c2 * s3, 0.0f,
+                s1 * s3 + c1 * c3 * s2, c1 * c2, c1 * s2 * s3 - c3 * s1, 0.0f,
+                c3 * s1 * s2 - c1 * s3, c2 * s1, c1 * c3 + s1 * s2 * s3, 0.0f,
+                0.0f, 0.0f, 0.0f, 1.0f)
+        RotationsOrder.XYZ -> Mat4.of(
+                c2 * c3, -c2 * s3, s2, 0.0f,
+                c1 * s3 + c3 * s1 * s2, c1 * c3 - s1 * s2 * s3, -c2 * s1, 0.0f,
+                s1 * s3 - c1 * c3 * s2, c3 * s1 + c1 * s2 * s3, c1 * c2, 0.0f,
+                0.0f, 0.0f, 0.0f, 1.0f)
+        RotationsOrder.YXZ -> Mat4.of(
+                c1 * c3 + s1 * s2 * s3, c3 * s1 * s2 - c1 * s3, c2 * s1, 0.0f,
+                c2 * s3, c2 * c3, -s2, 0.0f,
+                c1 * s2 * s3 - c3 * s1, c1 * c3 * s2 + s1 * s3, c1 * c2, 0.0f,
+                0.0f, 0.0f, 0.0f, 1.0f)
+        RotationsOrder.YZX -> Mat4.of(
+                c1 * c2, s1 * s3 - c1 * c3 * s2, c3 * s1 + c1 * s2 * s3, 0.0f,
+                s2, c2 * c3, -c2 * s3, 0.0f,
+                -c2 * s1, c1 * s3 + c3 * s1 * s2, c1 * c3 - s1 * s2 * s3, 0.0f,
+                0.0f, 0.0f, 0.0f, 1.0f)
+        RotationsOrder.ZYX -> Mat4.of(
+                c1 * c2, c1 * s2 * s3 - c3 * s1, s1 * s3 + c1 * c3 * s2, 0.0f,
+                c2 * s1, c1 * c3 + s1 * s2 * s3, c3 * s1 * s2 - c1 * s3, 0.0f,
+                -s2, c2 * s3, c2 * c3, 0.0f,
+                0.0f, 0.0f, 0.0f, 1.0f)
+        RotationsOrder.ZXY -> Mat4.of(
+                c1 * c3 - s1 * s2 * s3, -c2 * s1, c1 * s3 + c3 * s1 * s2, 0.0f,
+                c3 * s1 + c1 * s2 * s3, c1 * c2, s1 * s3 - c1 * c3 * s2, 0.0f,
+                -c2 * s3, s2, c2 * c3, 0.0f,
+                0.0f, 0.0f, 0.0f, 1.0f)
+    }
+}
+
 fun rotation(axis: Float3, angle: Float): Mat4 {
     val x = axis.x
     val y = axis.y
@@ -519,10 +569,85 @@ fun rotation(axis: Float3, angle: Float): Mat4 {
     val d = 1.0f - c
 
     return Mat4.of(
-            x * x * d + c    , x * y * d - z * s, x * z * d + y * s, 0.0f,
-            y * x * d + z * s, y * y * d + c    , y * z * d - x * s, 0.0f,
-            z * x * d - y * s, z * y * d + x * s, z * z * d + c    , 0.0f,
-            0.0f             , 0.0f             , 0.0f             , 1.0f
+            x * x * d + c, x * y * d - z * s, x * z * d + y * s, 0.0f,
+            y * x * d + z * s, y * y * d + c, y * z * d - x * s, 0.0f,
+            z * x * d - y * s, z * y * d + x * s, z * z * d + c, 0.0f,
+            0.0f, 0.0f, 0.0f, 1.0f
+    )
+}
+
+/**
+ * Construct a Quaternion Rotation Matrix following the Hamilton convention
+ *
+ * Assume the destination and local coordinate spaces are initially aligned, and the local
+ * coordinate space is then rotated counter-clockwise about a unit-length axis, k, by an angle,
+ * theta.
+ */
+fun rotation(quaternion: Quaternion): Mat4 {
+    val n = normalize(quaternion)
+    return Mat4(
+            Float4(
+                1.0f - 2.0f * (n.y * n.y + n.z * n.z),
+                2.0f * (n.x * n.y - n.z * n.w),
+                2.0f * (n.x * n.z + n.y * n.w)
+            ),
+            Float4(
+                2.0f * (n.x * n.y + n.z * n.w),
+                1.0f - 2.0f * (n.x * n.x + n.z * n.z),
+                2.0f * (n.y * n.z - n.x * n.w)
+            ),
+            Float4(
+                2.0f * (n.x * n.z - n.y * n.w),
+                2.0f * (n.y * n.z + n.x * n.w),
+                1.0f - 2.0f * (n.x * n.x + n.y * n.y)
+            )
+    )
+}
+
+/**
+ * Extract Quaternion rotation from a Matrix
+ */
+fun quaternion(m: Mat4): Quaternion {
+    val trace = m.x.x + m.y.y + m.z.z
+    return normalize(
+        when {
+            trace > 0 -> {
+                val s = sqrt(trace + 1.0f) * 2.0f
+                Quaternion(
+                    (m.z.y - m.y.z) / s,
+                    (m.x.z - m.z.x) / s,
+                    (m.y.x - m.x.y) / s,
+                    0.25f * s
+                )
+            }
+            m.x.x > m.y.y && m.x.x > m.z.z -> {
+                val s = sqrt(1.0f + m.x.x - m.y.y - m.z.z) * 2.0f
+                Quaternion(
+                    0.25f * s,
+                    (m.x.y + m.y.x) / s,
+                    (m.x.z + m.z.x) / s,
+                    (m.z.y - m.y.z) / s
+                )
+            }
+            m.y.y > m.z.z -> {
+                val s = sqrt(1.0f + m.y.y - m.x.x - m.z.z) * 2.0f
+                Quaternion(
+                    (m.x.y + m.y.x) / s,
+                    0.25f * s,
+                    (m.y.z + m.z.y) / s,
+                    (m.x.z - m.z.x) / s
+                )
+            }
+            else -> {
+                val s = sqrt(1.0f + m.z.z - m.x.x - m.y.y) * 2.0f
+                Quaternion(
+                    (m.y.x - m.x.y) / s,
+                    (m.x.z + m.z.x) / s,
+                    (m.y.z + m.z.y) / s,
+                    0.25f * s
+                )
+            }
+        }
     )
 }
 

android/filament-utils-android/src/main/java/com/google/android/filament/utils/ModelViewer.kt

@@ -58,7 +58,10 @@ private const val kSensitivity = 100f
  *
  * See `sample-gltf-viewer` for a usage example.
  */
-class ModelViewer(val engine: Engine) : android.view.View.OnTouchListener {
+class ModelViewer(
+        val engine: Engine,
+        private val uiHelper: UiHelper
+) : android.view.View.OnTouchListener {
     var asset: FilamentAsset? = null
         private set
 
@@ -71,6 +74,7 @@ class ModelViewer(val engine: Engine) : android.view.View.OnTouchListener {
 
     var normalizeSkinningWeights = true
     var recomputeBoundingBoxes = false
+    var ignoreBindTransform = false
 
     var cameraFocalLength = 28f
         set(value) {
@@ -84,7 +88,6 @@ class ModelViewer(val engine: Engine) : android.view.View.OnTouchListener {
     val renderer: Renderer
     @Entity val light: Int
 
-    private val uiHelper: UiHelper = UiHelper(UiHelper.ContextErrorPolicy.DONT_CHECK)
     private lateinit var displayHelper: DisplayHelper
     private lateinit var cameraManipulator: Manipulator
     private lateinit var gestureDetector: GestureDetector
@@ -111,7 +114,7 @@ class ModelViewer(val engine: Engine) : android.view.View.OnTouchListener {
         view.camera = camera
 
         assetLoader = AssetLoader(engine, UbershaderLoader(engine), EntityManager.get())
-        resourceLoader = ResourceLoader(engine, normalizeSkinningWeights, recomputeBoundingBoxes)
+        resourceLoader = ResourceLoader(engine, normalizeSkinningWeights, recomputeBoundingBoxes, ignoreBindTransform)
 
         // Always add a direct light source since it is required for shadowing.
         // We highly recommend adding an indirect light as well.
@@ -129,7 +132,12 @@ class ModelViewer(val engine: Engine) : android.view.View.OnTouchListener {
         scene.addEntity(light)
     }
 
-    constructor(surfaceView: SurfaceView, engine: Engine = Engine.create(), manipulator: Manipulator? = null) : this(engine) {
+    constructor(
+            surfaceView: SurfaceView,
+            engine: Engine = Engine.create(),
+            uiHelper: UiHelper = UiHelper(UiHelper.ContextErrorPolicy.DONT_CHECK),
+            manipulator: Manipulator? = null
+    ) : this(engine, uiHelper) {
         cameraManipulator = manipulator ?: Manipulator.Builder()
                 .targetPosition(kDefaultObjectPosition.x, kDefaultObjectPosition.y, kDefaultObjectPosition.z)
                 .viewport(surfaceView.width, surfaceView.height)
@@ -144,7 +152,12 @@ class ModelViewer(val engine: Engine) : android.view.View.OnTouchListener {
     }
 
     @Suppress("unused")
-    constructor(textureView: TextureView, engine: Engine = Engine.create(), manipulator: Manipulator? = null) : this(engine) {
+    constructor(
+            textureView: TextureView,
+            engine: Engine = Engine.create(),
+            uiHelper: UiHelper = UiHelper(UiHelper.ContextErrorPolicy.DONT_CHECK),
+            manipulator: Manipulator? = null
+    ) : this(engine, uiHelper) {
         cameraManipulator = manipulator ?: Manipulator.Builder()
                 .targetPosition(kDefaultObjectPosition.x, kDefaultObjectPosition.y, kDefaultObjectPosition.z)
                 .viewport(textureView.width, textureView.height)
@@ -215,8 +228,8 @@ class ModelViewer(val engine: Engine) : android.view.View.OnTouchListener {
     fun transformToUnitCube(centerPoint: Float3 = kDefaultObjectPosition) {
         asset?.let { asset ->
             val tm = engine.transformManager
-            var center = asset.boundingBox.center.let { v-> Float3(v[0], v[1], v[2]) }
-            val halfExtent = asset.boundingBox.halfExtent.let { v-> Float3(v[0], v[1], v[2]) }
+            var center = asset.boundingBox.center.let { v -> Float3(v[0], v[1], v[2]) }
+            val halfExtent = asset.boundingBox.halfExtent.let { v -> Float3(v[0], v[1], v[2]) }
             val maxExtent = 2.0f * max(halfExtent)
             val scaleFactor = 2.0f / maxExtent
             center -= centerPoint / scaleFactor
@@ -284,9 +297,9 @@ class ModelViewer(val engine: Engine) : android.view.View.OnTouchListener {
     private fun populateScene(asset: FilamentAsset) {
         val rcm = engine.renderableManager
         var count = 0
-        val popRenderables = {count = asset.popRenderables(readyRenderables); count != 0}
+        val popRenderables = { count = asset.popRenderables(readyRenderables); count != 0 }
         while (popRenderables()) {
-            for (i in 0..count-1) {
+            for (i in 0..count - 1) {
                 val ri = rcm.getInstance(readyRenderables[i])
                 rcm.setScreenSpaceContactShadows(ri, true)
             }
@@ -383,4 +396,4 @@ class ModelViewer(val engine: Engine) : android.view.View.OnTouchListener {
     companion object {
         private val kDefaultObjectPosition = Float3(0.0f, 0.0f, -4.0f)
     }
-}
+}

android/filament-utils-android/src/main/java/com/google/android/filament/utils/Quaternion.kt

@@ -0,0 +1,342 @@
+/*
+ * Copyright (C) 2022 Romain Guy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("unused")
+
+package com.google.android.filament.utils
+
+import kotlin.math.*
+
+enum class QuaternionComponent {
+    X, Y, Z, W
+}
+
+/**
+ * Construct Quaternion and set each value.
+ * The Quaternion will be normalized during construction
+ * Default: Identity
+ */
+data class Quaternion(
+        var x: Float = 0.0f,
+        var y: Float = 0.0f,
+        var z: Float = 0.0f,
+        var w: Float = 0.0f) {
+
+    constructor(v: Float3, w: Float = 0.0f) : this(v.x, v.y, v.z, w)
+    constructor(v: Float4) : this(v.x, v.y, v.z, v.w)
+    constructor(q: Quaternion) : this(q.x, q.y, q.z, q.w)
+
+    companion object {
+        /**
+         * Construct a Quaternion from an axis and angle in degrees
+         *
+         * @param axis Rotation direction
+         * @param angle Angle size in degrees
+         */
+        fun fromAxisAngle(axis: Float3, angle: Float): Quaternion {
+            val r = radians(angle)
+            return Quaternion(sin(r * 0.5f) * normalize(axis), cos(r * 0.5f))
+        }
+
+        /**
+         * Construct a Quaternion from Euler angles using YPR around ZYX respectively
+         *
+         * The Euler angles are applied in ZYX order.
+         * i.e: a vector is first rotated about X (roll) then Y (pitch) and then Z (yaw).
+         *
+         * @param d Per axis Euler angles in degrees
+         */
+        fun fromEuler(d: Float3): Quaternion {
+            val r = transform(d, ::radians)
+            return fromEulerZYX(r.z, r.y, r.x)
+        }
+
+        /**
+         * Construct a Quaternion from Euler angles using YPR around ZYX respectively
+         *
+         * The Euler angles are applied in ZYX order.
+         * i.e: a vector is first rotated about X (roll) then Y (pitch) and then Z (yaw).
+         *
+         * @param roll about X axis in radians
+         * @param pitch about Y axis in radians
+         * @param yaw about Z axis in radians
+         */
+        fun fromEulerZYX(yaw: Float = 0.0f, pitch: Float = 0.0f, roll: Float = 0.0f): Quaternion {
+            val cy = cos(yaw * 0.5f)
+            val sy = sin(yaw * 0.5f)
+            val cp = cos(pitch * 0.5f)
+            val sp = sin(pitch * 0.5f)
+            val cr = cos(roll * 0.5f)
+            val sr = sin(roll * 0.5f)
+
+            return Quaternion(
+                    sr * cp * cy - cr * sp * sy,
+                    cr * sp * cy + sr * cp * sy,
+                    cr * cp * sy - sr * sp * cy,
+                    cr * cp * cy + sr * sp * sy
+            )
+        }
+    }
+
+    inline var xyz: Float3
+        get() = Float3(x, y, z)
+        set(value) {
+            x = value.x
+            y = value.y
+            z = value.z
+        }
+
+    inline var imaginary: Float3
+        get() = xyz
+        set(value) {
+            x = value.x
+            y = value.y
+            z = value.z
+        }
+
+    inline var real: Float
+        get() = w
+        set(value) {
+            w = value
+        }
+
+    inline var xyzw: Float4
+        get() = Float4(x, y, z, w)
+        set(value) {
+            x = value.x
+            y = value.y
+            z = value.z
+            w = value.w
+        }
+
+    operator fun get(index: QuaternionComponent) = when (index) {
+        QuaternionComponent.X -> x
+        QuaternionComponent.Y -> y
+        QuaternionComponent.Z -> z
+        QuaternionComponent.W -> w
+    }
+
+    operator fun get(
+            index1: QuaternionComponent,
+            index2: QuaternionComponent,
+            index3: QuaternionComponent): Float3 {
+        return Float3(get(index1), get(index2), get(index3))
+    }
+
+    operator fun get(
+            index1: QuaternionComponent,
+            index2: QuaternionComponent,
+            index3: QuaternionComponent,
+            index4: QuaternionComponent): Quaternion {
+        return Quaternion(get(index1), get(index2), get(index3), get(index4))
+    }
+
+    operator fun get(index: Int) = when (index) {
+        0 -> x
+        1 -> y
+        2 -> z
+        3 -> w
+        else -> throw IllegalArgumentException("index must be in 0..3")
+    }
+
+    operator fun get(index1: Int, index2: Int, index3: Int): Float3 {
+        return Float3(get(index1), get(index2), get(index3))
+    }
+
+    operator fun get(index1: Int, index2: Int, index3: Int, index4: Int): Quaternion {
+        return Quaternion(get(index1), get(index2), get(index3), get(index4))
+    }
+
+    inline operator fun invoke(index: Int) = get(index - 1)
+
+    operator fun set(index: Int, v: Float) = when (index) {
+        0 -> x = v
+        1 -> y = v
+        2 -> z = v
+        3 -> w = v
+        else -> throw IllegalArgumentException("index must be in 0..3")
+    }
+
+    operator fun set(index1: Int, index2: Int, v: Float) {
+        set(index1, v)
+        set(index2, v)
+    }
+
+    operator fun set(index1: Int, index2: Int, index3: Int, v: Float) {
+        set(index1, v)
+        set(index2, v)
+        set(index3, v)
+    }
+
+    operator fun set(index1: Int, index2: Int, index3: Int, index4: Int, v: Float) {
+        set(index1, v)
+        set(index2, v)
+        set(index3, v)
+        set(index4, v)
+    }
+
+    operator fun set(index: QuaternionComponent, v: Float) = when (index) {
+        QuaternionComponent.X -> x = v
+        QuaternionComponent.Y -> y = v
+        QuaternionComponent.Z -> z = v
+        QuaternionComponent.W -> w = v
+    }
+
+    operator fun set(index1: QuaternionComponent, index2: QuaternionComponent, v: Float) {
+        set(index1, v)
+        set(index2, v)
+    }
+
+    operator fun set(
+            index1: QuaternionComponent, index2: QuaternionComponent, index3: QuaternionComponent, v: Float) {
+        set(index1, v)
+        set(index2, v)
+        set(index3, v)
+    }
+
+    operator fun set(
+            index1: QuaternionComponent, index2: QuaternionComponent,
+            index3: QuaternionComponent, index4: QuaternionComponent, v: Float) {
+        set(index1, v)
+        set(index2, v)
+        set(index3, v)
+        set(index4, v)
+    }
+
+    operator fun unaryMinus() = Quaternion(-x, -y, -z, -w)
+
+    inline operator fun plus(v: Float) = Quaternion(x + v, y + v, z + v, w + v)
+    inline operator fun minus(v: Float) = Quaternion(x - v, y - v, z - v, w - v)
+    inline operator fun times(v: Float) = Quaternion(x * v, y * v, z * v, w * v)
+    inline operator fun div(v: Float) = Quaternion(x / v, y / v, z / v, w / v)
+
+    inline operator fun times(v: Float3) = (this * Quaternion(v, 0.0f) * inverse(this)).xyz
+
+    inline operator fun plus(q: Quaternion) = Quaternion(x + q.x, y + q.y, z + q.z, w + q.w)
+    inline operator fun minus(q: Quaternion) = Quaternion(x - q.x, y - q.y, z - q.z, w - q.w)
+    inline operator fun times(q: Quaternion) = Quaternion(
+            w * q.x + x * q.w + y * q.z - z * q.y,
+            w * q.y - x * q.z + y * q.w + z * q.x,
+            w * q.z + x * q.y - y * q.x + z * q.w,
+            w * q.w - x * q.x - y * q.y - z * q.z)
+
+    inline fun transform(block: (Float) -> Float): Quaternion {
+        x = block(x)
+        y = block(y)
+        z = block(z)
+        w = block(w)
+        return this
+    }
+
+    fun toEulerAngles() = eulerAngles(this)
+
+    fun toMatrix() = rotation(this)
+
+    fun toFloatArray() = floatArrayOf(x, y, z, w)
+}
+
+inline operator fun Float.plus(q: Quaternion) = Quaternion(this + q.x, this + q.y, this + q.z, this + q.w)
+inline operator fun Float.minus(q: Quaternion) = Quaternion(this - q.x, this - q.y, this - q.z, this - q.w)
+inline operator fun Float.times(q: Quaternion) = Quaternion(this * q.x, this * q.y, this * q.z, this * q.w)
+inline operator fun Float.div(q: Quaternion) = Quaternion(this / q.x, this / q.y, this / q.z, this / q.w)
+
+inline fun abs(q: Quaternion) = Quaternion(abs(q.x), abs(q.y), abs(q.z), abs(q.w))
+inline fun length(q: Quaternion) = sqrt(q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w)
+inline fun length2(q: Quaternion) = q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w
+inline fun dot(a: Quaternion, b: Quaternion) = a.x * b.x + a.y * b.y + a.z * b.z + a.w * b.w
+
+/**
+ * Rescale the Quaternion to the unit length
+ */
+fun normalize(q: Quaternion): Quaternion {
+    val l = 1.0f / length(q)
+    return Quaternion(q.x * l, q.y * l, q.z * l, q.w * l)
+}
+
+fun conjugate(q: Quaternion): Quaternion = Quaternion(q.w, -q.x, -q.y, -q.z)
+
+fun inverse(q: Quaternion): Quaternion {
+    val d = 1.0f / dot(q, q)
+    return Quaternion(q.w * d, -q.x * d, -q.y * d, -q.w * d)
+}
+
+fun cross(a: Quaternion, b: Quaternion): Quaternion {
+    val m = a * b
+    return Quaternion(m.x, m.y, m.z, 0.0f)
+}
+
+/**
+ * Spherical linear interpolation between two given orientations
+ *
+ * If t is 0 this returns a.
+ * As t approaches 1 slerp may approach either b or -b (whichever is closest to a)
+ * If t is above 1 or below 0 the result will be extrapolated.
+ * @param a The beginning value
+ * @param b The ending value
+ * @param t The ratio between the two floats
+ * @param valueEps Prevent blowing up when slerping between two quaternions that are very near each
+ * other. Linear interpolation (lerp) is returned in this case.
+ *
+ * @return Interpolated value between the two floats
+ */
+fun slerp(a: Quaternion, b: Quaternion, t: Float, valueEps: Float = 0.0000000001f): Quaternion {
+    // could also be computed as: pow(q * inverse(p), t) * p;
+    val d = dot(a, b)
+    val absd = abs(d)
+    // Prevent blowing up when slerping between two quaternions that are very near each other.
+    if ((1.0f - absd) < valueEps) {
+        return normalize(lerp(if (d < 0.0f) -a else a, b, t))
+    }
+    val npq = sqrt(dot(a, a) * dot(b, b))  // ||p|| * ||q||
+    val acos = acos(clamp(absd / npq, -1.0f, 1.0f))
+    val acos0 = acos * (1.0f - t)
+    val acos1 = acos * t
+    val sina = sin(acos)
+    if (sina < valueEps) {
+        return normalize(lerp(a, b, t))
+    }
+    val isina = 1.0f / sina
+    val s0 = sin(acos0) * isina
+    val s1 = sin(acos1) * isina
+    // ensure we're taking the "short" side
+    return normalize(s0 * a + (if (d < 0.0f) -s1 else (s1)) * b)
+}
+
+fun lerp(a: Quaternion, b: Quaternion, t: Float): Quaternion {
+    return ((1 - t) * a) + (t * b)
+}
+
+fun nlerp(a: Quaternion, b: Quaternion, t: Float): Quaternion {
+    return normalize(lerp(a, b, t))
+}
+
+/**
+ * Convert a Quaternion to Euler angles using YPR around ZYX respectively
+ *
+ * The Euler angles are applied in ZYX order
+ */
+fun eulerAngles(q: Quaternion): Float3 {
+    val nq = normalize(q)
+    return Float3(
+            // roll (x-axis rotation)
+            degrees(atan2(2.0f * (nq.y * nq.z + nq.w * nq.x),
+                    nq.w * nq.w - nq.x * nq.x - nq.y * nq.y + nq.z * nq.z)),
+            // pitch (y-axis rotation)
+            degrees(asin(-2.0f * (nq.x * nq.z - nq.w * nq.y))),
+            // yaw (z-axis rotation)
+            degrees(atan2(2.0f * (nq.x * nq.y + nq.w * nq.z),
+                    nq.w * nq.w + nq.x * nq.x - nq.y * nq.y - nq.z * nq.z)))
+}

android/filament-utils-android/src/main/java/com/google/android/filament/utils/Scalar.kt

@@ -18,6 +18,8 @@
 
 package com.google.android.filament.utils
 
+import kotlin.math.pow
+
 const val FPI         = 3.1415926536f
 const val HALF_PI     = FPI * 0.5f
 const val TWO_PI      = FPI * 2.0f
@@ -40,4 +42,4 @@ inline fun fract(v: Float) = v % 1
 
 inline fun sqr(v: Float) = v * v
 
-inline fun pow(x: Float, y: Float) = StrictMath.pow(x.toDouble(), y.toDouble()).toFloat()
+inline fun pow(x: Float, y: Float) = (x.toDouble().pow(y.toDouble())).toFloat()

android/filament-utils-android/src/main/java/com/google/android/filament/utils/Vector.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@file:Suppress("NOTHING_TO_INLINE")
+@file:Suppress("NOTHING_TO_INLINE", "unused")
 
 package com.google.android.filament.utils
 
@@ -117,17 +117,8 @@ data class Float2(var x: Float = 0.0f, var y: Float = 0.0f) {
     }
 
     operator fun unaryMinus() = Float2(-x, -y)
-    operator fun inc(): Float2 {
-        x += 1.0f
-        y += 1.0f
-        return this
-    }
-
-    operator fun dec(): Float2 {
-        x -= 1.0f
-        y -= 1.0f
-        return this
-    }
+    operator fun inc() = Float2(x++, y++)
+    operator fun dec() = Float2(x--, y--)
 
     inline operator fun plus(v: Float) = Float2(x + v, y + v)
     inline operator fun minus(v: Float) = Float2(x - v, y - v)
@@ -144,6 +135,8 @@ data class Float2(var x: Float = 0.0f, var y: Float = 0.0f) {
         y = block(y)
         return this
     }
+
+    fun toFloatArray() = floatArrayOf(x, y)
 }
 
 data class Float3(var x: Float = 0.0f, var y: Float = 0.0f, var z: Float = 0.0f) {
@@ -284,29 +277,15 @@ data class Float3(var x: Float = 0.0f, var y: Float = 0.0f, var z: Float = 0.0f)
     }
 
     operator fun set(
-            index1: VectorComponent,
-            index2: VectorComponent,
-            index3: VectorComponent,
-            v: Float) {
+            index1: VectorComponent, index2: VectorComponent, index3: VectorComponent, v: Float) {
         set(index1, v)
         set(index2, v)
         set(index3, v)
     }
 
     operator fun unaryMinus() = Float3(-x, -y, -z)
-    operator fun inc(): Float3 {
-        x += 1.0f
-        y += 1.0f
-        z += 1.0f
-        return this
-    }
-
-    operator fun dec(): Float3 {
-        x -= 1.0f
-        y -= 1.0f
-        z -= 1.0f
-        return this
-    }
+    operator fun inc() = Float3(x++, y++, z++)
+    operator fun dec() = Float3(x--, y--, z--)
 
     inline operator fun plus(v: Float) = Float3(x + v, y + v, z + v)
     inline operator fun minus(v: Float) = Float3(x - v, y - v, z - v)
@@ -329,6 +308,8 @@ data class Float3(var x: Float = 0.0f, var y: Float = 0.0f, var z: Float = 0.0f)
         z = block(z)
         return this
     }
+
+    fun toFloatArray() = floatArrayOf(x, y, z)
 }
 
 data class Float4(
@@ -529,14 +510,15 @@ data class Float4(
         set(index2, v)
     }
 
-    operator fun set(index1: VectorComponent, index2: VectorComponent, index3: VectorComponent,
-            v: Float) {
+    operator fun set(
+            index1: VectorComponent, index2: VectorComponent, index3: VectorComponent, v: Float) {
         set(index1, v)
         set(index2, v)
         set(index3, v)
     }
 
-    operator fun set(index1: VectorComponent, index2: VectorComponent,
+    operator fun set(
+            index1: VectorComponent, index2: VectorComponent,
             index3: VectorComponent, index4: VectorComponent, v: Float) {
         set(index1, v)
         set(index2, v)
@@ -545,21 +527,8 @@ data class Float4(
     }
 
     operator fun unaryMinus() = Float4(-x, -y, -z, -w)
-    operator fun inc(): Float4 {
-        x += 1.0f
-        y += 1.0f
-        z += 1.0f
-        w += 1.0f
-        return this
-    }
-
-    operator fun dec(): Float4 {
-        x -= 1.0f
-        y -= 1.0f
-        z -= 1.0f
-        w -= 1.0f
-        return this
-    }
+    operator fun inc() = Float4(x++, y++, z++, w++)
+    operator fun dec() = Float4(x--, y--, z--, w--)
 
     inline operator fun plus(v: Float) = Float4(x + v, y + v, z + v, w + v)
     inline operator fun minus(v: Float) = Float4(x - v, y - v, z - v, w - v)
@@ -588,6 +557,8 @@ data class Float4(
         w = block(w)
         return this
     }
+
+    fun toFloatArray() = floatArrayOf(x, y, z, w)
 }
 
 inline operator fun Float.plus(v: Float2) = Float2(this + v.x, this + v.y)
@@ -615,25 +586,29 @@ fun refract(i: Float2, n: Float2, eta: Float): Float2 {
 inline fun clamp(v: Float2, min: Float, max: Float): Float2 {
     return Float2(
             clamp(v.x, min, max),
-            clamp(v.y, min, max))
+            clamp(v.y, min, max)
+    )
 }
 
 inline fun clamp(v: Float2, min: Float2, max: Float2): Float2 {
     return Float2(
             clamp(v.x, min.x, max.x),
-            clamp(v.y, min.y, max.y))
+            clamp(v.y, min.y, max.y)
+    )
 }
 
 inline fun mix(a: Float2, b: Float2, x: Float): Float2 {
     return Float2(
             mix(a.x, b.x, x),
-            mix(a.y, b.y, x))
+            mix(a.y, b.y, x)
+    )
 }
 
 inline fun mix(a: Float2, b: Float2, x: Float2): Float2 {
     return Float2(
             mix(a.x, b.x, x.x),
-            mix(a.y, b.y, x.y))
+            mix(a.y, b.y, x.y)
+    )
 }
 
 inline fun min(v: Float2) = min(v.x, v.y)
@@ -704,28 +679,32 @@ inline fun clamp(v: Float3, min: Float, max: Float): Float3 {
     return Float3(
             clamp(v.x, min, max),
             clamp(v.y, min, max),
-            clamp(v.z, min, max))
+            clamp(v.z, min, max)
+    )
 }
 
 inline fun clamp(v: Float3, min: Float3, max: Float3): Float3 {
     return Float3(
             clamp(v.x, min.x, max.x),
             clamp(v.y, min.y, max.y),
-            clamp(v.z, min.z, max.z))
+            clamp(v.z, min.z, max.z)
+    )
 }
 
 inline fun mix(a: Float3, b: Float3, x: Float): Float3 {
     return Float3(
             mix(a.x, b.x, x),
             mix(a.y, b.y, x),
-            mix(a.z, b.z, x))
+            mix(a.z, b.z, x)
+    )
 }
 
 inline fun mix(a: Float3, b: Float3, x: Float3): Float3 {
     return Float3(
             mix(a.x, b.x, x.x),
             mix(a.y, b.y, x.y),
-            mix(a.z, b.z, x.z))
+            mix(a.z, b.z, x.z)
+    )
 }
 
 inline fun min(v: Float3) = min(v.x, min(v.y, v.z))
@@ -784,7 +763,8 @@ inline fun clamp(v: Float4, min: Float, max: Float): Float4 {
             clamp(v.x, min, max),
             clamp(v.y, min, max),
             clamp(v.z, min, max),
-            clamp(v.w, min, max))
+            clamp(v.w, min, max)
+    )
 }
 
 inline fun clamp(v: Float4, min: Float4, max: Float4): Float4 {
@@ -792,7 +772,8 @@ inline fun clamp(v: Float4, min: Float4, max: Float4): Float4 {
             clamp(v.x, min.x, max.x),
             clamp(v.y, min.y, max.y),
             clamp(v.z, min.z, max.z),
-            clamp(v.w, min.z, max.w))
+            clamp(v.w, min.z, max.w)
+    )
 }
 
 inline fun mix(a: Float4, b: Float4, x: Float): Float4 {
@@ -800,7 +781,8 @@ inline fun mix(a: Float4, b: Float4, x: Float): Float4 {
             mix(a.x, b.x, x),
             mix(a.y, b.y, x),
             mix(a.z, b.z, x),
-            mix(a.w, b.w, x))
+            mix(a.w, b.w, x)
+    )
 }
 
 inline fun mix(a: Float4, b: Float4, x: Float4): Float4 {
@@ -1075,10 +1057,7 @@ data class Bool3(var x: Boolean = false, var y: Boolean = false, var z: Boolean
     }
 
     operator fun set(
-            index1: VectorComponent,
-            index2: VectorComponent,
-            index3: VectorComponent,
-            v: Boolean) {
+            index1: VectorComponent, index2: VectorComponent, index3: VectorComponent, v: Boolean) {
         set(index1, v)
         set(index2, v)
         set(index3, v)
@@ -1282,14 +1261,15 @@ data class Bool4(
         set(index2, v)
     }
 
-    operator fun set(index1: VectorComponent, index2: VectorComponent, index3: VectorComponent,
-            v: Boolean) {
+    operator fun set(
+            index1: VectorComponent, index2: VectorComponent, index3: VectorComponent, v: Boolean) {
         set(index1, v)
         set(index2, v)
         set(index3, v)
     }
 
-    operator fun set(index1: VectorComponent, index2: VectorComponent,
+    operator fun set(
+            index1: VectorComponent, index2: VectorComponent,
             index3: VectorComponent, index4: VectorComponent, v: Boolean) {
         set(index1, v)
         set(index2, v)

android/gltfio-android/CMakeLists.txt

@@ -76,6 +76,8 @@ set(GLTFIO_INCLUDE_DIRS
         ..
         ${FILAMENT_DIR}/include
         ${FILAMENT_DIR}/include/gltfio/resources
+        ../../filament/backend/include
+        ../../libs/gltfio/include
         ../../third_party/cgltf
         ../../third_party/robin-map
         ../../third_party/hat-trie

android/gltfio-android/build.gradle

@@ -27,7 +27,8 @@ android {
 
 dependencies {
     implementation deps.androidx.annotations
-    implementation project(':filament-android')
+
+    api project(':filament-android')
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

android/gltfio-android/src/main/cpp/AssetLoader.cpp

@@ -69,7 +69,7 @@ public:
         jclass providerClass = env->GetObjectClass(provider);
 
         mCreateMaterialInstance = env->GetMethodID(providerClass, "createMaterialInstance",
-                "(L" JAVA_MATERIAL_KEY ";[ILjava/lang/String;)Lcom/google/android/filament/MaterialInstance;");
+                "(L" JAVA_MATERIAL_KEY ";[ILjava/lang/String;Ljava/lang/String;)Lcom/google/android/filament/MaterialInstance;");
         assert_invariant(mCreateMaterialInstance);
 
         mGetMaterials = env->GetMethodID(providerClass, "getMaterials",
@@ -89,7 +89,7 @@ public:
         delete mPreviousMaterials;
     }
 
-    MaterialInstance* createMaterialInstance(MaterialKey* config, UvMap* uvmap, const char* label) override {
+    MaterialInstance* createMaterialInstance(MaterialKey* config, UvMap* uvmap, const char* label, const char* extras) override {
         // Create a Java object for the material key and copy the native fields into it.
         jobject javaKey = mEnv->NewObject(mMaterialKeyClass, mMaterialKeyConstructor);
 
@@ -99,12 +99,15 @@ public:
         // Convert the optional label into a Java string.
         jstring stringLabel = label ? mEnv->NewStringUTF(label) : nullptr;
 
+        // Convert the optional extras into a Java string.
+        jstring stringExtras = extras ? mEnv->NewStringUTF(extras) : nullptr;
+
         // Allocate space for the output argument.
         jintArray uvMapArray = mEnv->NewIntArray(8);
 
         // Call the Java-based material provider.
         jobject materialInstance = mEnv->CallObjectMethod(mJavaProvider, mCreateMaterialInstance,
-                javaKey, uvMapArray, stringLabel);
+                javaKey, uvMapArray, stringLabel, stringExtras);
 
         // Copy the UvMap results from the JVM array into the native array.
         if (uvmap) {
@@ -125,6 +128,10 @@ public:
             mEnv->DeleteLocalRef(stringLabel);
         }
 
+        if (stringExtras) {
+            mEnv->DeleteLocalRef(stringExtras);
+        }
+
         if (materialInstance == nullptr) {
             return nullptr;
         }
@@ -239,6 +246,14 @@ Java_com_google_android_filament_gltfio_AssetLoader_nCreateInstancedAsset(JNIEnv
     return asset;
 }
 
+extern "C" JNIEXPORT jlong JNICALL
+Java_com_google_android_filament_gltfio_AssetLoader_nCreateInstance(JNIEnv* env, jclass,
+        jlong nativeLoader, jlong nativeAsset) {
+    AssetLoader* loader = (AssetLoader*) nativeLoader;
+    FilamentAsset* primary = (FilamentAsset*) nativeAsset;
+    return (jlong) loader->createInstance(primary);
+}
+
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_gltfio_AssetLoader_nEnableDiagnostics(JNIEnv*, jclass,
         jlong nativeLoader, jboolean enable) {

android/gltfio-android/src/main/cpp/ResourceLoader.cpp

@@ -35,10 +35,11 @@ static void destroy(void*, size_t, void *userData) {
 
 extern "C" JNIEXPORT jlong JNICALL
 Java_com_google_android_filament_gltfio_ResourceLoader_nCreateResourceLoader(JNIEnv*, jclass,
-        jlong nativeEngine, jboolean normalizeSkinningWeights, jboolean recomputeBoundingBoxes) {
+        jlong nativeEngine, jboolean normalizeSkinningWeights, jboolean recomputeBoundingBoxes,
+        jboolean ignoreBindTransform) {
     Engine* engine = (Engine*) nativeEngine;
     return (jlong) new ResourceLoader({ engine, {}, (bool) normalizeSkinningWeights,
-            (bool) recomputeBoundingBoxes });
+            (bool) recomputeBoundingBoxes, (bool) ignoreBindTransform});
 }
 
 extern "C" JNIEXPORT void JNICALL

android/gltfio-android/src/main/java/com/google/android/filament/gltfio/FilamentAsset.java

@@ -16,6 +16,7 @@
 
 package com.google.android.filament.gltfio;
 
+import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 

android/gltfio-android/src/main/java/com/google/android/filament/gltfio/MaterialProvider.java

@@ -99,9 +99,10 @@ public interface MaterialProvider {
      * @param uvmap Output argument that gets populated with a small table that maps from a glTF uv
      *              index to a Filament uv index (0 = UNUSED, 1 = UV0, 2 = UV1).
      * @param label Optional tag that is not a part of the cache key.
+     * @param extras Optional extras as stringified JSON (not a part of the cache key).
      */
     public @Nullable MaterialInstance createMaterialInstance(MaterialKey config,
-            @NonNull @Size(min = 8) int[] uvmap, @Nullable String label);
+            @NonNull @Size(min = 8) int[] uvmap, @Nullable String label, @Nullable String extras);
 
     /**
      * Creates and returns an array containing all cached materials.

android/gltfio-android/src/main/java/com/google/android/filament/gltfio/ResourceLoader.java

@@ -45,7 +45,7 @@ public class ResourceLoader {
      */
     public ResourceLoader(@NonNull Engine engine) {
         long nativeEngine = engine.getNativeObject();
-        mNativeObject = nCreateResourceLoader(nativeEngine, false, false);
+        mNativeObject = nCreateResourceLoader(nativeEngine, false, false, false);
     }
 
     /**
@@ -54,14 +54,15 @@ public class ResourceLoader {
      * @param engine the engine that gets passed to all builder methods
      * @param normalizeSkinningWeights scale non-conformant skinning weights so they sum to 1
      * @param recomputeBoundingBoxes use computed bounding boxes rather than the ones in the asset
+     * @param ignoreBindTransform ignore skinned primitives bind transform when compute bounding boxes
      * @throws IllegalAccessException
      * @throws InvocationTargetException
      */
     public ResourceLoader(@NonNull Engine engine, boolean normalizeSkinningWeights,
-            boolean recomputeBoundingBoxes) {
+            boolean recomputeBoundingBoxes, boolean ignoreBindTransform) {
         long nativeEngine = engine.getNativeObject();
         mNativeObject = nCreateResourceLoader(nativeEngine, normalizeSkinningWeights,
-                recomputeBoundingBoxes);
+                recomputeBoundingBoxes, ignoreBindTransform);
     }
 
     /**
@@ -166,7 +167,7 @@ public class ResourceLoader {
     }
 
     private static native long nCreateResourceLoader(long nativeEngine,
-            boolean normalizeSkinningWeights, boolean recomputeBoundingBoxes);
+            boolean normalizeSkinningWeights, boolean recomputeBoundingBoxes, boolean ignoreBindTransform);
     private static native void nDestroyResourceLoader(long nativeLoader);
     private static native void nAddResourceData(long nativeLoader, String url, Buffer buffer,
             int remaining);

android/gltfio-android/src/main/java/com/google/android/filament/gltfio/UbershaderLoader.java

@@ -32,6 +32,9 @@ import androidx.annotation.Size;
  * Client applications do not need to call methods on it.</p>
  */
 public class UbershaderLoader implements MaterialProvider {
+    private static final VertexBuffer.VertexAttribute[] sVertexAttributesValues =
+            VertexBuffer.VertexAttribute.values();
+
     private long mNativeObject;
 
     /**
@@ -53,7 +56,7 @@ public class UbershaderLoader implements MaterialProvider {
     }
 
     public @Nullable MaterialInstance createMaterialInstance(MaterialKey config,
-            @NonNull @Size(min = 8) int[] uvmap, @Nullable String label) {
+            @NonNull @Size(min = 8) int[] uvmap, @Nullable String label, @Nullable String extras) {
         long nativeMaterialInstance = nCreateMaterialInstance(mNativeObject, config, uvmap, label);
         return nativeMaterialInstance == 0 ? null : new MaterialInstance(null, nativeMaterialInstance);
     }
@@ -70,7 +73,7 @@ public class UbershaderLoader implements MaterialProvider {
     }
 
     public boolean needsDummyData(int attrib) {
-        VertexBuffer.VertexAttribute vattrib = VertexBuffer.VertexAttribute.values()[attrib];
+        VertexBuffer.VertexAttribute vattrib = sVertexAttributesValues[attrib];
         switch (vattrib) {
             case UV0:
             case UV1:
@@ -92,7 +95,8 @@ public class UbershaderLoader implements MaterialProvider {
     private static native long nCreateUbershaderLoader(long nativeEngine);
     private static native void nDestroyUbershaderLoader(long nativeProvider);
     private static native void nDestroyMaterials(long nativeProvider);
-    private static native long nCreateMaterialInstance(long nativeProvider, MaterialKey config, int[] uvmap, String label);
+    private static native long nCreateMaterialInstance(long nativeProvider,
+            MaterialKey config, int[] uvmap, String label);
     private static native int nGetMaterialCount(long nativeProvider);
     private static native void nGetMaterials(long nativeProvider, long[] result);
 }

android/gradle.properties

@@ -1,5 +1,5 @@
 GROUP=com.google.android.filament
-VERSION_NAME=1.12.4
+VERSION_NAME=1.19.0
 
 POM_DESCRIPTION=Real-time physically based rendering engine for Android.
 
@@ -18,3 +18,11 @@ POM_DEVELOPER_NAME=Filament Team
 org.gradle.jvmargs=-Xmx1536m
 
 android.useAndroidX=true
+
+org.gradle.unsafe.configuration-cache=true
+# TODO: Remove this when we switch to Gradle 7.4
+org.gradle.unsafe.configuration-cache.max-problems=3
+
+com.google.android.filament.tools-dir=../../../out/release/filament
+com.google.android.filament.dist-dir=../out/android-release/filament
+com.google.android.filament.abis=all

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,3 +1,4 @@
+#Wed Nov 17 10:40:18 PST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

android/samples/sample-gltf-viewer/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: FilamentToolsPlugin
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'filament-tools-plugin'
+}
 
 project.ext.isSample = true
 
@@ -10,6 +12,7 @@ filamentTools {
     iblOutputDir = project.layout.projectDirectory.dir("src/main/assets/envs")
 }
 
+// don't forget to update MainACtivity.kt when/if changing this.
 task copyMesh(type: Copy) {
     from "../../../third_party/models/BusterDrone"
     into "src/main/assets/models"
@@ -29,12 +32,17 @@ android {
         targetSdkVersion versions.targetSdk
         missingDimensionStrategy 'functionality', 'full'
     }
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
 }
 
 dependencies {
     implementation deps.kotlin
+    implementation deps.coroutines.core
     implementation project(':filament-android')
     implementation project(':gltfio-android')
     implementation project(':filament-utils-android')
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
 }

android/samples/sample-gltf-viewer/src/main/AndroidManifest.xml

@@ -12,7 +12,9 @@
       android:supportsRtl="true"
       android:largeHeap="true"
       android:theme="@android:style/Theme.NoTitleBar">
-    <activity android:name="com.google.android.filament.gltf.MainActivity"
+    <activity
+        android:exported="true"
+        android:name="com.google.android.filament.gltf.MainActivity"
         android:screenOrientation="fullSensor"
         android:configChanges="orientation|screenSize|screenLayout|keyboardHidden">
       <intent-filter>

android/samples/sample-gltf-viewer/src/main/java/com/google/android/filament/gltf/MainActivity.kt

@@ -96,15 +96,36 @@ class MainActivity : Activity() {
         setStatusText("To load a new model, go to the above URL on your host machine.")
 
         val view = modelViewer.view
+
+        /*
+         * Note: The settings below are overriden when connecting to the remote UI.
+         */
+
+        // on mobile, better use lower quality color buffer
+        view.renderQuality = view.renderQuality.apply {
+            hdrColorBuffer = View.QualityLevel.MEDIUM
+        }
+
+        // dynamic resolution often helps a lot
         view.dynamicResolutionOptions = view.dynamicResolutionOptions.apply {
             enabled = true
             quality = View.QualityLevel.MEDIUM
         }
 
+        // MSAA is needed with dynamic resolution MEDIUM
+        view.multiSampleAntiAliasingOptions = view.multiSampleAntiAliasingOptions.apply {
+            enabled = true
+        }
+
+        // FXAA is pretty cheap and helps a lot
+        view.antiAliasing = View.AntiAliasing.FXAA;
+
+        // ambient occlusion is the cheapest effect that adds a lot of quality
         view.ambientOcclusionOptions = view.ambientOcclusionOptions.apply {
             enabled = true
         }
 
+        // bloom is pretty expensive but adds a fair amount of realism
         view.bloomOptions = view.bloomOptions.apply {
             enabled = true
         }
@@ -196,8 +217,17 @@ class MainActivity : Activity() {
 
                 val sky = Skybox.Builder().environment(skyboxTexture).build(engine)
 
+                specularFilter.destroy();
+                equirectToCubemap.destroy();
+                context.destroy();
+
+                // destroy the previous IBl
+                engine.destroyIndirectLight(modelViewer.scene.indirectLight!!);
+                engine.destroySkybox(modelViewer.scene.skybox!!);
+
                 modelViewer.scene.skybox = sky
                 modelViewer.scene.indirectLight = ibl
+                viewerContent.indirectLight = ibl
             }
         }
     }

android/samples/sample-hello-camera/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: FilamentToolsPlugin
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'filament-tools-plugin'
+}
 
 project.ext.isSample = true
 
@@ -17,10 +19,16 @@ android {
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.hellocamera"
-        minSdkVersion versions.minSdk
+        minSdkVersion 23
         targetSdkVersion versions.targetSdk
     }
 
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
+
     // We use the .filamat extension for materials compiled with matc
     // Telling aapt to not compress them allows to load them efficiently
     aaptOptions {

android/samples/sample-hello-camera/src/main/AndroidManifest.xml

@@ -31,7 +31,9 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
+    <activity
+        android:exported="true"
+        android:name=".MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 

android/samples/sample-hello-camera/src/main/java/com/google/android/filament/hellocam/CameraHelper.kt

@@ -33,7 +33,9 @@ import android.graphics.ImageFormat
 import android.hardware.HardwareBuffer
 import android.media.ImageReader
 import android.opengl.Matrix
-import android.view.Display
+import android.os.Build
+import android.os.Looper
+import androidx.annotation.RequiresApi
 
 import com.google.android.filament.*
 
@@ -44,7 +46,7 @@ import java.util.concurrent.TimeUnit
  * Toy class that handles all interaction with the Android camera2 API.
  * Sets the "textureTransform" and "videoTexture" parameters on the given Filament material.
  */
-class CameraHelper(val activity: Activity, private val filamentEngine: Engine, private val filamentMaterial: MaterialInstance, private val display: Display) {
+class CameraHelper(val activity: Activity, private val filamentEngine: Engine, private val filamentMaterial: MaterialInstance) {
     private lateinit var cameraId: String
     private lateinit var captureRequest: CaptureRequest
 
@@ -63,6 +65,20 @@ class CameraHelper(val activity: Activity, private val filamentEngine: Engine, p
             kImageReaderMaxImages,
             HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE)
 
+    @Suppress("deprecation")
+    private val display = if (Build.VERSION.SDK_INT >= 30) {
+        Api30Impl.getDisplay(activity)
+    } else {
+        activity.windowManager.defaultDisplay!!
+    }
+
+    @RequiresApi(30)
+    class Api30Impl {
+        companion object {
+            fun getDisplay(context: Context) = context.display!!
+        }
+    }
+
     private val cameraCallback = object : CameraDevice.StateCallback() {
         override fun onOpened(cameraDevice: CameraDevice) {
             cameraOpenCloseLock.release()
@@ -87,7 +103,9 @@ class CameraHelper(val activity: Activity, private val filamentEngine: Engine, p
         val stream = filamentStream
         if (stream != null) {
             imageReader.acquireLatestImage()?.also {
-                stream.setAcquiredImage(it.hardwareBuffer, Handler()) { it.close() }
+                stream.setAcquiredImage(it.hardwareBuffer, Handler(Looper.getMainLooper())) {
+                    it.close()
+                }
             }
         }
     }

android/samples/sample-hello-camera/src/main/java/com/google/android/filament/hellocam/MainActivity.kt

@@ -94,7 +94,7 @@ class MainActivity : Activity(), ActivityCompat.OnRequestPermissionsResultCallba
         setupView()
         setupScene()
 
-        cameraHelper = CameraHelper(this, engine, materialInstance, windowManager.defaultDisplay)
+        cameraHelper = CameraHelper(this, engine, materialInstance)
         cameraHelper.openCamera()
     }
 

android/samples/sample-hello-triangle/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: FilamentToolsPlugin
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'filament-tools-plugin'
+}
 
 project.ext.isSample = true
 
@@ -21,6 +23,12 @@ android {
         targetSdkVersion versions.targetSdk
     }
 
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
+
     // We use the .filamat extension for materials compiled with matc
     // Telling aapt to not compress them allows to load them efficiently
     aaptOptions {

android/samples/sample-hello-triangle/src/main/AndroidManifest.xml

@@ -9,7 +9,9 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
+    <activity
+        android:exported="true"
+        android:name=".MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 

android/samples/sample-image-based-lighting/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: FilamentToolsPlugin
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'filament-tools-plugin'
+}
 
 project.ext.isSample = true
 
@@ -27,6 +29,12 @@ android {
         targetSdkVersion versions.targetSdk
     }
 
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
+
     // We use the .filamat extension for materials compiled with matc
     // Telling aapt to not compress them allows to load them efficiently
     aaptOptions {

android/samples/sample-image-based-lighting/src/main/AndroidManifest.xml

@@ -11,7 +11,9 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
+    <activity
+        android:exported="true"
+        android:name=".MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 

android/samples/sample-lit-cube/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: FilamentToolsPlugin
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'filament-tools-plugin'
+}
 
 project.ext.isSample = true
 
@@ -20,6 +22,12 @@ android {
         targetSdkVersion versions.targetSdk
     }
 
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
+
     // We use the .filamat extension for materials compiled with matc
     // Telling aapt to not compress them allows to load them efficiently
     aaptOptions {

android/samples/sample-lit-cube/src/main/AndroidManifest.xml

@@ -9,7 +9,9 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
+    <activity
+        android:exported="true"
+        android:name=".MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 

android/samples/sample-live-wallpaper/build.gradle

@@ -10,9 +10,16 @@ android {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
     }
+
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
 }
 
 dependencies {
     implementation deps.kotlin
+    implementation deps.androidx.annotations
     implementation project(':filament-android')
 }

android/samples/sample-live-wallpaper/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
     <service
+        android:exported="true"
         android:name=".FilamentLiveWallpaper"
         android:label="@string/wallpaper_label"
         android:permission="android.permission.BIND_WALLPAPER">

android/samples/sample-live-wallpaper/src/main/java/com/google/android/filament/livewallpaper/Wallpaper.kt

@@ -18,19 +18,21 @@ package com.google.android.filament.livewallpaper
 
 import android.animation.ValueAnimator
 import android.app.Service
+import android.content.Context
 import android.graphics.Color
 import android.graphics.PixelFormat
+import android.os.Build
 import android.service.wallpaper.WallpaperService
 import android.view.Choreographer
 import android.view.Surface
 import android.view.SurfaceHolder
 import android.view.WindowManager
 import android.view.animation.LinearInterpolator
+import androidx.annotation.RequiresApi
 import com.google.android.filament.*
 import com.google.android.filament.android.DisplayHelper
 import com.google.android.filament.android.UiHelper
 
-
 class FilamentLiveWallpaper : WallpaperService() {
     // Make sure to initialize Filament first
     // This loads the JNI library needed by most API calls
@@ -196,9 +198,14 @@ class FilamentLiveWallpaper : WallpaperService() {
             override fun onNativeWindowChanged(surface: Surface) {
                 swapChain?.let { engine.destroySwapChain(it) }
                 swapChain = engine.createSwapChain(surface)
-                val display =
-                        (application.getSystemService(Service.WINDOW_SERVICE) as WindowManager)
-                        .defaultDisplay
+
+                @Suppress("deprecation")
+                val display = if (Build.VERSION.SDK_INT >= 30) {
+                    Api30Impl.getDisplay(displayContext!!)
+                } else {
+                    (getSystemService(Service.WINDOW_SERVICE) as WindowManager).defaultDisplay
+                }
+
                 displayHelper.attach(renderer, display)
             }
 
@@ -222,4 +229,11 @@ class FilamentLiveWallpaper : WallpaperService() {
             }
         }
     }
+
+    @RequiresApi(30)
+    class Api30Impl {
+        companion object {
+            fun getDisplay(context: Context) = context.display!!
+        }
+    }
 }

android/samples/sample-material-builder/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: FilamentToolsPlugin
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'filament-tools-plugin'
+}
 
 project.ext.isSample = true
 
@@ -31,6 +33,12 @@ android {
         missingDimensionStrategy 'functionality', 'full'
     }
 
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
+
     // We use the .filamat extension for materials compiled with matc
     // Telling aapt to not compress them allows to load them efficiently
     aaptOptions {

android/samples/sample-material-builder/src/main/AndroidManifest.xml

@@ -9,7 +9,9 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
+    <activity
+        android:exported="true"
+        android:name=".MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 

android/samples/sample-multi-view/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: FilamentToolsPlugin
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'filament-tools-plugin'
+}
 
 project.ext.isSample = true
 
@@ -20,6 +22,12 @@ android {
         targetSdkVersion versions.targetSdk
     }
 
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
+
     // We use the .filamat extension for materials compiled with matc
     // Telling aapt to not compress them allows to load them efficiently
     aaptOptions {

android/samples/sample-multi-view/src/main/AndroidManifest.xml

@@ -9,7 +9,9 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
+    <activity
+        android:exported="true"
+        android:name=".MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 

android/samples/sample-page-curl/build.gradle

@@ -1,5 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: FilamentToolsPlugin
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'filament-tools-plugin'
+}
 
 project.ext.isSample = true
 
@@ -22,6 +25,12 @@ android {
         targetSdkVersion versions.targetSdk
     }
 
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
+
     // We use the .filamat extension for materials compiled with matc
     // Telling aapt to not compress them allows to load them efficiently
     aaptOptions {
@@ -31,5 +40,5 @@ android {
 
 dependencies {
     implementation project(':filament-android')
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation deps.androidx.annotations
 }

android/samples/sample-page-curl/src/main/AndroidManifest.xml

@@ -9,7 +9,9 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
+    <activity
+        android:exported="true"
+        android:name=".MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 

android/samples/sample-page-curl/src/main/java/com/google/android/filament/pagecurl/MainActivity.java

@@ -70,11 +70,11 @@ public class MainActivity extends Activity
     private Page mPage;
     private PageMaterials mPageMaterials;
     private Scene mScene;
-    private Texture[] mTextures = new Texture[2];
+    private final Texture[] mTextures = new Texture[2];
     private @Entity int mLight;
     private IndirectLight mIndirectLight;
 
-    private float[] mTouchDownPoint = new float[2];
+    private final float[] mTouchDownPoint = new float[2];
     private float mTouchDownValue = 0;
     private float mPageAnimationRadians = 0;
     private float mPageAnimationValue = 0;

android/samples/sample-stream-test/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: FilamentToolsPlugin
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'filament-tools-plugin'
+}
 
 project.ext.isSample = true
 
@@ -17,10 +19,16 @@ android {
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.streamtest"
-        minSdkVersion versions.minSdk
+        minSdkVersion 23
         targetSdkVersion versions.targetSdk
     }
 
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
+
     // We use the .filamat extension for materials compiled with matc
     // Telling aapt to not compress them allows to load them efficiently
     aaptOptions {

android/samples/sample-stream-test/src/main/AndroidManifest.xml

@@ -26,7 +26,9 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
+    <activity
+        android:exported="true"
+        android:name=".MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 

android/samples/sample-stream-test/src/main/java/com/google/android/filament/streamtest/MainActivity.kt

@@ -18,6 +18,7 @@ package com.google.android.filament.streamtest
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.Context
 import android.os.Bundle
 import android.view.Choreographer
 import android.view.Surface
@@ -33,7 +34,9 @@ import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import java.nio.channels.Channels
 import android.opengl.*
+import android.os.Build
 import android.view.MotionEvent
+import androidx.annotation.RequiresApi
 import com.google.android.filament.android.DisplayHelper
 
 
@@ -78,6 +81,13 @@ class MainActivity : Activity(), ActivityCompat.OnRequestPermissionsResultCallba
 
     private var externalTextureID: Int = 0
 
+    @RequiresApi(30)
+    class Api30Impl {
+        companion object {
+            fun getDisplay(context: Context) = context.display!!
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -94,7 +104,15 @@ class MainActivity : Activity(), ActivityCompat.OnRequestPermissionsResultCallba
         setupScene()
 
         externalTextureID = createExternalTexture()
-        streamHelper = StreamHelper(engine, materialInstance, windowManager.defaultDisplay, externalTextureID)
+
+        @Suppress("deprecation")
+        val display = if (Build.VERSION.SDK_INT >= 30) {
+            Api30Impl.getDisplay(this)
+        } else {
+            windowManager.defaultDisplay!!
+        }
+
+        streamHelper = StreamHelper(engine, materialInstance, display, externalTextureID)
         this.title = streamHelper.getTestName()
     }
 

android/samples/sample-stream-test/src/main/java/com/google/android/filament/streamtest/StreamHelper.kt

@@ -24,6 +24,7 @@ import android.view.Surface
 import android.graphics.*
 import android.media.ImageReader
 import android.opengl.Matrix
+import android.os.Looper
 import android.view.Display
 
 import com.google.android.filament.*
@@ -32,7 +33,12 @@ import com.google.android.filament.*
 /**
  * Demonstrates Filament's various texture sharing mechanisms.
  */
-class StreamHelper(private val filamentEngine: Engine, private val filamentMaterial: MaterialInstance, private val display: Display, private val externalTextureId: Int) {
+class StreamHelper(
+    private val filamentEngine: Engine,
+    private val filamentMaterial: MaterialInstance,
+    private val display: Display,
+    private val externalTextureId: Int
+) {
     /**
      * The StreamSource configures the source data for the texture.
      *
@@ -50,7 +56,7 @@ class StreamHelper(private val filamentEngine: Engine, private val filamentMater
     }
 
     private var streamSource = StreamSource.CANVAS_STREAM_NATIVE
-    private val directImageHandler = Handler()
+    private val directImageHandler = Handler(Looper.getMainLooper())
     private var resolution = Size(640, 480)
     private var surfaceTexture: SurfaceTexture? = null
     private var imageReader: ImageReader? = null
@@ -93,11 +99,30 @@ class StreamHelper(private val filamentEngine: Engine, private val filamentMater
             val canvas = surface.lockCanvas(null)
 
             val movingPaint = Paint()
-            movingPaint.shader = LinearGradient(kGradientOffset, 0.0f, kGradientOffset + kGradientScale, 0.0f, kGradientColors, kGradientStops, Shader.TileMode.REPEAT)
-            canvas.drawRect(Rect(0, resolution.height / 2, resolution.width, resolution.height), movingPaint)
+            movingPaint.shader = LinearGradient(
+                kGradientOffset,
+                0.0f,
+                kGradientOffset + kGradientScale,
+                0.0f,
+                kGradientColors,
+                kGradientStops,
+                Shader.TileMode.REPEAT
+            )
+            canvas.drawRect(
+                Rect(0, resolution.height / 2, resolution.width, resolution.height),
+                movingPaint
+            )
 
             val staticPaint = Paint()
-            staticPaint.shader = LinearGradient(0.0f, 0.0f, kGradientScale, 0.0f, kGradientColors, kGradientStops, Shader.TileMode.REPEAT)
+            staticPaint.shader = LinearGradient(
+                0.0f,
+                0.0f,
+                kGradientScale,
+                0.0f,
+                kGradientColors,
+                kGradientStops,
+                Shader.TileMode.REPEAT
+            )
             canvas.drawRect(Rect(0, 0, resolution.width, resolution.height / 2), staticPaint)
 
             surface.unlockCanvasAndPost(canvas)
@@ -108,7 +133,10 @@ class StreamHelper(private val filamentEngine: Engine, private val filamentMater
 
             if (streamSource == StreamSource.CANVAS_STREAM_ACQUIRED) {
                 val image = imageReader!!.acquireLatestImage()
-                filamentStream!!.setAcquiredImage(image.hardwareBuffer!!, directImageHandler) { image.close() }
+                filamentStream!!.setAcquiredImage(
+                    image.hardwareBuffer!!,
+                    directImageHandler
+                ) { image.close() }
             }
         }
 
@@ -136,7 +164,9 @@ class StreamHelper(private val filamentEngine: Engine, private val filamentMater
 
         val filamentTexture = this.filamentTexture!!
 
-        val sampler = TextureSampler(TextureSampler.MinFilter.LINEAR, TextureSampler.MagFilter.LINEAR, TextureSampler.WrapMode.REPEAT)
+        val sampler = TextureSampler(
+            TextureSampler.MinFilter.LINEAR, TextureSampler.MagFilter.LINEAR,
+            TextureSampler.WrapMode.REPEAT)
 
         // We are texturing a front-facing square shape so we need to generate a matrix that transforms (u, v, 0, 1)
         // into a new UV coordinate according to the screen rotation and the aspect ratio of the camera image.
@@ -164,7 +194,8 @@ class StreamHelper(private val filamentEngine: Engine, private val filamentMater
 
         // Connect the Stream to the Texture and the Texture to the MaterialInstance.
         filamentMaterial.setParameter("videoTexture", filamentTexture, sampler)
-        filamentMaterial.setParameter("textureTransform", MaterialInstance.FloatElement.MAT4, textureTransform, 0, 1)
+        filamentMaterial.setParameter("textureTransform",
+            MaterialInstance.FloatElement.MAT4, textureTransform, 0, 1)
 
         if (streamSource == StreamSource.CANVAS_STREAM_NATIVE) {
 
@@ -207,7 +238,9 @@ class StreamHelper(private val filamentEngine: Engine, private val filamentMater
 
             filamentTexture.setExternalStream(filamentEngine, filamentStream!!)
 
-            this.imageReader = ImageReader.newInstance(resolution.width, resolution.height, ImageFormat.RGB_565, kImageReaderMaxImages).apply {
+            this.imageReader = ImageReader.newInstance(
+                resolution.width, resolution.height, ImageFormat.RGB_565, kImageReaderMaxImages
+            ).apply {
                 canvasSurface = surface
             }
         }

android/samples/sample-texture-view/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: FilamentToolsPlugin
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'filament-tools-plugin'
+}
 
 project.ext.isSample = true
 
@@ -21,6 +23,12 @@ android {
         targetSdkVersion versions.targetSdk
     }
 
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
+
     // We use the .filamat extension for materials compiled with matc
     // Telling aapt to not compress them allows to load them efficiently
     aaptOptions {

android/samples/sample-texture-view/src/main/AndroidManifest.xml

@@ -9,7 +9,9 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
+    <activity
+        android:exported="true"
+        android:name=".MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 

android/samples/sample-textured-object/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: FilamentToolsPlugin
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'filament-tools-plugin'
+}
 
 project.ext.isSample = true
 
@@ -28,6 +30,12 @@ android {
         missingDimensionStrategy 'functionality', 'full'
     }
 
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
+
     // We use the .filamat extension for materials compiled with matc
     // Telling aapt to not compress them allows to load them efficiently
     aaptOptions {

android/samples/sample-textured-object/src/main/AndroidManifest.xml

@@ -9,7 +9,9 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name="com.google.android.filament.textured.MainActivity">
+    <activity
+        android:exported="true"
+        android:name="com.google.android.filament.textured.MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 

android/samples/sample-transparent-view/build.gradle

@@ -1,6 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: FilamentToolsPlugin
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'filament-tools-plugin'
+}
 
 project.ext.isSample = true
 
@@ -21,6 +23,12 @@ android {
         targetSdkVersion versions.targetSdk
     }
 
+    // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
+    //       is not configuration-cache friendly yet; this is only useful for Play publication
+    dependenciesInfo {
+        includeInApk = false
+    }
+
     // We use the .filamat extension for materials compiled with matc
     // Telling aapt to not compress them allows to load them efficiently
     aaptOptions {

android/samples/sample-transparent-view/src/main/AndroidManifest.xml

@@ -9,7 +9,9 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name="com.google.android.filament.transparentrendering.MainActivity">
+    <activity
+        android:exported="true"
+        android:name="com.google.android.filament.transparentrendering.MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 

build.sh

@@ -453,23 +453,23 @@ function build_android {
 
     if [[ "${ISSUE_DEBUG_BUILD}" == "true" ]]; then
         ./gradlew \
-            -Pfilament_dist_dir=../out/android-debug/filament \
-            -Pfilament_abis=${ABI_GRADLE_OPTION} \
+            -Pcom.google.android.filament.dist-dir=../out/android-debug/filament \
+            -Pcom.google.android.filament.abis=${ABI_GRADLE_OPTION} \
             ${VULKAN_ANDROID_GRADLE_OPTION} \
             :filament-android:assembleDebug \
             :gltfio-android:assembleDebug \
             :filament-utils-android:assembleDebug
 
         ./gradlew \
-            -Pfilament_dist_dir=../out/android-debug/filament \
-            -Pfilament_abis=${ABI_GRADLE_OPTION} \
+            -Pcom.google.android.filament.dist-dir=../out/android-debug/filament \
+            -Pcom.google.android.filament.abis=${ABI_GRADLE_OPTION} \
             :filamat-android:assembleDebug
 
         if [[ "${BUILD_ANDROID_SAMPLES}" == "true" ]]; then
             for sample in ${ANDROID_SAMPLES}; do
                 ./gradlew \
-                    -Pfilament_dist_dir=../out/android-debug/filament \
-                    -Pfilament_abis=${ABI_GRADLE_OPTION} \
+                    -Pcom.google.android.filament.dist-dir=../out/android-debug/filament \
+                    -Pcom.google.android.filament.abis=${ABI_GRADLE_OPTION} \
                     :samples:${sample}:assembleDebug
             done
         fi
@@ -502,23 +502,23 @@ function build_android {
 
     if [[ "${ISSUE_RELEASE_BUILD}" == "true" ]]; then
         ./gradlew \
-            -Pfilament_dist_dir=../out/android-release/filament \
-            -Pfilament_abis=${ABI_GRADLE_OPTION} \
+            -Pcom.google.android.filament.dist-dir=../out/android-release/filament \
+            -Pcom.google.android.filament.abis=${ABI_GRADLE_OPTION} \
             ${VULKAN_ANDROID_GRADLE_OPTION} \
             :filament-android:assembleRelease \
             :gltfio-android:assembleRelease \
             :filament-utils-android:assembleRelease
 
         ./gradlew \
-            -Pfilament_dist_dir=../out/android-release/filament \
-            -Pfilament_abis=${ABI_GRADLE_OPTION} \
+            -Pcom.google.android.filament.dist-dir=../out/android-release/filament \
+            -Pcom.google.android.filament.abis=${ABI_GRADLE_OPTION} \
             :filamat-android:assembleRelease
 
         if [[ "${BUILD_ANDROID_SAMPLES}" == "true" ]]; then
             for sample in ${ANDROID_SAMPLES}; do
                 ./gradlew \
-                    -Pfilament_dist_dir=../out/android-release/filament \
-                    -Pfilament_abis=${ABI_GRADLE_OPTION} \
+                    -Pcom.google.android.filament.dist-dir=../out/android-release/filament \
+                    -Pcom.google.android.filament.abis=${ABI_GRADLE_OPTION} \
                     :samples:${sample}:assembleRelease
             done
         fi
@@ -831,7 +831,7 @@ while getopts ":hacCfijmp:q:uvslwtdk:" opt; do
             ;;
         v)
             VULKAN_ANDROID_OPTION="-DFILAMENT_SUPPORTS_VULKAN=OFF"
-            VULKAN_ANDROID_GRADLE_OPTION="-Pfilament_exclude_vulkan"
+            VULKAN_ANDROID_GRADLE_OPTION="-Pcom.google.android.filament.exclude-vulkan"
             echo "Disabling support for Vulkan in the core Filament library."
             echo "Consider using -c after changing this option to clear the Gradle cache."
             ;;