Merge branch 'rc/1.11.2' into release

Bring color grading back into the Rec.709 color space to match
previous behaviors. This change also implements an exact inverse
tone map function for the "Filmic" operator.

.github/actions/verify-release-notes/Dockerfile

@@ -1,10 +0,0 @@
-FROM python:3.10.4
-
-RUN pip3 install pygithub==1.55
-
-ENV PYTHONUNBUFFERED=1
-
-COPY verify_release_notes.py /verify_release_notes.py
-
-RUN chmod +x /verify_release_notes.py
-ENTRYPOINT [ "/verify_release_notes.py" ]

.github/actions/verify-release-notes/action.yml

@@ -1,35 +0,0 @@
-name: 'Verify Release Notes'
-description: 'Verifies that a RELEASE_NOTES file has been modified'
-inputs:
-  repo-token:
-    description: 'The GitHub token'
-    required: true
-  pull-request-number:
-    description: 'The Pull Request number'
-    required: true
-  bypass-label-name:
-    description: 'The Label used to bypass this check'
-    required: false
-    default: 'internal'
-  release-notes-file:
-    description: 'The path to the RELEASE_NOTES file'
-    required: false
-    default: 'RELEASE_NOTES.md'
-  pull-request-repo-full-name:
-    description: 'The full name of the Pull Request repo'
-    required: false
-    default: ${{ github.event.pull_request.head.repo.full_name }}
-  pull-request-head-ref:
-    description: 'The HEAD ref of the Pull Request'
-    required: false
-    default: ${{ github.event.pull_request.head.ref }}
-runs:
-  using: 'docker'
-  image: 'Dockerfile'
-  args:
-    - ${{ inputs.repo-token }}
-    - ${{ inputs.pull-request-number }}
-    - ${{ inputs.bypass-label-name }}
-    - ${{ inputs.release-notes-file }}
-    - ${{ inputs.pull-request-repo-full-name }}
-    - ${{ inputs.pull-request-head-ref }}

.github/actions/verify-release-notes/verify_release_notes.py

@@ -1,100 +0,0 @@
-#!/usr/bin/env python3
-
-# 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.
-
-from github import Github
-import sys, os
-
-def print_usage():
-    print('Verify that a GitHub pull request modifies a RELEASE_NOTES file')
-    print()
-    print('Usage:')
-    print('  verify_release_notes.py [arguments]')
-    print()
-    print('Arguments:')
-    print('1. github token')
-    print('2. pull request number')
-    print('3. bypass label name')
-    print('4. release notes file path')
-    print('5. pull request repo full name')
-    print('6. pull request head ref')
-    print()
-    print('The GITHUB_REPOSITORY environment variable must be set (e.g., google/filament).')
-
-def leave_single_comment(pull_request, comment_body):
-    """ Leaves a comment on a PR once, without leaving a duplicate comment. """
-    # To avoid spamming the PR author, we'll use this comment tag (which will render invisibly on
-    # GitHub) to check if we've already left a comment on this PR.
-    COMMENT_TAG = '<!-- verify_release_notes -->\n'
-    comments = pull_request.get_issue_comments()
-    for comment in comments:
-        if comment.body.find(COMMENT_TAG) != -1:
-            return
-    # The GitHub token may not have WRITE permissions to leave a comment (for example, for 3P
-    # contributors). In that case, we simply won't leave a comment.
-    try:
-        pull_request.create_issue_comment(f'{COMMENT_TAG}{comment_body}')
-    except:
-        print("Unable to leave comment. Continuing.")
-
-# The first argument is the path to this script.
-if len(sys.argv) != 7:
-    print_usage()
-    sys.exit(1)
-
-authentication_token = sys.argv[1]
-pull_number = sys.argv[2]
-bypass_label_name = sys.argv[3]
-release_notes_file = sys.argv[4]
-pr_repo_full_name = sys.argv[5]
-pr_head_ref = sys.argv[6]
-
-g = Github(authentication_token)
-
-repo_name = os.environ.get('GITHUB_REPOSITORY')
-if repo_name is None:
-    print("The GITHUB_REPOSITORY environment variable must be set.")
-    sys.exit(1)
-
-repo = g.get_repo(repo_name)
-
-pull_request = repo.get_pull(int(pull_number))
-
-# First check if the PR has the "bypass" label. This label is used for PRs that don't need to update
-# RELEASE_NOTES. If so, we can exit immediately.
-labels = [l.name for l in pull_request.labels]
-if bypass_label_name in labels:
-    print(f"PR number {pull_number} in repo {repo_name} contains the '{bypass_label_name}' label.")
-    print("Exiting with success.")
-    sys.exit(0)
-
-# Next, check if the release notes file (RELEASE_NOTES.md or similar) has been modified.
-files = pull_request.get_files()
-for file in files:
-    if file.filename == release_notes_file:
-        print(f"PR number {pull_number} in repo {repo_name} modifies '{release_notes_file}'.")
-        print("Exiting with success.")
-        sys.exit(0)
-
-# At this point, we issue a warning to the PR author to remember to modify the release notes, and
-# exit with failure.
-edit_url = f"https://github.com/{pr_repo_full_name}/edit/{pr_head_ref}/{release_notes_file}"
-comment = (f"Please add a release note line to [{release_notes_file}]({edit_url}). "
-    f"If this PR does not warrant a release note, add the '{bypass_label_name}' label "
-    f"to this PR.")
-print(comment)
-leave_single_comment(pull_request, comment)
-
-sys.exit(1)

.github/workflows/android-continuous.yml

@@ -13,11 +13,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '17'
+      - uses: actions/checkout@v2.0.0
       - name: Run build script
         run: |
           cd build/android && printf "y" | ./build.sh continuous
@@ -37,6 +33,10 @@ jobs:
         with:
           name: gltfio-android-release
           path: out/gltfio-android-release.aar
+      - uses: actions/upload-artifact@v1.0.0
+        with:
+          name: gltfio-android-lite-release
+          path: out/gltfio-android-lite-release.aar
       - uses: actions/upload-artifact@v1.0.0
         with:
           name: filament-utils-android-release

.github/workflows/ios-continuous.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v2.0.0
       - name: Run build script
         run: |
           cd build/ios && printf "y" | ./build.sh continuous

.github/workflows/linux-continuous.yml

@@ -10,10 +10,10 @@ on:
 jobs:
   build-linux:
     name: build-linux
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v2.0.0
       - name: Run build script
         run: |
           cd build/linux && printf "y" | ./build.sh continuous

.github/workflows/mac-continuous.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v2.0.0
       - name: Run build script
         run: |
           cd build/mac && printf "y" | ./build.sh continuous
@@ -21,6 +21,3 @@ 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/presubmit.yml

@@ -15,10 +15,10 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-22.04]
+        os: [macos-latest, ubuntu-18.04]
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v2.0.0
       - name: Run build script
         run: |
           WORKFLOW_OS=`echo \`uname\` | sed "s/Darwin/mac/" | tr [:upper:] [:lower:]`
@@ -29,10 +29,10 @@ jobs:
 
   build-windows:
     name: build-windows
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v2.0.0
       - name: Run build script
         run: |
           build\windows\build-github.bat presubmit
@@ -43,11 +43,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '17'
+      - uses: actions/checkout@v2.0.0
       - name: Run build script
         run: |
           cd build/android && printf "y" | ./build.sh presubmit
@@ -57,7 +53,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v2.0.0
       - name: Run build script
         run: |
           cd build/ios && printf "y" | ./build.sh presubmit
@@ -70,7 +66,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v2.0.0
       - name: Run build script
         run: |
           cd build/web && printf "y" | ./build.sh presubmit

.github/workflows/release.yml

@@ -1,25 +1,14 @@
 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 workflow_dispatch event is triggered from the GitHub web UI. 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 repository_dispatch API event is sent. This triggers a build for only the platform specified in the dispatch event.
 
 env:
-  RELEASE_TAG: ${{ github.event.inputs.release_tag }}
+  RELEASE_TAG: ${{ github.event.client_payload.release_tag }}
 
 on:
-  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'
+  repository_dispatch:
   release:
     types: [created]
 
@@ -27,11 +16,11 @@ jobs:
   build-desktop:
     name: build-desktop
     runs-on: ${{ matrix.os }}
-    if: github.event_name == 'release' || github.event.inputs.platform == 'desktop'
+    if: github.event_name == 'release' || github.event.client_payload.platform == 'desktop'
 
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-22.04]
+        os: [macos-latest, ubuntu-18.04]
 
     steps:
       - name: Decide Git ref
@@ -39,34 +28,30 @@ jobs:
         run: |
           REF=${RELEASE_TAG:-${GITHUB_REF}}
           TAG=${REF##*/}
-          echo "ref=${REF}" >> $GITHUB_OUTPUT
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v3.3.0
+          echo ::set-output name=ref::${REF}
+          echo ::set-output name=tag::${TAG}
+      - uses: actions/checkout@v2.0.0
         with:
           ref: ${{ steps.git_ref.outputs.ref }}
       - name: Run build script
-        env:
-          TAG: ${{ steps.git_ref.outputs.tag }}
         run: |
           WORKFLOW_OS=`echo \`uname\` | sed "s/Darwin/mac/" | tr [:upper:] [:lower:]`
           cd build/$WORKFLOW_OS && printf "y" | ./build.sh release
-          cd ../..
+      - name: Upload release assets
+        run: |
+          pip3 install setuptools
+          pip3 install PyGithub
           if [ -f out/filament-release-darwin.tgz ]; then mv out/filament-release-darwin.tgz out/filament-${TAG}-mac.tgz; fi;
           if [ -f out/filament-release-linux.tgz ]; then mv out/filament-release-linux.tgz out/filament-${TAG}-linux.tgz; fi;
-      - uses: actions/github-script@v6
+          python3 build/common/upload-assets.py ${TAG} out/*.tgz
         env:
           TAG: ${{ steps.git_ref.outputs.tag }}
-        with:
-          script: |
-            const upload = require('./build/common/upload-release-assets');
-            const { TAG } = process.env;
-            const globber = await glob.create('out/*.tgz');
-            await upload({ github, context }, await globber.glob(), TAG);
+          GITHUB_API_KEY: ${{ secrets.GITHUB_API_KEY }}
 
   build-web:
     name: build-web
     runs-on: macos-latest
-    if: github.event_name == 'release' || github.event.inputs.platform == 'web'
+    if: github.event_name == 'release' || github.event.client_payload.platform == 'web'
 
     steps:
       - name: Decide Git ref
@@ -74,32 +59,28 @@ jobs:
         run: |
           REF=${RELEASE_TAG:-${GITHUB_REF}}
           TAG=${REF##*/}
-          echo "ref=${REF}" >> $GITHUB_OUTPUT
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v3.3.0
+          echo ::set-output name=ref::${REF}
+          echo ::set-output name=tag::${TAG}
+      - uses: actions/checkout@v2.0.0
         with:
           ref: ${{ steps.git_ref.outputs.ref }}
       - name: Run build script
-        env:
-          TAG: ${{ steps.git_ref.outputs.tag }}
         run: |
           cd build/web && printf "y" | ./build.sh release
-          cd ../..
+      - name: Upload release assets
+        run: |
+          pip3 install setuptools
+          pip3 install PyGithub
           mv out/filament-release-web.tgz out/filament-${TAG}-web.tgz
-      - uses: actions/github-script@v6
+          python3 build/common/upload-assets.py ${TAG} out/*.tgz
         env:
           TAG: ${{ steps.git_ref.outputs.tag }}
-        with:
-          script: |
-            const upload = require('./build/common/upload-release-assets');
-            const { TAG } = process.env;
-            const globber = await glob.create('out/*.tgz');
-            await upload({ github, context }, await globber.glob(), TAG);
+          GITHUB_API_KEY: ${{ secrets.GITHUB_API_KEY }}
 
   build-android:
     name: build-android
     runs-on: macos-latest
-    if: github.event_name == 'release' || github.event.inputs.platform == 'android'
+    if: github.event_name == 'release' || github.event.client_payload.platform == 'android'
 
     steps:
       - name: Decide Git ref
@@ -107,26 +88,14 @@ jobs:
         run: |
           REF=${RELEASE_TAG:-${GITHUB_REF}}
           TAG=${REF##*/}
-          echo "ref=${REF}" >> $GITHUB_OUTPUT
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v3.3.0
+          echo ::set-output name=ref::${REF}
+          echo ::set-output name=tag::${TAG}
+      - uses: actions/checkout@v2.0.0
         with:
           ref: ${{ steps.git_ref.outputs.ref }}
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '17'
       - name: Run build script
-        env:
-          TAG: ${{ steps.git_ref.outputs.tag }}
         run: |
           cd build/android && printf "y" | ./build.sh release
-          cd ../..
-          mv out/filament-android-release.aar out/filament-${TAG}-android.aar
-          mv out/filamat-android-release.aar out/filamat-${TAG}-android.aar
-          mv out/filamat-android-lite-release.aar out/filamat-${TAG}-lite-android.aar
-          mv out/gltfio-android-release.aar out/gltfio-${TAG}-android.aar
-          mv out/filament-utils-android-release.aar out/filament-utils-${TAG}-android.aar
       - name: Sign sample-gltf-viewer
         run: |
           echo "${APK_KEYSTORE_BASE64}" > filament.jks.base64
@@ -141,20 +110,26 @@ jobs:
           TAG: ${{ steps.git_ref.outputs.tag }}
           APK_KEYSTORE_BASE64: ${{ secrets.APK_KEYSTORE_BASE64 }}
           APK_KEYSTORE_PASS: ${{ secrets.APK_KEYSTORE_PASS }}
-      - uses: actions/github-script@v6
+      - name: Upload release assets
+        run: |
+          pip3 install setuptools
+          pip3 install PyGithub
+          mv out/filament-android-release.aar out/filament-${TAG}-android.aar
+          mv out/filamat-android-release.aar out/filamat-${TAG}-android.aar
+          mv out/filamat-android-lite-release.aar out/filamat-${TAG}-lite-android.aar
+          mv out/gltfio-android-release.aar out/gltfio-${TAG}-android.aar
+          mv out/gltfio-android-lite-release.aar out/gltfio-${TAG}-lite-android.aar
+          mv out/filament-utils-android-release.aar out/filament-utils-${TAG}-android.aar
+          mv out/filament-utils-android-lite-release.aar out/filament-utils-${TAG}-lite-android.aar
+          python3 build/common/upload-assets.py ${TAG} out/*.aar out/*.apk
         env:
           TAG: ${{ steps.git_ref.outputs.tag }}
-        with:
-          script: |
-            const upload = require('./build/common/upload-release-assets');
-            const { TAG } = process.env;
-            const globber = await glob.create(['out/*.aar', 'out/*.apk'].join('\n'));
-            await upload({ github, context }, await globber.glob(), TAG);
+          GITHUB_API_KEY: ${{ secrets.GITHUB_API_KEY }}
 
   build-ios:
     name: build-ios
     runs-on: macos-latest
-    if: github.event_name == 'release' || github.event.inputs.platform == 'ios'
+    if: github.event_name == 'release' || github.event.client_payload.platform == 'ios'
 
     steps:
       - name: Decide Git ref
@@ -162,32 +137,28 @@ jobs:
         run: |
           REF=${RELEASE_TAG:-${GITHUB_REF}}
           TAG=${REF##*/}
-          echo "ref=${REF}" >> $GITHUB_OUTPUT
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@v3.3.0
+          echo ::set-output name=ref::${REF}
+          echo ::set-output name=tag::${TAG}
+      - uses: actions/checkout@v2.0.0
         with:
           ref: ${{ steps.git_ref.outputs.ref }}
       - name: Run build script
-        env:
-          TAG: ${{ steps.git_ref.outputs.tag }}
         run: |
           cd build/ios && printf "y" | ./build.sh release
-          cd ../..
+      - name: Upload release assets
+        run: |
+          pip3 install setuptools
+          pip3 install PyGithub
           mv out/filament-release-ios.tgz out/filament-${TAG}-ios.tgz
-      - uses: actions/github-script@v6
+          python3 build/common/upload-assets.py ${TAG} out/*.tgz
         env:
           TAG: ${{ steps.git_ref.outputs.tag }}
-        with:
-          script: |
-            const upload = require('./build/common/upload-release-assets');
-            const { TAG } = process.env;
-            const globber = await glob.create('out/*.tgz');
-            await upload({ github, context }, await globber.glob(), TAG);
+          GITHUB_API_KEY: ${{ secrets.GITHUB_API_KEY }}
 
   build-windows:
     name: build-windows
-    runs-on: windows-2019
-    if: github.event_name == 'release' || github.event.inputs.platform == 'windows'
+    runs-on: windows-latest
+    if: github.event_name == 'release' || github.event.client_payload.platform == 'windows'
 
     steps:
       - name: Decide Git ref
@@ -195,26 +166,22 @@ jobs:
         run: |
           REF=${RELEASE_TAG:-${GITHUB_REF}}
           TAG=${REF##*/}
-          echo "ref=${REF}" >> $GITHUB_OUTPUT
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
+          echo ::set-output name=ref::${REF}
+          echo ::set-output name=tag::${TAG}
         shell: bash
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v2.0.0
         with:
           ref: ${{ steps.git_ref.outputs.ref }}
       - name: Run build script
-        env:
-          TAG: ${{ steps.git_ref.outputs.tag }}
         run: |
           build\windows\build-github.bat release
-          cd ..\..
-          move out\filament-windows.tgz out\filament-%TAG%-windows.tgz
         shell: cmd
-      - uses: actions/github-script@v6
+      - name: Upload release assets
+        run: |
+          pip3 install PyGithub
+          mv out/filament-windows.tgz out/filament-${TAG}-windows.tgz
+          python build/common/upload-assets.py ${TAG} out/*.tgz
+        shell: bash
         env:
           TAG: ${{ steps.git_ref.outputs.tag }}
-        with:
-          script: |
-            const upload = require('./build/common/upload-release-assets');
-            const { TAG } = process.env;
-            const globber = await glob.create('out/*.tgz');
-            await upload({ github, context }, await globber.glob(), TAG);
+          GITHUB_API_KEY: ${{ secrets.GITHUB_API_KEY }}

.github/workflows/verify-release-notes.yml

@@ -1,27 +0,0 @@
-name: Verify Release Notes
-
-on:
-  pull_request:
-    branches:
-      - main
-    types: [opened, synchronize, reopened, labeled]
-
-jobs:
-  verify-release-notes:
-    name: Verify Release Notes
-    runs-on: ubuntu-latest
-    steps:
-      # We *only* need to check out the .github/ directory.
-      # The verify RELEASE_NOTES script uses the GitHub API to verify that RELEASE_NOTES was
-      # modified.
-      - name: Check out action
-        uses: Bhacaz/checkout-files@73e17cfbe8d7e0c6b2672b20cb05a718e20d18d4
-        with:
-          files: .github
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Verify release notes
-        uses: ./.github/actions/verify-release-notes
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          pull-request-number: ${{ github.event.pull_request.number }}
-          release-notes-file: 'NEW_RELEASE_NOTES.md'

.github/workflows/web-continuous.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v2.0.0
       - name: Run build script
         run: |
           cd build/web && printf "y" | ./build.sh continuous

.github/workflows/windows-continuous.yml

@@ -10,10 +10,10 @@ on:
 jobs:
   build-windows:
     name: build-windows
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v2.0.0
       - name: Run build script
         run: |
           build\windows\build-github.bat continuous

BUILDING.md

@@ -13,10 +13,9 @@ section below.
 
 To build Filament for Android you must also install the following:
 
-- Android Studio Flamingo or more recent
+- Android Studio 4.2.0 or more recent
 - Android SDK
-- Android NDK 25.1 or higher
-- Java 17
+- Android NDK "side-by-side" 22.1 or higher
 
 ### Environment variables
 
@@ -93,8 +92,6 @@ Make sure you've installed the following dependencies:
 - `libc++abi-7-dev` (`libcxxabi-static` on Fedora) or higher
 - `ninja-build`
 - `libxi-dev`
-- `libxcomposite-dev` (`libXcomposite-devel` on Fedora)
-- `libxxf86vm-dev` (`libXxf86vm-devel` on Fedora)
 
 After dependencies have been installed, we highly recommend using the [easy build](#easy-build)
 script.
@@ -147,9 +144,6 @@ make sure the command line tools are setup by running:
 $ xcode-select --install
 ```
 
-If you wish to run the Vulkan backend instead of the default Metal backend, you must install
-the LunarG SDK, enable "System Global Components", and reboot your machine.
-
 Then run `cmake` and `ninja` to trigger a build:
 
 ```
@@ -297,11 +291,11 @@ Alternatively you can build the AAR from the command line by executing the follo
 `android/` directory:
 
 ```
-$ ./gradlew -Pcom.google.android.filament.dist-dir=../../out/android-release/filament assembleRelease
+$ ./gradlew -Pfilament_dist_dir=../../out/android-release/filament assembleRelease
 ```
 
-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).
+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).
 
 #### Using Filament's AAR
 
@@ -355,7 +349,7 @@ same version that our continuous builds use.
 
 ```
 cd <your chosen parent folder for the emscripten SDK>
-curl -L https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.15.zip > emsdk.zip
+curl -L https://github.com/emscripten-core/emsdk/archive/2.0.23.zip > emsdk.zip
 unzip emsdk.zip ; mv emsdk-* emsdk ; cd emsdk
 python ./emsdk.py install latest
 python ./emsdk.py activate latest
@@ -371,11 +365,13 @@ export EMSDK=<your chosen home for the emscripten SDK>
 
 The EMSDK variable is required so that the build script can find the Emscripten SDK. The build
 creates a `samples` folder that can be used as the root of a simple static web server. Note that you
-cannot open the HTML directly from the filesystem due to CORS. We recommend using the emrun tool
-to create a quick localhost server:
+cannot open the HTML directly from the filesystem due to CORS. One way to deal with this is to
+use Python to create a quick localhost server:
 
 ```
-emrun out/cmake-webgl-release/web/samples --no_browser --port 8000
+cd out/cmake-webgl-release/web/samples
+python3 -m http.server     # Python 3
+python -m SimpleHTTPServer # Python 2.7
 ```
 
 You can then open http://localhost:8000/suzanne.html in your web browser.

CMakeLists.txt

@@ -23,30 +23,20 @@ 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_EGL_ON_LINUX "Use EGL for OpenGL in Linux builds" OFF)
-
-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)
-
-option(FILAMENT_ENABLE_ASAN_UBSAN "Enable Address and Undefined Behavior Sanitizers" OFF)
-
 set(FILAMENT_NDK_VERSION "" CACHE STRING
     "Android NDK version or version prefix to be used when building for Android."
 )
 
-set(FILAMENT_PER_RENDER_PASS_ARENA_SIZE_IN_MB "3" CACHE STRING
-    "Per render pass arena size. Must be roughly 1 MB larger than FILAMENT_PER_FRAME_COMMANDS_SIZE_IN_MB, default 3."
+set(FILAMENT_PER_RENDER_PASS_ARENA_SIZE_IN_MB "2" CACHE STRING
+    "Per render pass arena size. Must be roughly 1 MB larger than FILAMENT_PER_FRAME_COMMANDS_SIZE_IN_MB, default 2."
 )
 
-set(FILAMENT_PER_FRAME_COMMANDS_SIZE_IN_MB "2" CACHE STRING
-    "Size of the high-level draw commands buffer. Rule of thumb, 1 MB less than FILAMENT_PER_RENDER_PASS_ARENA_SIZE_IN_MB, default 2."
+set(FILAMENT_PER_FRAME_COMMANDS_SIZE_IN_MB "1" CACHE STRING
+    "Size of the high-level draw commands buffer. Rule of thumb, 1 MB less than FILAMENT_PER_RENDER_PASS_ARENA_SIZE_IN_MB, default 1."
 )
 
-set(FILAMENT_MIN_COMMAND_BUFFERS_SIZE_IN_MB "2" CACHE STRING
-    "Size of the command-stream buffer. As a rule of thumb use the same value as FILAMENT_PER_FRRAME_COMMANDS_SIZE_IN_MB, default 2."
+set(FILAMENT_MIN_COMMAND_BUFFERS_SIZE_IN_MB "1" CACHE STRING
+    "Size of the command-stream buffer. As a rule of thumb use the same value as FILAMENT_PER_FRRAME_COMMANDS_SIZE_IN_MB, default 1."
 )
 
 set(FILAMENT_OPENGL_HANDLE_ARENA_SIZE_IN_MB "4" CACHE STRING
@@ -69,30 +59,25 @@ endif()
 # ==================================================================================================
 find_program(CCACHE_PROGRAM ccache)
 if (CCACHE_PROGRAM)
-    if (WIN32)
-        set(CMAKE_C_COMPILER_LAUNCHER   "${CCACHE_PROGRAM}")
-        set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
+    set(C_LAUNCHER   "${CCACHE_PROGRAM}")
+    set(CXX_LAUNCHER "${CCACHE_PROGRAM}")
+
+    configure_file(build/launch-c.in   launch-c)
+    configure_file(build/launch-cxx.in launch-cxx)
+
+    execute_process(COMMAND chmod a+rx
+        "${CMAKE_BINARY_DIR}/launch-c"
+        "${CMAKE_BINARY_DIR}/launch-cxx"
+    )
+
+    if (CMAKE_GENERATOR STREQUAL "Xcode")
+        set(CMAKE_XCODE_ATTRIBUTE_CC         "${CMAKE_BINARY_DIR}/launch-c")
+        set(CMAKE_XCODE_ATTRIBUTE_CXX        "${CMAKE_BINARY_DIR}/launch-cxx")
+        set(CMAKE_XCODE_ATTRIBUTE_LD         "${CMAKE_BINARY_DIR}/launch-c")
+        set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${CMAKE_BINARY_DIR}/launch-cxx")
     else()
-        set(C_LAUNCHER   "${CCACHE_PROGRAM}")
-        set(CXX_LAUNCHER "${CCACHE_PROGRAM}")
-
-        configure_file(build/launch-c.in   launch-c)
-        configure_file(build/launch-cxx.in launch-cxx)
-
-        execute_process(COMMAND chmod a+rx
-            "${CMAKE_CURRENT_BINARY_DIR}/launch-c"
-            "${CMAKE_CURRENT_BINARY_DIR}/launch-cxx"
-        )
-
-        if (CMAKE_GENERATOR STREQUAL "Xcode")
-            set(CMAKE_XCODE_ATTRIBUTE_CC         "${CMAKE_CURRENT_BINARY_DIR}/launch-c")
-            set(CMAKE_XCODE_ATTRIBUTE_CXX        "${CMAKE_CURRENT_BINARY_DIR}/launch-cxx")
-            set(CMAKE_XCODE_ATTRIBUTE_LD         "${CMAKE_CURRENT_BINARY_DIR}/launch-c")
-            set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${CMAKE_CURRENT_BINARY_DIR}/launch-cxx")
-        else()
-            set(CMAKE_C_COMPILER_LAUNCHER        "${CMAKE_CURRENT_BINARY_DIR}/launch-c")
-            set(CMAKE_CXX_COMPILER_LAUNCHER      "${CMAKE_CURRENT_BINARY_DIR}/launch-cxx")
-        endif()
+        set(CMAKE_C_COMPILER_LAUNCHER        "${CMAKE_BINARY_DIR}/launch-c")
+        set(CMAKE_CXX_COMPILER_LAUNCHER      "${CMAKE_BINARY_DIR}/launch-cxx")
     endif()
 endif()
 
@@ -106,49 +91,23 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # ==================================================================================================
 if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT WEBGL)
     set(LINUX TRUE)
-else()
-    # since cmake 3.25 LINUX is automatically set based on CMAKE_SYSTEM_NAME, which the android
-    # cmake files are setting to "Linux".
-    set(LINUX FALSE)
 endif()
 
 if (LINUX)
-    if (FILAMENT_SUPPORTS_WAYLAND)
-        add_definitions(-DFILAMENT_SUPPORTS_WAYLAND)
-        set(FILAMENT_SUPPORTS_X11 FALSE)
-    elseif (FILAMENT_SUPPORTS_EGL_ON_LINUX)
-        add_definitions(-DFILAMENT_SUPPORTS_EGL_ON_LINUX)
-        set(FILAMENT_SUPPORTS_X11 FALSE)
-    else ()
-        if (FILAMENT_SUPPORTS_XCB)
-            add_definitions(-DFILAMENT_SUPPORTS_XCB)
-        endif()
+    if (FILAMENT_SUPPORTS_XCB)
+        add_definitions(-DFILAMENT_SUPPORTS_XCB)
+    endif()
 
-        # Default Swiftshader build does not enable the xlib extension
-        if (FILAMENT_SUPPORTS_XLIB AND FILAMENT_USE_SWIFTSHADER)
-            set(FILAMENT_SUPPORTS_XLIB OFF)
-        endif()
-
-        if (FILAMENT_SUPPORTS_XLIB)
-            add_definitions(-DFILAMENT_SUPPORTS_XLIB)
-        endif()
-
-        if (FILAMENT_SUPPORTS_XCB OR FILAMENT_SUPPORTS_XLIB)
-            add_definitions(-DFILAMENT_SUPPORTS_X11)
-            set(FILAMENT_SUPPORTS_X11 TRUE)
-        endif()
+    if (FILAMENT_SUPPORTS_XLIB)
+        add_definitions(-DFILAMENT_SUPPORTS_XLIB)
     endif()
 endif()
 
-if (ANDROID OR WEBGL OR IOS OR FILAMENT_LINUX_IS_MOBILE)
+if (ANDROID OR WEBGL OR IOS)
     set(IS_MOBILE_TARGET TRUE)
 endif()
 
-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)
+if (NOT ANDROID AND NOT WEBGL AND NOT IOS)
     set(IS_HOST_PLATFORM TRUE)
 endif()
 
@@ -172,35 +131,27 @@ if (WIN32)
     # __declspec(dllexport) in front of each functions).
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
-    # The CMAKE_CXX_FLAGS vars can be overriden by some Visual Studio generators, so we use an alternative
-    # global method here:
     if (${USE_STATIC_CRT})
-        add_compile_options(
-            $<$<CONFIG:>:/MT>
-            $<$<CONFIG:Debug>:/MTd>
-            $<$<CONFIG:Release>:/MT>
-        )
+        set(CRT_FLAGS_RELEASE "/MT")
+        set(CRT_FLAGS_DEBUG "/MTd")
     else()
-        add_compile_options(
-            $<$<CONFIG:>:/MD>
-            $<$<CONFIG:Debug>:/MDd>
-            $<$<CONFIG:Release>:/MD>
-        )
+        set(CRT_FLAGS_RELEASE "/MD")
+        set(CRT_FLAGS_DEBUG "/MDd")
     endif()
 
     # TODO: Figure out why pdb generation messes with incremental compilaton.
     # IN RELEASE_WITH_DEBUG_INFO, generate debug info in .obj, no in pdb.
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Z7")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /Z7")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CRT_FLAGS_RELEASE} /Z7")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${CRT_FLAGS_RELEASE} /Z7")
 
     # In RELEASE, also generate PDBs.
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${CRT_FLAGS_RELEASE} /Zi")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${CRT_FLAGS_RELEASE} /Zi")
 
     # In DEBUG, avoid generating a PDB file which seems to mess with incremental compilation.
     # Instead generate debug info directly inside obj files.
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Z7")
-    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Z7")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CRT_FLAGS_DEBUG} /Z7")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${CRT_FLAGS_DEBUG} /Z7")
 
     # Special settings when building on CI.
     if (${FILAMENT_WINDOWS_CI_BUILD})
@@ -289,17 +240,13 @@ if (MSVC)
     set(CXX_STANDARD "/std:c++latest")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} /W0 /Zc:__cplusplus")
 else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} -fstrict-aliasing -Wno-unknown-pragmas -Wno-unused-function -Wno-deprecated-declarations")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} -fstrict-aliasing -Wno-unknown-pragmas -Wno-unused-function")
 endif()
 
 if (FILAMENT_USE_EXTERNAL_GLES3)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_EXTERNAL_GLES3")
 endif()
 
-if (FILAMENT_SUPPORTS_EGL_ON_LINUX)
-  set(EGL TRUE)
-endif()
-
 if (FILAMENT_USE_SWIFTSHADER)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DFILAMENT_USE_SWIFTSHADER")
 endif()
@@ -324,7 +271,7 @@ if (LINUX)
 endif()
 
 if (ANDROID)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Werror=unguarded-availability")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 endif()
 
 if (CYGWIN)
@@ -353,23 +300,19 @@ endif()
 # ==================================================================================================
 # Release compiler flags
 # ==================================================================================================
-if (NOT MSVC AND NOT IOS)
-    # Omitting stack frame pointers prevents the generation of readable stack traces in crash reports on iOS
+if (NOT MSVC)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer")
 
     # These aren't compatible with -fembed-bitcode (and seem to have no effect on Apple platforms anyway)
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffunction-sections -fdata-sections")
+    if (NOT IOS)
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffunction-sections -fdata-sections")
+    endif()
 endif()
 
 # On Android RELEASE builds, we disable exceptions and RTTI to save some space (about 75 KiB
 # saved by -fno-exception and 10 KiB saved by -fno-rtti).
 if (ANDROID OR IOS OR WEBGL)
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-rtti")
-
-    if (ANDROID OR WEBGL)
-        # Omitting unwind info prevents the generation of readable stack traces in crash reports on iOS
-        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-unwind-tables -fno-asynchronous-unwind-tables")
-    endif()
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-rtti")
 endif()
 
 # With WebGL, we disable RTTI even for debug builds because we pass emscripten::val back and forth
@@ -379,17 +322,13 @@ if (WEBGL)
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-rtti")
 endif()
 
-if (WEBGL_PTHREADS)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-endif()
-
 # ==================================================================================================
 # Debug compiler flags
 # ==================================================================================================
-if (FILAMENT_ENABLE_ASAN_UBSAN)
-   set(EXTRA_SANITIZE_OPTIONS "-fsanitize=address -fsanitize=undefined")
-endif()
-
+# ASAN is deactivated for now because:
+#  -fsanitize=undefined causes extremely long link times
+#  -fsanitize=address causes a crash with assimp, which we can't explain for now
+#set(EXTRA_SANITIZE_OPTIONS "-fsanitize=undefined -fsanitize=address")
 if (NOT MSVC AND NOT WEBGL)
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fstack-protector")
 endif()
@@ -425,8 +364,8 @@ endif()
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GC_SECTIONS}")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GC_SECTIONS} ${B_SYMBOLIC_FUNCTIONS}")
 
-if (WEBGL_PTHREADS)
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread")
+if (WEBGL)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_WEBGL2=1")
 endif()
 
 # ==================================================================================================
@@ -479,13 +418,6 @@ else()
     option(FILAMENT_ENABLE_MATDBG "Enable the material debugger" OFF)
 endif()
 
-# By default, link in fgdbg for Desktop + Debug
-if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND IS_HOST_PLATFORM)
-    option(FILAMENT_ENABLE_FGDBG "Enable the framegraph debugger" ON)
-else()
-    option(FILAMENT_ENABLE_FGDBG "Enable the framegraph debugger" OFF)
-endif()
-
 # Only optimize materials in Release mode (so error message lines match the source code)
 if (CMAKE_BUILD_TYPE MATCHES Release)
     option(FILAMENT_DISABLE_MATOPT "Disable material optimizations" OFF)
@@ -516,14 +448,9 @@ if (FILAMENT_SUPPORTS_METAL)
     set(MATC_API_FLAGS ${MATC_API_FLAGS} -a metal)
 endif()
 
-# Enable debug info (preserves names in SPIR-V)
-if (FILAMENT_ENABLE_MATDBG)
-    set(MATC_OPT_FLAGS ${MATC_OPT_FLAGS} -d)
-endif()
-
-# Disable optimizations
+# Disable optimizations and enable debug info (preserves names in SPIR-V)
 if (FILAMENT_DISABLE_MATOPT)
-    set(MATC_OPT_FLAGS ${MATC_OPT_FLAGS} -g)
+    set(MATC_OPT_FLAGS -gd)
 endif()
 
 set(MATC_BASE_FLAGS ${MATC_API_FLAGS} -p ${MATC_TARGET} ${MATC_OPT_FLAGS})
@@ -567,18 +494,14 @@ function(list_licenses OUTPUT MODULES)
     foreach(module ${_MODULES})
         set(license_path "../../third_party/${module}/LICENSE")
         get_filename_component(fullname "${license_path}" ABSOLUTE)
-        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()
+        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")
     endforeach()
     configure_file(${FILAMENT}/build/licenses.inc.in ${OUTPUT})
-endfunction()
+endfunction(list_licenses)
 
 set(COMBINE_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/build/linux/combine-static-libs.sh")
 if (WIN32)
@@ -591,12 +514,7 @@ function(combine_static_libs TARGET OUTPUT DEPS)
     # Loop through the dependent libraries and query their location on disk.
     set(DEPS_FILES )
     foreach(DEPENDENCY ${DEPS})
-        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()
+        list(APPEND DEPS_FILES "$<TARGET_FILE:${DEPENDENCY}>")
     endforeach()
 
     add_custom_command(
@@ -629,6 +547,13 @@ 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}\")
+    endif()
 endif()
 
 # ==================================================================================================
@@ -683,23 +608,19 @@ add_subdirectory(${LIBRARIES}/gltfio)
 add_subdirectory(${LIBRARIES}/ibl)
 add_subdirectory(${LIBRARIES}/iblprefilter)
 add_subdirectory(${LIBRARIES}/image)
-add_subdirectory(${LIBRARIES}/ktxreader)
 add_subdirectory(${LIBRARIES}/math)
 add_subdirectory(${LIBRARIES}/mathio)
-add_subdirectory(${LIBRARIES}/uberz)
 add_subdirectory(${LIBRARIES}/utils)
 add_subdirectory(${LIBRARIES}/viewer)
 add_subdirectory(${FILAMENT}/filament)
 add_subdirectory(${FILAMENT}/shaders)
-add_subdirectory(${EXTERNAL}/basisu/tnt)
 add_subdirectory(${EXTERNAL}/civetweb/tnt)
 add_subdirectory(${EXTERNAL}/hat-trie/tnt)
 add_subdirectory(${EXTERNAL}/imgui/tnt)
 add_subdirectory(${EXTERNAL}/robin-map/tnt)
 add_subdirectory(${EXTERNAL}/smol-v/tnt)
 add_subdirectory(${EXTERNAL}/benchmark/tnt)
-add_subdirectory(${EXTERNAL}/meshoptimizer/tnt)
-add_subdirectory(${EXTERNAL}/mikktspace)
+add_subdirectory(${EXTERNAL}/meshoptimizer)
 add_subdirectory(${EXTERNAL}/cgltf/tnt)
 add_subdirectory(${EXTERNAL}/draco/tnt)
 add_subdirectory(${EXTERNAL}/jsmn/tnt)
@@ -718,10 +639,6 @@ if (FILAMENT_BUILD_FILAMAT OR IS_HOST_PLATFORM)
     if (FILAMENT_ENABLE_MATDBG OR IS_HOST_PLATFORM)
         add_subdirectory(${LIBRARIES}/matdbg)
     endif()
-
-    if (FILAMENT_ENABLE_FGDBG OR IS_HOST_PLATFORM)
-        add_subdirectory(${LIBRARIES}/fgdbg)
-    endif()
 endif()
 
 if (FILAMENT_SUPPORTS_VULKAN)
@@ -729,6 +646,10 @@ if (FILAMENT_SUPPORTS_VULKAN)
     add_subdirectory(${EXTERNAL}/vkmemalloc/tnt)
 endif()
 
+if (APPLE)
+    add_subdirectory(${EXTERNAL}/moltenvk/tnt)
+endif()
+
 set(FILAMENT_SAMPLES_BINARY_DIR ${PROJECT_BINARY_DIR}/samples)
 
 if (WEBGL)
@@ -740,13 +661,13 @@ if (IS_HOST_PLATFORM)
     if (FILAMENT_SUPPORTS_OPENGL)
         add_subdirectory(${LIBRARIES}/bluegl)
     endif()
-    if (NOT FILAMENT_SKIP_SDL2)
-      add_subdirectory(${LIBRARIES}/filamentapp)
-    endif()
+    add_subdirectory(${LIBRARIES}/filamentapp)
     add_subdirectory(${LIBRARIES}/imageio)
 
     add_subdirectory(${FILAMENT}/samples)
 
+    add_subdirectory(${EXTERNAL}/astcenc/tnt)
+    add_subdirectory(${EXTERNAL}/etc2comp)
     add_subdirectory(${EXTERNAL}/libassimp/tnt)
     add_subdirectory(${EXTERNAL}/libpng/tnt)
     add_subdirectory(${EXTERNAL}/libsdl2/tnt)
@@ -762,13 +683,11 @@ if (IS_HOST_PLATFORM)
     add_subdirectory(${TOOLS}/mipgen)
     add_subdirectory(${TOOLS}/normal-blending)
     add_subdirectory(${TOOLS}/resgen)
-    add_subdirectory(${TOOLS}/rgb-to-lmsr)
     add_subdirectory(${TOOLS}/roughness-prefilter)
     add_subdirectory(${TOOLS}/specular-color)
-    add_subdirectory(${TOOLS}/uberz)
 endif()
 
 # Generate exported executables for cross-compiled builds (Android, WebGL, and iOS)
 if (NOT CMAKE_CROSSCOMPILING)
-    export(TARGETS matc cmgen filamesh mipgen resgen uberz glslminifier FILE ${IMPORT_EXECUTABLES})
+    export(TARGETS matc cmgen filamesh mipgen resgen glslminifier FILE ${IMPORT_EXECUTABLES})
 endif()

CODE_STYLE.md

@@ -164,7 +164,8 @@ private:
 
 ### Strings
 
-- Never use `std::string` in the Filament core renderer. Prefer `utils::CString` or `std::string_view`.
+- Never use `std::string` in the Filament core renderer. Prefer `utils::CString` or
+  `utils::StaticString`.
 - When using `std::string` in tools, always include the `std::` qualifier to disambiguate it
   from other string types.
 

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 The Android Open Source Project
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

NEW_RELEASE_NOTES.md

@@ -1,12 +0,0 @@
-# Filament Release Notes log
-
-**If you are merging a PR into main**: please add the release note below, under the *Release notes
-for next branch cut* header.
-
-**If you are cherry-picking a commit into an rc/ branch**: add the release note under the
-appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md).
-
-## Release notes for next branch cut
-
-- engine: a new feature to set a transform on the global-scale fog  [⚠️ **Recompile materials**]
-- engine: large-scale fog can now be opted-out on a per-renderable basis

README.md

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.36.0'
+    implementation 'com.google.android.filament:filament-android:1.11.2'
 }
 ```
 
@@ -41,7 +41,9 @@ Here are all the libraries available in the group `com.google.android.filament`:
 | ------------- | ------------- |
 | [![filament-android](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/filament-android/badge.svg?subject=filament-android)](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/filament-android)  | The Filament rendering engine itself. |
 | [![gltfio-android](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/gltfio-android/badge.svg?subject=gltfio-android)](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/gltfio-android) | A glTF 2.0 loader for Filament, depends on `filament-android`. |
+| [![gltfio-android-lite](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/gltfio-android-lite/badge.svg?subject=gltfio-android-lite)](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/gltfio-android-lite) | Trimmed version of `gltfio` that does not support some glTF extensions. |
 | [![filament-utils-android](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/filament-utils-android/badge.svg?subject=filament-utils-android)](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/filament-utils-android) | KTX loading, Kotlin math, and camera utilities, depends on `gltfio-android`. |
+| [![filament-utils-android-lite](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/filament-utils-android-lite/badge.svg?subject=filament-utils-lite)](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/filament-utils-android-lite) | Trimmed version of `filament-utils` that does not support some glTF features. |
 | [![filamat-android](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/filamat-android/badge.svg?subject=filamat-android)](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/filamat-android) | A runtime material builder/compiler. This library is large but contains a full shader compiler/validator/optimizer and supports both OpenGL and Vulkan. |
 | [![filamat-android-lite](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/filamat-android-lite/badge.svg?subject=filamat-android-lite)](https://maven-badges.herokuapp.com/maven-central/com.google.android.filament/filamat-android-lite) | A much smaller alternative to `filamat-android` that can only generate OpenGL shaders. It does not provide validation or optimizations. |
 
@@ -50,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.36.0'
+pod 'Filament', '~> 1.11.2'
 ```
 
 ### Snapshots
@@ -61,7 +63,7 @@ steps:
 1. Find the [commit](https://github.com/google/filament/commits/main) you're interested in.
 2. Click the green check mark under the commit message.
 3. Click on the _Details_ link for the platform you're interested in.
-4. On the top left click _Summary_, then in the _Artifacts_ section choose the desired artifact.
+4. On the top right, click on the _Artifacts_ dropdown and choose an artifact.
 
 ## Documentation
 
@@ -116,27 +118,25 @@ steps:
 - Image-based lighting
 - Physically-based camera (shutter speed, sensitivity and aperture)
 - Physical light units
-- Point lights, spot lights, and directional light
+- Point lights, spot lights and directional light
 - Specular anti-aliasing
-- Point, spot, and directional light shadows
+- Spot and directional light shadows
 - Cascaded shadows
-- EVSM, PCSS, DPCF, or PCF shadows
+- EVSM or PCF shadows
 - Transparent shadows
 - Contact shadows
 - Screen-space ambient occlusion
-- Screen-space reflections
 - Screen-space refraction
 - Global fog
-- Dynamic resolution (with support for AMD FidelityFX FSR)
+- Dynamic resolution
 
 ### Post processing
 
 - HDR bloom
 - Depth of field bokeh
-- Multiple tone mappers: generic (customizable), ACES, filmic, etc.
-- Color and tone management: luminance scaling, gamut mapping
-- Color grading: exposure, night adaptation, white balance, channel mixer,
-  shadows/mid-tones/highlights, ASC CDL, contrast, saturation, etc.
+- Multiple tone mappers: ACES, filmic, etc.
+- Color grading: white balance, channel mixer, shadows/mid-tones/highlights, ASC CDL,
+  contrast, saturation, etc.
 - TAA, FXAA, MSAA
 - Screen-space lens flares
 
@@ -150,9 +150,9 @@ steps:
   - [x] Points
   - [x] Lines
   - [ ] Line Loop
-  - [x] Line Strip
+  - [ ] Line Strip
   - [x] Triangles
-  - [x] Triangle Strip
+  - [ ] Triangle Strip
   - [ ] Triangle Fan
 
 - Animation
@@ -167,18 +167,14 @@ steps:
   - [x] KHR_draco_mesh_compression
   - [x] KHR_lights_punctual
   - [x] KHR_materials_clearcoat
-  - [x] KHR_materials_emissive_strength
   - [x] KHR_materials_ior
   - [x] KHR_materials_pbrSpecularGlossiness
   - [x] KHR_materials_sheen
   - [x] KHR_materials_transmission
   - [x] KHR_materials_unlit
-  - [x] KHR_materials_variants
   - [x] KHR_materials_volume
   - [x] KHR_mesh_quantization
-  - [x] KHR_texture_basisu
   - [x] KHR_texture_transform
-  - [x] EXT_meshopt_compression
 
 
 ## Rendering with Filament
@@ -312,7 +308,6 @@ and tools.
   - `bluegl`:                 OpenGL bindings for macOS, Linux and Windows
   - `bluevk`:                 Vulkan bindings for macOS, Linux, Windows and Android
   - `camutils`:               Camera manipulation utilities
-  - `fgdbg`:                  Frame Graph inspector and debugger (debug builds only)
   - `filabridge`:             Library shared by the Filament engine and host tools
   - `filaflat`:               Serialization/deserialization library used for materials
   - `filagui`:                Helper library for [Dear ImGui](https://github.com/ocornut/imgui)

RELEASE_GUIDE.md

@@ -13,7 +13,22 @@ Before starting, ensure that each of these branches is up-to-date with origin:
 
 It should have the version corresponding to its name, $RELEASE.
 
-## 1. Bump versions on main to $RELEASE.
+## 1. Update RELEASE_NOTES.md on the rc branch.
+
+Checkout the rc/$RELEASE branch. In RELEASE_NOTES.md, locate the header corresponding to $RELEASE
+and write release notes. To see which commits make up the release, run:
+
+```
+build/common/release.sh -c rc/$RELEASE
+```
+
+Commit the changes to rc/$RELEASE with the title:
+
+```
+Update RELEASE_NOTES for $RELEASE
+```
+
+## 2. Bump versions on main to $RELEASE.
 
 Checkout main and run the following command to bump Filament's version to $RELEASE:
 
@@ -29,19 +44,49 @@ Release Filament $RELEASE
 
 Do not push to origin yet.
 
-## 2. Update RELEASE_NOTES.md on main.
+## 3. Cherry-pick RELEASE_NOTES change from rc branch to main.
 
-Create a new header in RELEASE_NOTES.md for $NEXT_RELEASE. Copy the release notes in
-NEW_RELEASE_NOTES.md to RELEASE_NOTES.md under the new header. Clear NEW_RELEASE_NOTES.md.
+```
+git cherry-pick rc/$RELEASE
+```
 
-Amend these changes to the "Release Filament $RELEASE" commit.
+Update the headers. The "Next release" header becomes a header for $NEXT_RELEASE, and a new "Next
+release" header is added.
+
+For example, this:
+
+```
+## Next release (main branch)
+- foo
+- bar
+
+## v1.9.3
+- baz
+- bat
+```
+
+becomes:
+
+```
+## Next release (main branch)
+
+## v1.9.4
+- foo
+- bar
+
+## v1.9.3
+- baz
+- bat
+```
+
+Ammend these changes to the cherry-picked change.
 
 ```
 git add -u
 git commit --amend --no-edit
 ```
 
-## 3. Run release script.
+## 4. Run release script.
 
 ```
 build/common/release.sh rc/$RELEASE rc/$NEXT_RELEASE
@@ -50,18 +95,18 @@ build/common/release.sh rc/$RELEASE rc/$NEXT_RELEASE
 This script will merge rc/$RELEASE into release, delete the rc branch, and create a new rc
 branch called rc/$NEXT_RELEASE. Verify that everything looks okay locally.
 
-## 4. Push the release branch.
+## 5. Push the release branch.
 
 ```
 git push origin release
 ```
 
-## 5. Create the GitHub release.
+## 6. Create the GitHub release.
 
 Use the GitHub UI to create a GitHub release corresponding to $RELEASE version.
 Make sure the target is set to the release branch.
 
-## 6. Delete the old rc branch (optional).
+## 7. Delete the old rc branch (optional).
 
 This step is optional. The old rc branch may be left alive for a few weeks for posterity.
 
@@ -69,7 +114,7 @@ This step is optional. The old rc branch may be left alive for a few weeks for p
 git push origin --delete rc/$RELEASE
 ```
 
-## 7. Bump the version on the new rc branch to $NEXT_RELEASE.
+## 8. Bump the version on the new rc branch to $NEXT_RELEASE.
 
 ```
 git checkout rc/$NEXT_RELEASE
@@ -82,45 +127,14 @@ Commit the changes to rc/$NEXT_RELEASE with the title:
 Bump version to $NEXT_RELEASE
 ```
 
-## 8. Push main.
+## 9. Push main.
 
 ```
 git push origin main
 ```
 
-## 9. Push the new rc branch.
+## 10. Push the new rc branch.
 
 ```
 git push origin -u rc/$NEXT_RELEASE
 ```
-
-## 10. Rebuild the GitHub release (if failed).
-
-Sometimes the GitHub release job will fail. In this case, you can manually re-run the release job.
-
-### Remove any assets uploaded to the release (if needed).
-
-For example, if rebuilding the Mac release, ensure that the `filament-<version>-mac.tgz` artifact
-is removed from the release assets.
-
-### Update the release branch (if needed).
-
-If you need to add one or more new commits to the release, perform the following:
-
-First, push the new commit(s) to the `release` branch.
-
-Then, with the release branch checked out with the new commit(s), run
-
-```
-git tag -f -a <release tagname>
-git push origin -f <release tagname>
-```
-
-This will update and force push the tag.
-
-### Re-run the GitHub release workflow
-
-Navigate to [Filament's release
-workflow](https://github.com/google/filament/actions/workflows/release.yml). Hit the _Run workflow_
-dropdown. Modify _Platform to build_ and _Release tag to build_, then hit _Run workflow_. This will
-initiate a new release run.

RELEASE_NOTES.md

@@ -3,569 +3,7 @@
 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.
 
-**Do not edit this file unless you are performing a release or cherry-picking into an rc/ branch.**
-Instead, if you are authoring a PR for the main branch, add your release note to
-[NEW_RELEASE_NOTES.md](./NEW_RELEASE_NOTES.md).
-
-## v1.37.0
-
-- backend: added `Platform` blob cache APIs, typically used to cache programs [⚠️ **Recompile materials**]
-
-## v1.36.0
-
-- engine: a local transform can now be supplied for each GPU instance [⚠️ **Recompile materials**]
-- everything: Add limited support for OpenGL ES 2.0 devices. [⚠️ **Recompile Materials**]
-- platform: New virtual on `OpenGLPlatform` to preserve ancillary buffers
-
-## v1.35.0
-
-- materials: Materials can now access up to 4 global `vec4` visible by all materials [⚠️ **Recompile Materials**]
-
-## v1.34.0
-
-- materials: picking is done in float (prepare for ES2) [⚠️ **New Material Version**]
-- materials: postLightingBlending is now applied before the fog [⚠️ **Recompile materials**]
-- vulkan: fix adreno optimized material artifacts [⚠️ **Recompile Materials**]
-
-## v1.33.0
-
-- materials: prepare ES2 support [⚠️ **New Material Version**]
-
-## v1.32.4
-
-- engine: Add support for _constant parameters_, which are constants that can be specialized after material compilation.
-- materials: improved size reduction of OpenGL/Metal shaders by ~65% when compiling materials with
-             size optimizations (`matc -S`) [⚠️ **Recompile Materials**]
-- engine: fix potential crash on Metal devices with A8X GPU (iPad Air 2) [⚠️ **Recompile Materials**]
-- opengl: support the external image on macOS
-
-## v1.32.3
-
-- fog: added an option to disable the fog after a certain distance [⚠️ **Recompile Materials**].
-- fog: fog color now takes exposure and IBL intensity into account [⚠️ **Recompile Materials**].
-- materials: implement cascades debugging as a post-process [⚠️ **Recompile Materials**].
-- materials: use 9 digits or less for floats [⚠️ **Recompile Materials**].
-- gltfio: fix skinning when objects are far from the origin
-- materials: remove 4 unneeded variants from `unlit` materials [⚠️ **Recompile Materials**].
-
-## v1.32.2
-
-- lighting: the sun disc was computed in low/medium quality instead of high quality. This will
-  provide performance improvements to mobile devices [⚠️ **Recompile Materials**]
-
-## v1.32.1
-
-## v1.32.0
-
-- fog: fixed fog height falloff and computation precision on mobile [⚠️ **Recompile Materials**]
-- materials: new alphaToCoverage property can be used to control alpha to coverage behavior
-- materials: added `getUserWorldFromWorldMatrix()` and `getUserWorldPosition()` to retrieve the
-  API-level (user) world position in materials. Deprecated `getWorldOffset()`. [⚠️ **Recompile
-  Materials**]
-- engine: fix precision issue with `shading_view` in large scenes
-- vulkan: readPixels is now async (#6560)
-
-## v1.31.7
-
-## v1.31.6
-
-- engine: the default render channel is now 2 instead of 0
-- gltfio: Fix crash when a MIME type has no texture provider
-
-## v1.31.5
-
-- gltfio: fix potential early freeing of data provided with `ResourceLoader::addResourceData`.
-
-## v1.31.4
-
-- engine: fix broken picking [⚠️ **Recompile Materials to get the fix**]
-- engine: added support for sRGB swapchains. See `SwapChain.h`
-- bluegl: support Windows32
-
-## v1.31.3
-
-- vulkan: fix memory leak in readPixels
-- engine: added support for draw-commands channels (stronger ordering of commands/renderables)
-
-## v1.31.2
-
-## v1.31.1
-
-- gltfio: expose joint inverse bind matrices via method on FilamentInstance
-- filamesh: add error when uv coords size does not match num of vertices. (#6351)
-
-## v1.31.0
-
-- java: fix confusing typo in Camera documentation
-- engine: the output color space can be set on `ColorGrading`. This API currently has limitations,
-  please refer to the documentation for more details
-- Support for RGTC and BPTC texture compression
-- engine: fix TransformManager high precision mode when using transactions
-- web: added TypeScript definition for `Engine.destroy`
-- materials: `getNormalizedViewportCoord()` now returns the logical (i.e. user) viewport
-             normalized position and keeps z reversed [⚠️ **Recompile Materials**]
-- backend: workaround Adreno shader compiler bug (#6355) [⚠️ **Recompile Materials**]
-- geometry: change computing tangent basis from normal vector to use Frisvad's method
-
-## v1.30.0
-
-- engine: optimize per-shadow UBO [⚠️ **Recompile Materials**]
-- engine: fix potential memory corruption with larger scenes
-- engine: VSM's MSAA setting is now per-view instead of per-light [⚠️ **API Change**]
-
-## v1.29.0
-
-- gltfio: calculate primitive's AABB correctly.
-- gltfio: recompute bounding boxes with morph targets
-- engine: add missing getters on `MaterialInstance`
-- WebGL: add missing `ColorGrading` JS bindings
-- engine: improvements/cleanup of Shadow mapping code [⚠️ **Recompile Materials**]
-
-## v1.28.3
-
-
-- backend: add support for GGP platform
-- engine: primitives with `CullingMode::FRONT_AND_BACK` are now skipped.
-
-## v1.28.2
-
-- gltfio: support EXT_meshopt_compression
-- release packaging: fixed location of default IBL file
-
-## v1.28.1
-
-- gltfio: fix reloading crash in ubershader mode
-- Vulkan: improve performance in the readPixels path
-- engine: raise the spot shadows limit to 64, from 14.
-- engine: add experimental support for point light shadows.
-- gltfio: fix ubershader issues with assignment of dummy textures
-- gltfio: material instances and variants are now accessed via `FilamentInstance` [⚠️ **API Change**]
-- gltfio: the animator can now only be accessed via `FilamentInstance` [⚠️ **API Change**]
-- engine: fix "stable" shadows and make the default cascade splits logarithmic.
-- engine: Add new quality options to EVSM shadows + rendering fixes
-
-## v1.28.0
-
-- engine: LiSPSM is now a user settable option
-- engine: get the morph target buffer to the given primitive
-- Java: Fix TransformManager.getChildren()
-- Metal: newer devices are no longer limited to 16 samplers per Material.
-- gltfio: fix interpretation of occlusion strength
-- engine: minsdk is now 21 instead of 19. This allows the use of OpenGL ES 3.1
-- Vulkan: fix black screen regression
-
-## v1.27.2
-
-- gltfio: punctual lights are now duplicated when adding new asset instances
-- gltfio: FilamentInstance getAsset method now returns an immutable asset
-- gltfio: allow zero-instance assets
-- gltfio: fix regression with meshes that have no material
-- gltfio: fix regression with recomputeBoundingBoxes()
-- filamesh / matinfo: fix minor ASAN issues
-- engine: Added `Engine::resetBackendState()`, available only in WebGL builds
-
-## v1.27.1
-
-- Java: add methods for TransformManager.getChildCount(), TransformManager.getChildren() and Scene.hasEntity()
-- engine: Fix stencil buffer writes with OpenGL backend.
-- gltfio: add new virtual method to MaterialProvider that all plugins must implement
-- gltfio: add an assert for inconsistent sRGB flags among usages of a particular texture
-- engine: improve scissor documentation
-- backend: scissor is no longer clipped to the viewport (done on filament side)
-- samples: add debug overdraw visualization to gltf_viewer
-
-## v1.27.0
-
-- WebGL: reduce max instance count to work around Chrome issues [⚠️ **Recompile Materials**]
-- engine: rework material/shader sampler binding code [⚠️ **Recompile Materials**]
-- gltfio: move the API for `recomputeBoundingBoxes` [⚠️ **API Change**]
-- engine: add support for specialization constants [⚠️ **Recompile Materials**]
-- gltfio: fix spotlight regression
-- gltfio: clear the MaterialInstance cache when creating new instances
-
-## v1.26.0
-
-- engine: new feature level APIs, see `Engine::getSupportedFeatureLevel()`
-- engine: add new stencil API to `View` and stencil state APIs to `MaterialInstance` [**NEW API**].
-- engine: Fix guard bands and TAA with `vertexDomain:Device` [⚠️ **Recompile Materials**]
-- engine: `clipSpaceTransform` is now only available with `vertexDomain:Device` [⚠️ **API Change**]
-- gltfio: add unified `AssetLoader::createAsset()` method [⚠️ **API Change**]
-- gltfio: all assets are now "instanced" [⚠️ **API Change**]
-
-## v1.25.6
-
-- engine: Add `CONFIG_MINSPEC_UBO_SIZE` as a nicer way to allow exceeding the ES3.0 minspec.
-- gltfio: minor efficiency improvement for Android and WebGL builds.
-- gltfio: add support for concurrent texture downloading and decoding.
-
-## v1.25.5
-
-- WebGL: upgraded the JS bindings to work with emsdk 3.1.15
-- WebGL: added missing IBL builder to TypeScript annotations
-- engine: Fix incorrect precision restoration when computing accurate world translations
-- engine: make `MaterialInstance` public API friendly to `std::string_view` parameters
-- gltfio: add 'detach' methods to allow ownership transfer of entities and components
-
-## v1.25.4
-
-- backend: streamline texture upload APIs [⚠️ **API Change**]
-
-## v1.25.3
-
-- engine: Fix Adreno gpu crash introduced by gpu morph target change
-- engine: Add optional memory configuration parameters to Engine initialization
-
-## v1.25.2
-
-- engine: `Camera::getNear()` and `Camera::getCullingFar()` now return `doubles`
-- Metal: implement scissor support.
-- engine: `Renderer::getUserTime()` now returns seconds as documented (#5722) [⚠️ **API Fix**]
-
-## v1.25.1
-
-- engine: add support for automatic instancing. Must be enabled with `Engine::setAutomaticInstancingEnabled(bool)`
-
-## v1.25.0
-
-- Vulkan: smol-v blobs are now 8-byte aligned within the filamat archive. [⚠️ **Recompile Materials**]
-- backend: added support for EGL on linux (headless)
-- uberz tool: add --append and --template arguments.
-- matc tool: add --template argument.
-
-## v1.24.0
-
-- ImGuiHelper: add support for Y flip.
-- Metal: ignore `MTLTexture` formatting when importing external textures.
-- materials: add a new `instanced` material parameter that is now mandatory in order to call `getInstanceIndex()`
-- gltfio: UbershaderProvider now takes the ubershader archive in its constructor [⚠️ **API Change**]
-- gltfio: Fix morphing with sparse accessors.
-- gltfio: Fix models that use signed integers for morphing.
-- engine: Documentation improvements regarding SkinningBuffer and fix an off-by-one assert when setting a SkinningBuffer.
-- picking is now exposed to JavaScript
-- gltf_viewer: Exercise picking functionality.
-- OpenGL: add WebGL support for ReadPixels
-- Vulkan: add assert and error message for OOM (debug builds)
-- Vulkan: fix crash with picking and 2-component ReadPixels.
-- backend: workaround broken GLES timer query on some Mali-Gxx old drivers
-- backend: revert c049a1 & reenable b2cdf9 ("don't issue a flush systematically after framegraph's execute")
-- gltfio: namespace now lives under Filament [⚠️ **API Change**]
-- gltfio: UbershaderLoader renamed to UbershaderProvider [⚠️ **API Change**]
-- gltfio: MaterialGenerator renamed to JitShaderProvider [⚠️ **API Change**]
-
-## v1.23.2
-
-- gltfio: Fix morphing for un-packed accessors.
-- gltfio: Ubershaders are now packaged into flexible archives.
-- gltfio: Remove poorly maintained lite flavor.
-- engine: Disable user scissor while rendering the Shadow Maps.
-- engine: Merge identical backend `RenderPrimitives` together.
-- engine: Improve `ResourceAllocator` performance a bit by reserving 128 cache entries.
-- utils: Remove `std::hash<T>` definitions for `libutils` types. Use `T::Hasher` explicitly instead. [⚠️ **API Change**]
-- backend: Fix WGL context attributes.
-- Metal: Fix potential invalid shaders when using gltfio in Ubershader mode. [⚠️ **Recompile Materials to get the fix**]
-
-## v1.23.1
-
-- gltfio: support skinning with bones that do not belong to any scene.
-- gltfio: add `attachSkin` / `detachSkin` method to FilamentAsset.
-- gltfio: ubershader mode: set sheen to `OPAQUE`.
-- Metal: fix issues seen with dynamic resolution on M1 Macs.
-- engine: add a "global" mode for render primitive's `blendOrder`.
-- engine: remove `RenderManager::setGeometryAt(index, count)`. [⚠️ **API Change**]
-- engine: fix overallocation by about 17MB.
-- WebGL: Add JS bindings for Texture class methods.
-
-## v1.23.0
-
-- engine: Changed UBOs layout [⚠️ **Material breakage**].
-- engine: Normals on morphed models have been fixed (core Filament change).
-- Java: View has several minor changes due to generated code, such as field ordering.
-- gltfio: Fix crash when reloading glTF assets.
-- gltfio: introduce cross-fade animation API [**NEW API**].
-
-## v1.22.2
-
-- Java: Minor API change: rename `ssctStartTraceDistance` to `ssctShadowDistance`. [⚠️ **API Change**]
-- Java: Minor API change: rename `blendingMode` to `blendMode`. [⚠️ **API Change**]
-- engine: Fix some memory leaks.
-
-## v1.22.1
-
-- Metal: Shaders now use `half` floating-point arithmetic when possible for improved performance. [⚠️ **Recompile Materials**]
-- engine: add support for presentation time in `Renderer`
-- engine: added guard bands support for screen-space effects
-- gltfio: Add multi-scene support.
-- gltfio: Various glTF-related cleanup and enhancements.
-- gltfio: Add support for KHR_texture_basisu.
-
-## v1.22.0
-
-- engine: Changed UBOs layout [⚠️ **Material breakage**].
-- engine: Improve effects relying on mipmapping
-- engine: Fix assert seen with VSM shadows.
-- WebGL: Fix `isTextureFormatSupported` for ETC2 formats.
-
-## v1.21.3
-
-- Java: Renamed the `KTXLoader` Kotlin class to `KTX1Loader`.  [⚠️ **API Change**].
-- libs: Added `Ktx2Reader` and `BasisEncoder` to support Basis-encoded KTX2 files.
-- engine: Remove deprecated `Stream` APIs, see `Texture::import()` for an alternative [⚠️ **API Change**].
-- tools: Removed KTX1 compression support from mipgen.  [⚠️ **API Change**].
-- tools: Added support for KTX2 to mipgen.
-- gltfio: Added `resetBoneMatrices()` method.
-- gltfio: Introduced `TextureProvider` interface.  [⚠️ **API Change**].
-- gltfio: Fix progress indicator when error occurs.
-- samples: Desktop and Web Suzanne samples now use KTX2 instead of KTX1.
-- samples: Fix regression with sample-gltf-viewer and zip files.
-
-## v1.21.2
-
-- Java: Add Java binding to get skins in `FilamentAsset`.
-- libs: Add libs/ktxreader [⚠️ **API Change**].
-- mipgen: fixups / clarification regarding sRGB.
-- WebGL: fix intermittent 'detached ArrayBuffer' errors.
-
-## v1.21.1
-
-- engine: Allow both screen-space refraction and screen-space reflections on the same object [⚠️ **Material breakage**].
-- engine: Optimizations for screen-space reflections.
-- engine: Remove `Viewport::scale()` [⚠️ **API Change**].
-- engine: Fix 12x overallocation of memory in `MorphTargetBuffer`.
-- Metal: Fix validation error when reading from default `SwapChain`.
-
-## v1.21.0
-
-- engine: OpenGL performance improvements with some drivers.
-- engine: Fix incorrect shadows with some custom projection matrices.
-- engine: Fix low frame rates seen with a lot of morph targets.
-- gltfio: Add support for KHR_materials_variants.
-- gltfio: Add support for KHR_materials_emissive_strength.
-- gltfio: Java now exposes morph target names as an array for consistency [⚠️ **API Change**].
-
-## v1.20.5
-
-- engine: New behavior for MASKED to work with translucent views. [⚠️ **Recompile Materials** to get the fix]
-- engine: Fix screen-space reflections when post-processing and MSAA are off.
-- engine: Update MAX_MORPH_TARGETS constant to 256.
-- engine: Fix point light lighting with ortho projection.
-- libs: BlueGL symbols are now prefixed with `bluegl` on all platforms.
-- gltfio: Add skinning getters to `FilamentAsset`.
-
-## v1.20.4
-
-- gltfio: Java clients must now destroy the MaterialProvider [⚠️ **API Change**].
-- gltfio: Fix, bone pose not applied if glTF model doesn't have animations.
-- libs: Added `math::quat::fromDirectedRotation` [**NEW API**].
-- WebGL: Restore GL state when frame ends.
-
-## v1.20.3
-
-- Java: Fix URI bug in Android Viewer sample when dropping some zips.
-- Vulkan: Fix "uninitialized texture" warnings from the Vulkan backend.
-
-## v1.20.2
-
-- engine: Binary size optimizations.
-- engine: Fix, Mat4 from Quaternion was transposed.
-- Vulkan: Internal bug fixes and robustness improvements.
-- Vulkan: Reduced log spam.
-
-## v1.20.1
-
-- engine: Binary size improvements.
-- engine: Add basic support for instanced renderables [**NEW API**].
-- engine: Fix, first imaged passsed to `Stream::SetAcquiredImage` is ignored and leaked.
-- Vulkan: Robustness improvements.
-- Java: Fix, lookAt z axis negated.
-- gltfio: Be graceful when model has > 4 weights per vert.
-
-## v1.20.0
-
-- engine: Support rough screen-space reflections [⚠️ **Material breakage**].
-- engine: Added `Scene::forEach` API to iterate through a scene's entities.
-- engine: Fix incorrect normals with skinned models.
-- Vulkan: Fix segfault during shutdown.
-- WebGL: Support web apps that have multiple `FilamentViewer`s.
-- gltfio: Performance enhancements when loading models.
-
-## 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
-
-- engine: New night adaptation API on `ColorGrading`. This API can be used to create an effect that
-  that simulates color and brightness shifts in human vision in low-light conditions.
-- engine: improved performance of AMD FidelityFX FSR1 by 4.6x, it now runs in about 2ms in 4K.
-- engine: Dynamic resolution quality `MEDIUM`, `HIGH` and `ULTRA` now all use AMD FidelityFX FSR1.
-- engine: Fix crash when duplicating material instances.
-- gltfio: generate tangents if requested by the material.
-
-## v1.12.3
-
-- engine: Support AMD FidelityFX Super Resolution for dynamic resolution scaling
-
-## v1.12.2
-
-- 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.
-- engine: Increase the number of supported spot shadows to 14 (from 6).
-- Metal: Add texture swizzling support for external textures.
-
-## v1.12.1
-
-- engine: `double` precision translation support in TransformManager. Disabled by default.
-  Augment model (and view) matrix on `Camera` to accept double precision matrices. When enabled,
-  double precision translations allow filament to handle a very large world space [**New API**].
-- engine: Fix, Views with custom render targets are now blendable.
-
-## v1.12.0
-
-- engine: Option to automatically compute bent normals from SSAO & apply to specular AO
-  [⚠️ **Material breakage**].
-- engine: New APIs: Light channels. Geometry and lights now have a channel associated to them, at
-  least one channel must match for lighting to occur [⚠️ **Material breakage**].
-- engine: Fix potential GPU crash with punctual lights near the far clipping plane.
-- materials: The `inverseTonemap` API is now an exact inverse of the Filmic tonemapper.
-- Metal: Better support for texture formats on M1 Macs.
+## v1.11.3 (currently main branch)
 
 ## v1.11.2
 
@@ -766,7 +204,7 @@ devices.
 - engine: Fix RenderTarget NPE when depth is not present.
 - engine: Improvements to Camera APIs. Move focus distance from DofOptions to Camera.
 - engine: VSM shadows now support `shadowMultiplier`.
-- java: Expose several MaterialInstance APIs (setColorWrite, setDepthWrite, setDepthCulling) that
+- java: Expose severla MaterialInstance APIs (setColorWrite, setDepthWrite, setDepthCulling) that
   should have been public.
 - java: fix bug with Texture::setImage buffer size calculation.
 

android/Windows.md

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

android/build.gradle

@@ -1,43 +1,38 @@
 // This script accepts the following parameters:
 //
-// com.google.android.filament.dist-dir
+// 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.
 //
-// com.google.android.filament.tools-dir
+// filament_tools_dir
 //     Path to the Filament distribution/install directory for desktop.
 //     This directory must contain bin/matc.
 //
-// com.google.android.filament.exclude-vulkan
+// filament_exclude_vulkan
 //     When set, support for Vulkan will be excluded.
 //
-// com.google.android.filament.matdbg
-//     When set, enables matdbg
-//
-// com.google.android.filament.matnopt
-//     When set, disable shader optimizations.
-//
-// com.google.android.filament.skip-samples
+// filament_skip_samples
 //     Exclude samples from the project. Useful to speed up compilation.
 //
-// com.google.android.filament.abis
+// 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 -Pcom.google.android.filament.dist-dir=../dist-android-release \
-//               -Pcom.google.android.filament.abis=x86 \
-//               assembleRelease
+//     ./gradlew -Pfilament_dist_dir=../dist-android-release assembleRelease -Pfilament_abis=x86
 
 // Publishing to Maven Central:
 //   - Build and upload artifacts with ./gradlew publish
-//   - Close and release staging repo on Nexus with ./gradlew closeAndReleaseStagingRepository
+//   - Close and release staging repo on Nexus with ./gradlew closeAndReleaseRepository
 //
 // The following is needed in ~/gradle/gradle.properties:
 //
-//     sonatypeUsername=nexus_user
-//     sonatypePassword=nexus_password
+//     SONATYPE_NEXUS_USERNAME=nexus_user
+//     SONATYPE_NEXUS_PASSWORD=nexus_password
+//
+//     nexusUsername=nexus_user
+//     nexusPassword=nexus_password
 //
 //     signing.keyId=pgp_key_id
 //     signing.password=pgp_key_password
@@ -45,102 +40,73 @@
 //
 
 buildscript {
-    def path = providers
-            .gradleProperty("com.google.android.filament.dist-dir")
-            .get()
-
-    def directory = objects.fileProperty().fileValue(new File(path)).getAsFile().get()
-    def filamentPath = directory.absolutePath
-
+    def filamentPath = file("../out/android-release/filament").absolutePath
+    if (project.hasProperty("filament_dist_dir")) {
+        filamentPath = file(project.property("filament_dist_dir")).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 = providers
-            .gradleProperty("com.google.android.filament.exclude-vulkan")
-            .isPresent()
-
-    def matdbg = providers
-            .gradleProperty("com.google.android.filament.matdbg")
-            .isPresent()
-
-    def matnopt = providers
-            .gradleProperty("com.google.android.filament.matnopt")
-            .isPresent()
+    def excludeVulkan = project.hasProperty("filament_exclude_vulkan")
 
     def abis = ["arm64-v8a", "armeabi-v7a", "x86_64", "x86"]
-    def newAbis = providers
-            .gradleProperty("com.google.android.filament.abis")
-            .get()
-            .split(',')
-    if (!newAbis.contains("all")) {
-        abis = newAbis
+    if (project.hasProperty("filament_abis")) {
+        def newAbis = project.property("filament_abis").split(',')
+        if (!newAbis.contains("all")) {
+            abis = newAbis
+        }
     }
 
     ext.versions = [
-        'jdk': 17,
         'minSdk': 19,
-        'targetSdk': 33,
-        'compileSdk': 33,
-        'kotlin': '1.8.20',
-        'kotlin_coroutines': '1.6.4',
-        'buildTools': '33.0.2',
-        'ndk': '25.1.8937393',
-        'androidx_core': '1.10.0',
-        'androidx_annotations': '1.3.0'
+        'targetSdk': 30,
+        'compileSdk': 30,
+        'kotlin': '1.5.21',
+        'buildTools': '30.0.3',
+        'ndk': '22.1.7171670'
     ]
 
     ext.deps = [
         'androidx': [
-            'annotations': "androidx.annotation:annotation:${versions.androidx_annotations}",
-            'core': "androidx.core:core:${versions.androidx_core}",
+            'annotations': "androidx.annotation:annotation:1.1.0",
+            'core': "androidx.core:core:1.3.0",
         ],
-        '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}",
-        ]
+        'kotlin': "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
     ]
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
     }
 
     ext.cmakeArgs = [
-        "--no-warn-unused-cli",
         "-DANDROID_PIE=ON",
         "-DANDROID_PLATFORM=21",
         "-DANDROID_STL=c++_static",
         "-DFILAMENT_DIST_DIR=${filamentPath}".toString(),
-        "-DFILAMENT_SUPPORTS_VULKAN=${excludeVulkan ? 'OFF' : 'ON'}".toString(),
-        "-DFILAMENT_ENABLE_MATDBG=${matdbg ? 'ON' : 'OFF'}".toString(),
-        "-DFILAMENT_DISABLE_MATOPT=${matnopt ? 'ON' : 'OFF'}".toString()
+        "-DFILAMENT_SUPPORTS_VULKAN=${excludeVulkan ? 'OFF' : 'ON'}".toString()
     ]
 
     ext.cppFlags = [
         "-std=c++17",
+        "-Wno-unused-command-line-argument",
+        "-Wl,--hash-style=both", // Required to support API levels below 23
         "-fno-stack-protector",
         "-fno-exceptions",
         "-fno-unwind-tables",
         "-fno-asynchronous-unwind-tables",
         "-fno-rtti",
         "-ffast-math",
-        "-fno-finite-math-only",
         "-ffp-contract=fast",
         "-fvisibility-inlines-hidden",
         "-fvisibility=hidden",
         "-fomit-frame-pointer",
         "-ffunction-sections",
         "-fdata-sections",
-        "-no-canonical-prefixes",
-        "-Wformat",
-        "-Werror=format-security",
-        "-Wno-unused-command-line-argument",
         "-Wl,--gc-sections",
         "-Wl,-Bsymbolic-functions",
-        "-Wl,--hash-style=both", // Required to support API levels below 23
     ]
 
     ext.abis = abis
@@ -152,18 +118,14 @@ buildscript {
 }
 
 plugins {
-    id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
+    id 'io.codearte.nexus-staging' version '0.22.0'
 }
 
-// See https://github.com/gradle-nexus/publish-plugin
-// Publish to https://oss.sonatype.org/ (not s01)
-nexusPublishing {
+// Nexus Staging configuration
+// See https://github.com/Codearte/gradle-nexus-staging-plugin/
+nexusStaging {
     packageGroup = 'com.google.android'
-    repositories {
-        sonatype {
-            stagingProfileId = '9a75a224a4f17b'
-        }
-    }
+    stagingProfileId = '9a75a224a4f17b'
 }
 
 subprojects {
@@ -195,7 +157,6 @@ subprojects {
                 }
 
                 ndk {
-                    //noinspection ChromeOsAbiSupport
                     abiFilters(*rootProject.ext.abis)
                 }
 
@@ -216,8 +177,8 @@ subprojects {
             }
 
             compileOptions {
-                sourceCompatibility versions.jdk
-                targetCompatibility versions.jdk
+                sourceCompatibility JavaVersion.VERSION_1_8
+                targetCompatibility JavaVersion.VERSION_1_8
             }
         }
     }
@@ -226,8 +187,7 @@ subprojects {
 gradle.taskGraph.whenReady {
     gradle.taskGraph.allTasks.each {
         it.onlyIf {
-            !it.project.ext.has('isSample') ||
-                    !project.hasProperty('com.google.android.filament.skip-samples')
+            !it.project.ext.has('isSample') || !project.hasProperty('filament_skip_samples')
          }
     }
 }

android/buildSrc/build.gradle

@@ -1,16 +1,3 @@
-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,22 +1,20 @@
 // This plugin accepts the following parameters:
 //
-// com.google.android.filament.tools-dir
+// filament_tools_dir
 //     Path to the Filament distribution/install directory for desktop.
 //     This directory must contain bin/matc.
 //
-// com.google.android.filament.exclude-vulkan
+// filament_exclude_vulkan
 //     When set, support for Vulkan will be excluded.
 //
 // Example:
-//     ./gradlew -Pcom.google.android.filament.tools-dir=../../dist-release assembleDebug
+//     ./gradlew -Pfilament_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
@@ -29,18 +27,14 @@ 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
 
-import javax.inject.Inject
-
-abstract class TaskWithBinary extends DefaultTask {
+class TaskWithBinary extends DefaultTask {
     private final String binaryName
     private Property<String> binaryPath = null
 
@@ -48,23 +42,15 @@ abstract 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 ->
-                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()
+                Paths.get(project.ext.filamentToolsPath.absolutePath, path).toFile()
             }
 
-            binaryPath = objects.property(String.class)
+            binaryPath = project.objects.property(String.class)
             binaryPath.set(
                     (OperatingSystem.current().isWindows() ? fullPath[0] : fullPath[1]).toString())
         }
@@ -98,11 +84,6 @@ 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")
     }
@@ -110,9 +91,7 @@ abstract class MaterialCompiler extends TaskWithBinary {
     @TaskAction
     void execute(InputChanges inputs) {
         if (!inputs.incremental) {
-            fs.delete({
-                delete(objects.fileTree().from(outputDir).matching { include '*.filamat' })
-            })
+            project.delete(project.fileTree(outputDir.asFile.get()).matching { include '*.filamat' })
         }
 
         inputs.getFileChanges(inputDir).each { InputFileDetails change ->
@@ -136,23 +115,12 @@ abstract class MaterialCompiler extends TaskWithBinary {
                 }
 
                 def matcArgs = []
-                def exclude_vulkan = providers
-                        .gradleProperty("com.google.android.filament.exclude-vulkan")
-                        .forUseAtConfigurationTime().present
-                if (!exclude_vulkan) {
+                if (!project.hasProperty("filament_exclude_vulkan")) {
                     matcArgs += ['-a', 'vulkan']
                 }
-
-                def mat_no_opt = providers
-                        .gradleProperty("com.google.android.filament.matnopt")
-                        .forUseAtConfigurationTime().present
-                if (mat_no_opt) {
-                    matcArgs += ['-g']
-                }
-
                 matcArgs += ['-a', 'opengl', '-p', 'mobile', '-o', getOutputFile(file), file]
 
-                exec.exec {
+                project.exec {
                     standardOutput out
                     errorOutput err
                     executable "${binary.get()}"
@@ -181,10 +149,6 @@ abstract class IblGenerator extends TaskWithBinary {
     @OutputDirectory
     abstract DirectoryProperty getOutputDir()
 
-    @Inject abstract FileSystemOperations getFs()
-    @Inject abstract ExecOperations getExec()
-    @Inject abstract ObjectFactory getObjects()
-
     IblGenerator() {
         super("cmgen")
     }
@@ -192,9 +156,7 @@ abstract class IblGenerator extends TaskWithBinary {
     @TaskAction
     void execute(InputChanges inputs) {
         if (!inputs.incremental) {
-            fs.delete({
-                delete(objects.fileTree().from(outputDir).matching { include '*' })
-            })
+            project.delete(project.fileTree(outputDir.asFile.get()).matching { include '*' })
         }
 
         inputs.getFileChanges(inputFile).each { InputFileDetails change ->
@@ -226,7 +188,7 @@ abstract class IblGenerator extends TaskWithBinary {
                 }
                 commandArgs = commandArgs + " " + file
 
-                exec.exec {
+                project.exec {
                     standardOutput out
                     errorOutput err
                     executable "${binary.get()}"
@@ -251,9 +213,6 @@ abstract class MeshCompiler extends TaskWithBinary {
     @OutputDirectory
     abstract DirectoryProperty getOutputDir()
 
-    @Inject abstract FileSystemOperations getFs()
-    @Inject abstract ExecOperations getExec()
-
     MeshCompiler() {
         super("filamesh")
     }
@@ -261,9 +220,7 @@ abstract class MeshCompiler extends TaskWithBinary {
     @TaskAction
     void execute(InputChanges inputs) {
         if (!inputs.incremental) {
-            fs.delete({
-                delete(objects.fileTree().from(outputDir).matching { include '*.filamesh' })
-            })
+            project.delete(project.fileTree(outputDir.asFile.get()).matching { include '*.filamesh' })
         }
 
         inputs.getFileChanges(inputFile).each { InputFileDetails change ->
@@ -286,7 +243,7 @@ abstract class MeshCompiler extends TaskWithBinary {
                             " Ensure Filament has been built/installed before building this app.")
                 }
 
-                exec.exec {
+                project.exec {
                     standardOutput out
                     errorOutput err
                     executable "${binary.get()}"
@@ -323,6 +280,11 @@ 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,10 +16,8 @@
 
 #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,
@@ -34,7 +32,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);
         }
@@ -45,12 +43,59 @@ 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) {
@@ -58,63 +103,17 @@ JniCallback* JniCallback::make(JNIEnv* env, jobject handler, jobject callback) {
 }
 
 JniCallback::JniCallback(JNIEnv* env, jobject handler, jobject callback)
-        : mHandler(env->NewGlobalRef(handler)),
-          mCallback(env->NewGlobalRef(callback)) {
+        : mEnv(env)
+        , mHandler(env->NewGlobalRef(handler))
+        , mCallback(env->NewGlobalRef(callback)) {
     acquireCallbackJni(env, mCallbackUtils);
 }
 
-JniCallback::~JniCallback() = default;
-
-void JniCallback::post(void* user, filament::backend::CallbackHandler::Callback callback) {
-    callback(user);
+JniCallback::~JniCallback() {
+    releaseCallbackJni(mEnv, mCallbackUtils, mHandler, mCallback);
 }
 
-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;
+void JniCallback::invoke(void* user) {
+    JniCallback* data = reinterpret_cast<JniCallback*>(user);
+    delete data;
 }

android/common/CallbackUtils.h

@@ -18,14 +18,13 @@
 
 #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
@@ -36,60 +35,57 @@ struct CallbackJni {
 void acquireCallbackJni(JNIEnv* env, CallbackJni& callbackUtils);
 void releaseCallbackJni(JNIEnv* env, CallbackJni callbackUtils, jobject handler, jobject callback);
 
-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
+struct JniBufferCallback {
     static JniBufferCallback* make(filament::Engine* engine,
             JNIEnv* env, jobject handler, jobject callback, AutoBuffer&& buffer);
 
-    // execute the callback on the java thread and destroy ourselves
-    static void postToJavaAndDestroy(void*, size_t, void* user);
+    static void invoke(void* buffer, size_t n, void* user);
 
 private:
     JniBufferCallback(JNIEnv* env, jobject handler, jobject callback, AutoBuffer&& buffer);
-    virtual ~JniBufferCallback();
+    JniBufferCallback(JniBufferCallback const &) = delete;
+    JniBufferCallback(JniBufferCallback&&) = delete;
+    ~JniBufferCallback();
+
+    JNIEnv* mEnv;
+    jobject mHandler;
+    jobject mCallback;
     AutoBuffer mBuffer;
+    CallbackJni mCallbackUtils;
 };
 
-struct JniImageCallback : public JniCallback {
-    // create a JniImageCallback
+struct JniImageCallback {
     static JniImageCallback* make(filament::Engine* engine, JNIEnv* env, jobject handler,
             jobject runnable, long image);
 
-    // execute the callback on the java thread and destroy ourselves
-    static void postToJavaAndDestroy(void*, void* user);
+    static void invoke(void* image, void* user);
 
 private:
     JniImageCallback(JNIEnv* env, jobject handler, jobject runnable, long image);
-    virtual ~JniImageCallback();
+    JniImageCallback(JniImageCallback const &) = delete;
+    JniImageCallback(JniImageCallback&&) = delete;
+    ~JniImageCallback();
+
+    JNIEnv* mEnv;
+    jobject mHandler;
+    jobject mCallback;
     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,10 +38,6 @@ public:
     AutoBuffer(AutoBuffer&& rhs) noexcept;
     ~AutoBuffer() noexcept;
 
-    void attachToJniThread(JNIEnv* env) noexcept {
-        mEnv = env;
-    }
-
     void* getData() const noexcept {
         return mUserData;
     }

android/filamat-android/build.gradle

@@ -1,6 +1,4 @@
 android {
-    namespace 'com.google.android.filament.filamat'
-
     flavorDimensions "functionality"
     productFlavors {
         full {
@@ -17,17 +15,6 @@ android {
             }
         }
     }
-
-    publishing {
-        singleVariant("fullRelease") {
-            withSourcesJar()
-            withJavadocJar()
-        }
-        singleVariant("liteRelease") {
-            withSourcesJar()
-            withJavadocJar()
-        }
-    }
 }
 
 dependencies {

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

@@ -126,8 +126,8 @@ Java_com_google_android_filament_filamat_MaterialBuilder_nMaterialBuilderUniform
         JNIEnv* env, jclass, jlong nativeBuilder, jint uniformType, jint precision, jstring name_) {
     auto builder = (MaterialBuilder*) nativeBuilder;
     const char* name = env->GetStringUTFChars(name_, nullptr);
-    builder->parameter(name, (MaterialBuilder::UniformType) uniformType,
-            (MaterialBuilder::ParameterPrecision) precision);
+    builder->parameter((MaterialBuilder::UniformType) uniformType,
+            (MaterialBuilder::ParameterPrecision) precision, name);
     env->ReleaseStringUTFChars(name_, name);
 }
 
@@ -137,8 +137,8 @@ Java_com_google_android_filament_filamat_MaterialBuilder_nMaterialBuilderUniform
         jstring name_) {
     auto builder = (MaterialBuilder*) nativeBuilder;
     const char* name = env->GetStringUTFChars(name_, nullptr);
-    builder->parameter(name, (size_t) size, (MaterialBuilder::UniformType) uniformType,
-            (MaterialBuilder::ParameterPrecision) precision);
+    builder->parameter((MaterialBuilder::UniformType) uniformType, (size_t) size,
+            (MaterialBuilder::ParameterPrecision) precision, name);
     env->ReleaseStringUTFChars(name_, name);
 }
 
@@ -148,8 +148,9 @@ Java_com_google_android_filament_filamat_MaterialBuilder_nMaterialBuilderSampler
         jint precision, jstring name_) {
     auto builder = (MaterialBuilder*) nativeBuilder;
     const char* name = env->GetStringUTFChars(name_, nullptr);
-    builder->parameter(name, (MaterialBuilder::SamplerType) samplerType,
-            (MaterialBuilder::SamplerFormat) format, (MaterialBuilder::ParameterPrecision) precision);
+    builder->parameter((MaterialBuilder::SamplerType) samplerType,
+            (MaterialBuilder::SamplerFormat) format, (MaterialBuilder::ParameterPrecision) precision,
+            name);
     env->ReleaseStringUTFChars(name_, name);
 }
 
@@ -250,13 +251,6 @@ Java_com_google_android_filament_filamat_MaterialBuilder_nMaterialBuilderMaskThr
     builder->maskThreshold(maskThreshold);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_filamat_MaterialBuilder_nMaterialBuilderAlphaToCoverage(JNIEnv*,
-        jclass, jlong nativeBuilder, jboolean enable) {
-    auto builder = (MaterialBuilder*) nativeBuilder;
-    builder->alphaToCoverage(enable);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_filamat_MaterialBuilder_nMaterialBuilderShadowMultiplier(
         JNIEnv*, jclass, jlong nativeBuilder, jboolean shadowMultiplier) {
@@ -376,10 +370,3 @@ 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

@@ -133,7 +133,7 @@ public class MaterialBuilder {
         FADE,                   // material is transparent and color is alpha-pre-multiplied,
                                 // affects specular lighting
         MULTIPLY,               // material darkens what's behind it
-        SCREEN                  // material brightens what's behind it
+        SCREN                   // material brightens what's behind it
     }
 
     public enum VertexDomain {
@@ -360,12 +360,6 @@ public class MaterialBuilder {
         return this;
     }
 
-    @NonNull
-    public MaterialBuilder alphaToCoverage(boolean enable) {
-        nMaterialBuilderAlphaToCoverage(mNativeObject, enable);
-        return this;
-    }
-
     @NonNull
     public MaterialBuilder shadowMultiplier(boolean shadowMultiplier) {
         nMaterialBuilderShadowMultiplier(mNativeObject, shadowMultiplier);
@@ -465,19 +459,6 @@ 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;
     }
 
@@ -590,7 +571,6 @@ public class MaterialBuilder {
     private static native void nMaterialBuilderDepthCulling(long nativeBuilder, boolean enable);
     private static native void nMaterialBuilderDoubleSided(long nativeBuilder, boolean doubleSided);
     private static native void nMaterialBuilderMaskThreshold(long nativeBuilder, float mode);
-    private static native void nMaterialBuilderAlphaToCoverage(long nativeBuilder, boolean enable);
 
     private static native void nMaterialBuilderShadowMultiplier(long mNativeObject,
             boolean shadowMultiplier);
@@ -619,5 +599,4 @@ 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,7 +74,6 @@ 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
@@ -126,7 +125,6 @@ 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/build.gradle

@@ -1,14 +1,3 @@
-android {
-    namespace 'com.google.android.filament'
-
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-            withJavadocJar()
-        }
-    }
-}
-
 dependencies {
     implementation deps.androidx.annotations
 }

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

@@ -91,8 +91,7 @@ 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,
-            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
+    BufferDescriptor desc(data, sizeInBytes, &JniBufferCallback::invoke, callback);
 
     bufferObject->setBuffer(*engine, std::move(desc), (uint32_t) destOffsetInBytes);
 

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

@@ -84,13 +84,13 @@ Java_com_google_android_filament_Camera_nLookAt(JNIEnv*, jclass, jlong nativeCam
     camera->lookAt({eye_x, eye_y, eye_z}, {center_x, center_y, center_z}, {up_x, up_y, up_z});
 }
 
-extern "C" JNIEXPORT jdouble JNICALL
+extern "C" JNIEXPORT jfloat JNICALL
 Java_com_google_android_filament_Camera_nGetNear(JNIEnv*, jclass, jlong nativeCamera) {
     Camera *camera = (Camera *) nativeCamera;
     return camera->getNear();
 }
 
-extern "C" JNIEXPORT jdouble JNICALL
+extern "C" JNIEXPORT jfloat JNICALL
 Java_com_google_android_filament_Camera_nGetCullingFar(JNIEnv*, jclass,
         jlong nativeCamera) {
     Camera *camera = (Camera *) nativeCamera;
@@ -102,19 +102,10 @@ Java_com_google_android_filament_Camera_nSetModelMatrix(JNIEnv *env, jclass,
         jlong nativeCamera, jfloatArray in_) {
     Camera* camera = (Camera *) nativeCamera;
     jfloat *in = env->GetFloatArrayElements(in_, NULL);
-    camera->setModelMatrix((math::mat4)*reinterpret_cast<const filament::math::mat4f*>(in));
+    camera->setModelMatrix(*reinterpret_cast<const filament::math::mat4f*>(in));
     env->ReleaseFloatArrayElements(in_, in, JNI_ABORT);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Camera_nSetModelMatrixFp64(JNIEnv *env, jclass,
-        jlong nativeCamera, jdoubleArray in_) {
-    Camera* camera = (Camera *) nativeCamera;
-    jdouble *in = env->GetDoubleArrayElements(in_, NULL);
-    camera->setModelMatrix(*reinterpret_cast<const filament::math::mat4*>(in));
-    env->ReleaseDoubleArrayElements(in_, in, JNI_ABORT);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_Camera_nGetProjectionMatrix(JNIEnv *env, jclass,
         jlong nativeCamera, jdoubleArray out_) {
@@ -150,41 +141,21 @@ Java_com_google_android_filament_Camera_nGetModelMatrix(JNIEnv *env, jclass,
         jlong nativeCamera, jfloatArray out_) {
     Camera *camera = (Camera *) nativeCamera;
     jfloat *out = env->GetFloatArrayElements(out_, NULL);
-    const filament::math::mat4f& m = (math::mat4f)camera->getModelMatrix();
+    const filament::math::mat4f& m = camera->getModelMatrix();
     std::copy_n(&m[0][0], 16, out);
     env->ReleaseFloatArrayElements(out_, out, 0);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Camera_nGetModelMatrixFp64(JNIEnv *env, jclass,
-        jlong nativeCamera, jdoubleArray out_) {
-    Camera *camera = (Camera *) nativeCamera;
-    jdouble *out = env->GetDoubleArrayElements(out_, NULL);
-    const filament::math::mat4& m = camera->getModelMatrix();
-    std::copy_n(&m[0][0], 16, out);
-    env->ReleaseDoubleArrayElements(out_, out, 0);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_Camera_nGetViewMatrix(JNIEnv *env, jclass, jlong nativeCamera,
         jfloatArray out_) {
     Camera *camera = (Camera *) nativeCamera;
     jfloat *out = env->GetFloatArrayElements(out_, NULL);
-    const filament::math::mat4f& m = (math::mat4f)camera->getViewMatrix();
+    const filament::math::mat4f& m = camera->getViewMatrix();
     std::copy_n(&m[0][0], 16, out);
     env->ReleaseFloatArrayElements(out_, out, 0);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Camera_nGetViewMatrixFp64(JNIEnv *env, jclass, jlong nativeCamera,
-        jdoubleArray out_) {
-    Camera *camera = (Camera *) nativeCamera;
-    jdouble *out = env->GetDoubleArrayElements(out_, NULL);
-    const filament::math::mat4& m = camera->getViewMatrix();
-    std::copy_n(&m[0][0], 16, out);
-    env->ReleaseDoubleArrayElements(out_, out, 0);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_Camera_nGetPosition(JNIEnv *env, jclass, jlong nativeCamera,
         jfloatArray out_) {

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

@@ -50,19 +50,6 @@ 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_) {
@@ -89,13 +76,6 @@ Java_com_google_android_filament_ColorGrading_nBuilderLuminanceScaling(JNIEnv*,
     builder->luminanceScaling(luminanceScaling);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_ColorGrading_nBuilderGamutMapping(JNIEnv*, jclass,
-        jlong nativeBuilder, jboolean gamutMapping) {
-    ColorGrading::Builder* builder = (ColorGrading::Builder*) nativeBuilder;
-    builder->gamutMapping(gamutMapping);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_ColorGrading_nBuilderExposure(JNIEnv*, jclass,
         jlong nativeBuilder, jfloat exposure) {
@@ -103,13 +83,6 @@ Java_com_google_android_filament_ColorGrading_nBuilderExposure(JNIEnv*, jclass,
     builder->exposure(exposure);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_ColorGrading_nBuilderNightAdaptation(JNIEnv*, jclass,
-        jlong nativeBuilder, jfloat adaptation) {
-    ColorGrading::Builder* builder = (ColorGrading::Builder*) nativeBuilder;
-    builder->nightAdaptation(adaptation);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_ColorGrading_nBuilderWhiteBalance(JNIEnv*, jclass,
         jlong nativeBuilder, jfloat temperature, jfloat tint) {

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

@@ -45,11 +45,12 @@ 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*, jclass, jlong nativeEngine) {
+Java_com_google_android_filament_Engine_nGetBackend(JNIEnv* env,
+        jclass klass, jlong nativeEngine) {
     Engine* engine = (Engine*) nativeEngine;
     return (jlong) engine->getBackend();
 }
@@ -63,8 +64,8 @@ Java_com_google_android_filament_Engine_nCreateSwapChain(JNIEnv* env,
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_Engine_nCreateSwapChainHeadless(JNIEnv*,
-        jclass, jlong nativeEngine, jint width, jint height, jlong flags) {
+Java_com_google_android_filament_Engine_nCreateSwapChainHeadless(JNIEnv* env,
+        jclass klass, jlong nativeEngine, jint width, jint height, jlong flags) {
     Engine* engine = (Engine*) nativeEngine;
     return (jlong) engine->createSwapChain(width, height, (uint64_t) flags);
 }
@@ -80,7 +81,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);
 }
 
@@ -97,7 +98,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);
 }
 
@@ -114,7 +115,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);
 }
 
@@ -157,7 +158,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);
 }
 
@@ -174,7 +175,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);
 }
 
@@ -184,7 +185,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);
 }
 
@@ -194,7 +195,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);
 }
 
@@ -202,23 +203,15 @@ 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);
 }
 
@@ -226,7 +219,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);
 }
 
@@ -242,7 +235,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);
 }
 
@@ -258,7 +251,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);
 }
 
@@ -279,7 +272,7 @@ Java_com_google_android_filament_Engine_nDestroyEntity(JNIEnv*, jclass,
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Engine_nFlushAndWait(JNIEnv*, jclass,
+Java_com_google_android_filament_Engine_nFlushAndWait(JNIEnv *env, jclass clazz,
         jlong nativeEngine) {
     Engine* engine = (Engine*) nativeEngine;
     engine->flushAndWait();
@@ -288,19 +281,22 @@ Java_com_google_android_filament_Engine_nFlushAndWait(JNIEnv*, jclass,
 // 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();
 }
@@ -316,36 +312,3 @@ Java_com_google_android_filament_Engine_nGetEntityManager(JNIEnv*, jclass, jlong
     Engine* engine = (Engine*) nativeEngine;
     return (jlong) &engine->getEntityManager();
 }
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Engine_nSetAutomaticInstancingEnabled(JNIEnv*, jclass, jlong nativeEngine, jboolean enable) {
-    Engine* engine = (Engine*) nativeEngine;
-    engine->setAutomaticInstancingEnabled(enable);
-}
-
-extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_Engine_nIsAutomaticInstancingEnabled(JNIEnv*, jclass, jlong nativeEngine) {
-    Engine* engine = (Engine*) nativeEngine;
-    return (jboolean)engine->isAutomaticInstancingEnabled();
-}
-
-extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_Engine_nGetSupportedFeatureLevel(JNIEnv *, jclass,
-        jlong nativeEngine) {
-    Engine* engine = (Engine*) nativeEngine;
-    return (jint)engine->getSupportedFeatureLevel();
-}
-
-extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_Engine_nSetActiveFeatureLevel(JNIEnv *, jclass,
-        jlong nativeEngine, jint ordinal) {
-    Engine* engine = (Engine*) nativeEngine;
-    return (jint)engine->setActiveFeatureLevel((Engine::FeatureLevel)ordinal);
-}
-
-extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_Engine_nGetActiveFeatureLevel(JNIEnv *, jclass,
-        jlong nativeEngine) {
-    Engine* engine = (Engine*) nativeEngine;
-    return (jint)engine->getActiveFeatureLevel();
-}

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

@@ -16,7 +16,9 @@
 
 #include <jni.h>
 
-#include "private/backend/VirtualMachineEnv.h"
+namespace filament {
+    extern jint JNI_OnLoad(JavaVM* vm, void* reserved);
+};
 
 JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     JNIEnv* env;
@@ -24,9 +26,9 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
         return -1;
     }
 
-    // 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);
+#if ANDROID
+    ::filament::JNI_OnLoad(vm, reserved);
+#endif
 
     return JNI_VERSION_1_6;
 }

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

@@ -91,8 +91,7 @@ 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,
-            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
+    BufferDescriptor desc(data, sizeInBytes, &JniBufferCallback::invoke, callback);
 
     indexBuffer->setBuffer(*engine, std::move(desc), (uint32_t) destOffsetInBytes);
 

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

@@ -76,10 +76,8 @@ 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 lispsm,
-        jfloat polygonOffsetConstant, jfloat polygonOffsetSlope,
-        jboolean screenSpaceContactShadows, jint stepCount,
-        jfloat maxShadowDistance, jboolean elvsm, jfloat blurWidth, jfloat shadowBulbRadius) {
+        jfloat shadowFarHint, jboolean stable, jboolean screenSpaceContactShadows, jint stepCount,
+        jfloat maxShadowDistance, jint vsmMsaaSamples, jfloat blurWidth) {
     LightManager::Builder *builder = (LightManager::Builder *) nativeBuilder;
     LightManager::ShadowOptions shadowOptions {
             .mapSize = (uint32_t)mapSize,
@@ -90,17 +88,13 @@ Java_com_google_android_filament_LightManager_nBuilderShadowOptions(JNIEnv* env,
             .shadowNearHint = shadowNearHint,
             .shadowFarHint = shadowFarHint,
             .stable = (bool)stable,
-            .lispsm = (bool)lispsm,
-            .polygonOffsetConstant = polygonOffsetConstant,
-            .polygonOffsetSlope = polygonOffsetConstant,
             .screenSpaceContactShadows = (bool)screenSpaceContactShadows,
             .stepCount = uint8_t(stepCount),
             .maxShadowDistance = maxShadowDistance,
             .vsm = {
-                    .elvsm = (bool)elvsm,
+                    .msaaSamples = (uint8_t) vsmMsaaSamples,
                     .blurWidth = blurWidth
-            },
-            .shadowBulbRadius = shadowBulbRadius
+            }
     };
     jfloat *nativeSplits = env->GetFloatArrayElements(splitPositions, NULL);
     const jsize splitCount = std::min((jsize) 3, env->GetArrayLength(splitPositions));
@@ -195,23 +189,6 @@ Java_com_google_android_filament_LightManager_nBuilderHaloFalloff(JNIEnv*, jclas
     builder->sunHaloFalloff(haloFalloff);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_LightManager_nBuilderLightChannel(JNIEnv*, jclass,
-        jlong nativeBuilder, jint channel, jboolean enable) {
-    LightManager::Builder *builder = (LightManager::Builder *) nativeBuilder;
-    builder->lightChannel(channel, (bool)enable);
-}
-
-extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_LightManager_nBuilderBuild(JNIEnv*, jclass,
-        jlong nativeBuilder, jlong nativeEngine, jint entity) {
-    LightManager::Builder *builder = (LightManager::Builder *) nativeBuilder;
-    Engine *engine = (Engine *) nativeEngine;
-    return jboolean(builder->build(*engine, (Entity &) entity) == LightManager::Builder::Success);
-}
-
-// ------------------------------------------------------------------------------------------------
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_LightManager_nComputeUniformSplits(JNIEnv* env, jclass,
         jfloatArray splitPositions, jint cascades) {
@@ -236,7 +213,13 @@ Java_com_google_android_filament_LightManager_nComputePracticalSplits(JNIEnv* en
     env->ReleaseFloatArrayElements(splitPositions, nativeSplits, 0);
 }
 
-// ------------------------------------------------------------------------------------------------
+extern "C" JNIEXPORT jboolean JNICALL
+Java_com_google_android_filament_LightManager_nBuilderBuild(JNIEnv*, jclass,
+        jlong nativeBuilder, jlong nativeEngine, jint entity) {
+    LightManager::Builder *builder = (LightManager::Builder *) nativeBuilder;
+    Engine *engine = (Engine *) nativeEngine;
+    return jboolean(builder->build(*engine, (Entity &) entity) == LightManager::Builder::Success);
+}
 
 extern "C" JNIEXPORT jint JNICALL
 Java_com_google_android_filament_LightManager_nGetType(JNIEnv* env,
@@ -411,17 +394,3 @@ Java_com_google_android_filament_LightManager_nGetInnerConeAngle(JNIEnv*, jclass
     LightManager *lm = (LightManager *) nativeLightManager;
     return (jfloat)lm->getSpotLightInnerCone((LightManager::Instance) i);
 }
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_LightManager_nSetLightChannel(JNIEnv*, jclass,
-        jlong nativeLightManager, jint i, jint channel, jboolean enable) {
-    LightManager *lm = (LightManager *) nativeLightManager;
-    lm->setLightChannel((LightManager::Instance) i, channel, (bool)enable);
-}
-
-extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_LightManager_nGetLightChannel(JNIEnv*, jclass,
-        jlong nativeLightManager, jint i, jint channel) {
-    LightManager const *lm = (LightManager const *) nativeLightManager;
-    return lm->getLightChannel((LightManager::Instance) i, channel);
-}

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

@@ -153,14 +153,6 @@ Java_com_google_android_filament_Material_nIsDoubleSided(JNIEnv*, jclass,
     return (jboolean) material->isDoubleSided();
 }
 
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_Material_nIsAlphaToCoverageEnabled(JNIEnv*, jclass,
-        jlong nativeMaterial) {
-    Material* material = (Material*) nativeMaterial;
-    return (jboolean) material->isAlphaToCoverageEnabled();
-}
-
 extern "C"
 JNIEXPORT jfloat JNICALL
 Java_com_google_android_filament_Material_nGetMaskThreshold(JNIEnv*, jclass,

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

@@ -341,14 +341,6 @@ Java_com_google_android_filament_MaterialInstance_nSetDepthWrite(JNIEnv*,
     instance->setDepthWrite(enable);
 }
 
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_MaterialInstance_nSetStencilWrite(JNIEnv*, jclass,
-        jlong nativeMaterialInstance, jboolean enable) {
-    MaterialInstance* instance = (MaterialInstance*) nativeMaterialInstance;
-    instance->setStencilWrite(enable);
-}
-
 extern "C"
 JNIEXPORT void JNICALL
 Java_com_google_android_filament_MaterialInstance_nSetDepthCulling(JNIEnv*,
@@ -357,70 +349,6 @@ Java_com_google_android_filament_MaterialInstance_nSetDepthCulling(JNIEnv*,
     instance->setDepthCulling(enable);
 }
 
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_MaterialInstance_nSetStencilCompareFunction(JNIEnv*, jclass,
-        jlong nativeMaterialInstance, jlong function, jlong face) {
-    MaterialInstance* instance = (MaterialInstance*) nativeMaterialInstance;
-    instance->setStencilCompareFunction(
-            static_cast<MaterialInstance::StencilCompareFunc>(function),
-            static_cast<MaterialInstance::StencilFace>(face));
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_MaterialInstance_nSetStencilOpStencilFail(JNIEnv*, jclass,
-        jlong nativeMaterialInstance, jlong op, jlong face) {
-    MaterialInstance* instance = (MaterialInstance*) nativeMaterialInstance;
-    instance->setStencilOpStencilFail(
-            static_cast<MaterialInstance::StencilOperation>(op),
-            static_cast<MaterialInstance::StencilFace>(face));
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_MaterialInstance_nSetStencilOpDepthFail(JNIEnv*, jclass,
-        jlong nativeMaterialInstance, jlong op, jlong face) {
-    MaterialInstance* instance = (MaterialInstance*) nativeMaterialInstance;
-    instance->setStencilOpDepthFail(
-            static_cast<MaterialInstance::StencilOperation>(op),
-            static_cast<MaterialInstance::StencilFace>(face));
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_MaterialInstance_nSetStencilOpDepthStencilPass(JNIEnv*, jclass,
-        jlong nativeMaterialInstance, jlong op, jlong face) {
-    MaterialInstance* instance = (MaterialInstance*) nativeMaterialInstance;
-    instance->setStencilOpDepthStencilPass(
-            static_cast<MaterialInstance::StencilOperation>(op),
-            static_cast<MaterialInstance::StencilFace>(face));
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_MaterialInstance_nSetStencilReferenceValue(JNIEnv*, jclass,
-        jlong nativeMaterialInstance, jint value, jlong face) {
-    MaterialInstance* instance = (MaterialInstance*) nativeMaterialInstance;
-    instance->setStencilReferenceValue(value, static_cast<MaterialInstance::StencilFace>(face));
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_MaterialInstance_nSetStencilReadMask(JNIEnv*, jclass,
-        jlong nativeMaterialInstance, jint readMask, jlong face) {
-    MaterialInstance* instance = (MaterialInstance*) nativeMaterialInstance;
-    instance->setStencilReadMask(readMask, static_cast<MaterialInstance::StencilFace>(face));
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_MaterialInstance_nSetStencilWriteMask(JNIEnv*, jclass,
-        jlong nativeMaterialInstance, jint writeMask, jlong face) {
-    MaterialInstance* instance = (MaterialInstance*) nativeMaterialInstance;
-    instance->setStencilWriteMask(writeMask, static_cast<MaterialInstance::StencilFace>(face));
-}
-
 extern "C"
 JNIEXPORT jstring JNICALL
 Java_com_google_android_filament_MaterialInstance_nGetName(JNIEnv* env, jclass,
@@ -452,75 +380,3 @@ Java_com_google_android_filament_MaterialInstance_nDuplicate(JNIEnv* env, jclass
     }
     return (jlong)mi;
 }
-
-extern "C"
-JNIEXPORT jfloat JNICALL
-Java_com_google_android_filament_MaterialInstance_nGetMaskThreshold(JNIEnv* env, jclass clazz,
-        jlong nativeMaterialInstance) {
-    MaterialInstance* instance = (MaterialInstance*)nativeMaterialInstance;
-    return instance->getMaskThreshold();
-}
-
-extern "C"
-JNIEXPORT jfloat JNICALL
-Java_com_google_android_filament_MaterialInstance_nGetSpecularAntiAliasingVariance(JNIEnv* env,
-        jclass clazz, jlong nativeMaterialInstance) {
-    MaterialInstance* instance = (MaterialInstance*)nativeMaterialInstance;
-    return instance->getSpecularAntiAliasingVariance();
-}
-
-extern "C"
-JNIEXPORT jfloat JNICALL
-Java_com_google_android_filament_MaterialInstance_nGetSpecularAntiAliasingThreshold(JNIEnv* env,
-        jclass clazz, jlong nativeMaterialInstance) {
-    MaterialInstance* instance = (MaterialInstance*)nativeMaterialInstance;
-    return instance->getSpecularAntiAliasingThreshold();
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_MaterialInstance_nIsDoubleSided(JNIEnv* env, jclass clazz,
-        jlong nativeMaterialInstance) {
-    MaterialInstance* instance = (MaterialInstance*)nativeMaterialInstance;
-    return instance->isDoubleSided();
-}
-
-extern "C"
-JNIEXPORT jint JNICALL
-Java_com_google_android_filament_MaterialInstance_nGetCullingMode(JNIEnv* env, jclass clazz,
-        jlong nativeMaterialInstance) {
-    MaterialInstance* instance = (MaterialInstance*)nativeMaterialInstance;
-    return (jint)instance->getCullingMode();
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_MaterialInstance_nIsColorWriteEnabled(JNIEnv* env, jclass clazz,
-        jlong nativeMaterialInstance) {
-    MaterialInstance* instance = (MaterialInstance*)nativeMaterialInstance;
-    return instance->isColorWriteEnabled();
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_MaterialInstance_nIsDepthWriteEnabled(JNIEnv* env, jclass clazz,
-        jlong nativeMaterialInstance) {
-    MaterialInstance* instance = (MaterialInstance*)nativeMaterialInstance;
-    return instance->isDepthWriteEnabled();
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_MaterialInstance_nIsStencilWriteEnabled(JNIEnv* env, jclass clazz,
-        jlong nativeMaterialInstance) {
-    MaterialInstance* instance = (MaterialInstance*)nativeMaterialInstance;
-    return instance->isStencilWriteEnabled();
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_MaterialInstance_nIsDepthCullingEnabled(JNIEnv* env, jclass clazz,
-        jlong nativeMaterialInstance) {
-    MaterialInstance* instance = (MaterialInstance*)nativeMaterialInstance;
-    return instance->isDepthCullingEnabled();
-}

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

@@ -1,114 +0,0 @@
-/*
- * 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

@@ -120,14 +120,6 @@ Java_com_google_android_filament_RenderableManager_nBuilderBlendOrder(JNIEnv*, j
     builder->blendOrder((size_t) index, (uint16_t) blendOrder);
 }
 
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nBuilderGlobalBlendOrderEnabled(JNIEnv*, jclass,
-        jlong nativeBuilder, jint index, jboolean enabled) {
-    RenderableManager::Builder *builder = (RenderableManager::Builder *) nativeBuilder;
-    builder->globalBlendOrderEnabled((size_t) index, (bool) enabled);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_RenderableManager_nBuilderBoundingBox(JNIEnv*, jclass,
         jlong nativeBuilder, jfloat cx, jfloat cy, jfloat cz, jfloat ex, jfloat ey, jfloat ez) {
@@ -150,13 +142,6 @@ Java_com_google_android_filament_RenderableManager_nBuilderPriority(JNIEnv*, jcl
     builder->priority((uint8_t) priority);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nBuilderChannel(JNIEnv*, jclass,
-        jlong nativeBuilder, jint channel) {
-    RenderableManager::Builder *builder = (RenderableManager::Builder *) nativeBuilder;
-    builder->channel((uint8_t) channel);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_RenderableManager_nBuilderCulling(JNIEnv*, jclass,
         jlong nativeBuilder, jboolean enabled) {
@@ -201,19 +186,12 @@ Java_com_google_android_filament_RenderableManager_nBuilderSkinning(JNIEnv*, jcl
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nBuilderEnableSkinningBuffers(JNIEnv*, jclass,
+Java_com_google_android_filament_RenderableManager_nEnableSkinningBuffers(JNIEnv*, jclass,
         jlong nativeBuilder, jboolean enabled) {
     RenderableManager::Builder *builder = (RenderableManager::Builder *) nativeBuilder;
     builder->enableSkinningBuffers(enabled);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nBuilderFog(JNIEnv*, jclass,
-        jlong nativeBuilder, jboolean enabled) {
-    RenderableManager::Builder *builder = (RenderableManager::Builder *) nativeBuilder;
-    builder->fog(enabled);
-}
-
 extern "C" JNIEXPORT jint JNICALL
 Java_com_google_android_filament_RenderableManager_nBuilderSkinningBones(JNIEnv* env, jclass,
         jlong nativeBuilder, jint boneCount, jobject bones, jint remaining) {
@@ -231,36 +209,11 @@ Java_com_google_android_filament_RenderableManager_nBuilderSkinningBones(JNIEnv*
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_RenderableManager_nBuilderMorphing(JNIEnv*, jclass,
-        jlong nativeBuilder, jint targetCount) {
+        jlong nativeBuilder, jboolean enabled) {
     RenderableManager::Builder *builder = (RenderableManager::Builder *) nativeBuilder;
-    builder->morphing(targetCount);
+    builder->morphing(enabled);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nBuilderSetMorphTargetBufferAt(JNIEnv*, jclass,
-        jlong nativeBuilder, int level, int primitiveIndex, jlong nativeMorphTargetBuffer,
-        int offset, int count) {
-    RenderableManager::Builder *builder = (RenderableManager::Builder *) nativeBuilder;
-    MorphTargetBuffer *morphTargetBuffer = (MorphTargetBuffer *) nativeMorphTargetBuffer;
-    builder->morphing(level, primitiveIndex, morphTargetBuffer, offset, count);
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nBuilderLightChannel(JNIEnv*, jclass,
-        jlong nativeBuilder, jint channel, jboolean enable) {
-    RenderableManager::Builder *builder = (RenderableManager::Builder *) nativeBuilder;
-    builder->lightChannel(channel, (bool)enable);
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nBuilderInstances(JNIEnv*, jclass,
-        jlong nativeBuilder, jint instanceCount) {
-    RenderableManager::Builder *builder = (RenderableManager::Builder *) nativeBuilder;
-    builder->instances(instanceCount);
-}
-
-// ------------------------------------------------------------------------------------------------
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_RenderableManager_nSetSkinningBuffer(JNIEnv*, jclass,
         jlong nativeRenderableManager, jint i, jlong nativeSkinningBuffer, jint count, jint offset) {
@@ -305,29 +258,12 @@ 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, jint offset) {
+        jlong nativeRenderableManager, jint instance, jfloatArray weights) {
     RenderableManager *rm = (RenderableManager *) nativeRenderableManager;
     jfloat* vec = env->GetFloatArrayElements(weights, NULL);
-    jsize count = env->GetArrayLength(weights);
-    rm->setMorphWeights((RenderableManager::Instance)instance, vec, count, offset);
+    math::float4 floatvec(vec[0], vec[1], vec[2], vec[3]);
     env->ReleaseFloatArrayElements(weights, vec, JNI_ABORT);
-}
-
-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);
+    rm->setMorphWeights((RenderableManager::Instance)instance, floatvec);
 }
 
 extern "C" JNIEXPORT void JNICALL
@@ -353,13 +289,6 @@ Java_com_google_android_filament_RenderableManager_nSetPriority(JNIEnv*, jclass,
     rm->setPriority((RenderableManager::Instance) i, (uint8_t) priority);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nSetChannel(JNIEnv*, jclass,
-        jlong nativeRenderableManager, jint i, jint channel) {
-    RenderableManager *rm = (RenderableManager *) nativeRenderableManager;
-    rm->setChannel((RenderableManager::Instance) i, (uint8_t) channel);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_RenderableManager_nSetCulling(JNIEnv*, jclass,
         jlong nativeRenderableManager, jint i, jboolean enabled) {
@@ -367,20 +296,6 @@ Java_com_google_android_filament_RenderableManager_nSetCulling(JNIEnv*, jclass,
     rm->setCulling((RenderableManager::Instance) i, enabled);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nSetFogEnabled(JNIEnv*, jclass,
-        jlong nativeRenderableManager, jint i, jboolean enabled) {
-    RenderableManager *rm = (RenderableManager *) nativeRenderableManager;
-    rm->setFogEnabled((RenderableManager::Instance) i, enabled);
-}
-
-extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_RenderableManager_nGetFogEnabled(JNIEnv*, jclass,
-        jlong nativeRenderableManager, jint i) {
-    RenderableManager *rm = (RenderableManager *) nativeRenderableManager;
-    return (jboolean)rm->getFogEnabled((RenderableManager::Instance) i);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_RenderableManager_nSetCastShadows(JNIEnv*, jclass,
         jlong nativeRenderableManager, jint i, jboolean enabled) {
@@ -465,6 +380,15 @@ Java_com_google_android_filament_RenderableManager_nSetGeometryAt__JIIIJJII(JNIE
             (size_t) offset, (size_t) count);
 }
 
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_RenderableManager_nSetGeometryAt__JIIIII(JNIEnv*, jclass,
+        jlong nativeRenderableManager, jint i, jint primitiveIndex, jint primitiveType, jint offset,
+        jint count) {
+    RenderableManager *rm = (RenderableManager *) nativeRenderableManager;
+    rm->setGeometryAt((RenderableManager::Instance) i, (size_t) primitiveIndex,
+            (RenderableManager::PrimitiveType) primitiveType, (size_t) offset, (size_t) count);
+}
+
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_RenderableManager_nSetBlendOrderAt(JNIEnv*, jclass,
         jlong nativeRenderableManager, jint i, jint primitiveIndex, jint blendOrder) {
@@ -473,14 +397,6 @@ Java_com_google_android_filament_RenderableManager_nSetBlendOrderAt(JNIEnv*, jcl
             (uint16_t) blendOrder);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nSetGlobalBlendOrderEnabledAt(JNIEnv*, jclass,
-        jlong nativeRenderableManager, jint i, jint primitiveIndex, jboolean enabled) {
-    RenderableManager *rm = (RenderableManager *) nativeRenderableManager;
-    rm->setGlobalBlendOrderEnabledAt((RenderableManager::Instance) i, (size_t) primitiveIndex,
-            (bool) enabled);
-}
-
 extern "C" JNIEXPORT jint JNICALL
 Java_com_google_android_filament_RenderableManager_nGetEnabledAttributesAt(JNIEnv*, jclass,
         jlong nativeRenderableManager, jint i, jint primitiveIndex) {
@@ -488,17 +404,3 @@ Java_com_google_android_filament_RenderableManager_nGetEnabledAttributesAt(JNIEn
     AttributeBitset enabled = rm->getEnabledAttributesAt((RenderableManager::Instance) i, (size_t) primitiveIndex);
     return enabled.getValue();
 }
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_RenderableManager_nSetLightChannel(JNIEnv*, jclass,
-        jlong nativeRenderableManager, jint i, jint channel, jboolean enable) {
-    RenderableManager *rm = (RenderableManager *) nativeRenderableManager;
-    rm->setLightChannel((RenderableManager::Instance) i, channel, (bool)enable);
-}
-
-extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_RenderableManager_nGetLightChannel(JNIEnv*, jclass,
-        jlong nativeRenderableManager, jint i, jint channel) {
-    RenderableManager const *rm = (RenderableManager const *) nativeRenderableManager;
-    return rm->getLightChannel((RenderableManager::Instance) i, channel);
-}

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

@@ -97,8 +97,7 @@ 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,
-            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
+            (uint32_t) stride, &JniBufferCallback::invoke, callback);
 
     renderer->readPixels(uint32_t(xoffset), uint32_t(yoffset), uint32_t(width), uint32_t(height),
             std::move(desc));
@@ -133,8 +132,7 @@ 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,
-            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
+            (uint32_t) stride, &JniBufferCallback::invoke, callback);
 
     renderer->readPixels(renderTarget,
             uint32_t(xoffset), uint32_t(yoffset), uint32_t(width), uint32_t(height),
@@ -156,9 +154,12 @@ Java_com_google_android_filament_Renderer_nResetUserTime(JNIEnv*, jclass, jlong
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Renderer_nSetDisplayInfo(JNIEnv*, jclass, jlong nativeRenderer, jfloat refreshRate) {
+Java_com_google_android_filament_Renderer_nSetDisplayInfo(JNIEnv*, jclass, jlong nativeRenderer,
+        jfloat refreshRate, jlong presentationDeadlineNanos, jlong vsyncOffsetNanos) {
     Renderer *renderer = (Renderer *) nativeRenderer;
-    renderer->setDisplayInfo({ .refreshRate = refreshRate });
+    renderer->setDisplayInfo({ .refreshRate = refreshRate,
+                               .presentationDeadlineNanos = (uint64_t)presentationDeadlineNanos,
+                               .vsyncOffsetNanos = (uint64_t)vsyncOffsetNanos });
 }
 
 extern "C" JNIEXPORT void JNICALL
@@ -180,10 +181,3 @@ Java_com_google_android_filament_Renderer_nSetClearOptions(JNIEnv *, jclass ,
                                 .clear = (bool) clear,
                                 .discard = (bool) discard});
 }
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_Renderer_nSetPresentationTime(JNIEnv *, jclass ,
-    jlong nativeRenderer, jlong monotonicClockNanos) {
-    Renderer *renderer = (Renderer *) nativeRenderer;
-    renderer->setPresentationTime(monotonicClockNanos);
-}

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

@@ -83,11 +83,3 @@ Java_com_google_android_filament_Scene_nGetLightCount(JNIEnv *env, jclass type,
     Scene* scene = (Scene*) nativeScene;
     return (jint) scene->getLightCount();
 }
-
-extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_Scene_nHasEntity(JNIEnv *env, jclass type, jlong nativeScene,
-        jint entityId) {
-    Scene* scene = (Scene*) nativeScene;
-    Entity entity = Entity::import(entityId);
-    return (jboolean) scene->hasEntity(entity);
-}

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_Skybox_nGetTexture(JNIEnv* env, jclass,
+Java_com_google_android_filament_Skybix_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>
@@ -98,6 +98,16 @@ Java_com_google_android_filament_Stream_nBuilderStreamSource(JNIEnv* env,
     builder->setStreamSource(env, streamSource);
 }
 
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_Stream_nBuilderStream(JNIEnv*, jclass,
+        jlong nativeStreamBuilder, jlong externalTextureId) {
+    StreamBuilder* builder = (StreamBuilder*) nativeStreamBuilder;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    builder->builder()->stream(externalTextureId);
+#pragma clang diagnostic pop
+}
+
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_Stream_nBuilderWidth(JNIEnv*, jclass,
         jlong nativeStreamBuilder, jint width) {
@@ -133,6 +143,40 @@ Java_com_google_android_filament_Stream_nSetDimensions(JNIEnv*, jclass, jlong na
     stream->setDimensions((uint32_t) width, (uint32_t) height);
 }
 
+extern "C" JNIEXPORT jint JNICALL
+Java_com_google_android_filament_Stream_nReadPixels(JNIEnv *env, jclass,
+        jlong nativeStream, jlong nativeEngine,
+        jint xoffset, jint yoffset, jint width, jint height,
+        jobject storage, jint remaining,
+        jint left, jint top, jint type, jint alignment, jint stride, jint format,
+        jobject handler, jobject runnable) {
+    Stream *stream = (Stream *) nativeStream;
+    Engine *engine = (Engine *) nativeEngine;
+
+    stride = stride ? stride : width;
+    size_t sizeInBytes = PixelBufferDescriptor::computeDataSize(
+            (PixelDataFormat) format, (PixelDataType) type,
+            (size_t) stride, (size_t) (height + top), (size_t) alignment);
+
+    AutoBuffer nioBuffer(env, storage, 0);
+    if (sizeInBytes > (remaining << nioBuffer.getShift())) {
+        // BufferOverflowException
+        return -1;
+    }
+
+    void *buffer = nioBuffer.getData();
+    auto *callback = JniBufferCallback::make(engine, env, handler, runnable, std::move(nioBuffer));
+
+    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);
+
+    stream->readPixels(uint32_t(xoffset), uint32_t(yoffset), uint32_t(width), uint32_t(height),
+            std::move(desc));
+
+    return 0;
+}
+
 extern "C" JNIEXPORT jlong JNICALL
 Java_com_google_android_filament_Stream_nGetTimestamp(JNIEnv*, jclass, jlong nativeStream) {
     Stream *stream = (Stream *) nativeStream;
@@ -145,7 +189,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)) {
@@ -156,8 +200,8 @@ Java_com_google_android_filament_Stream_nSetAcquiredImage(JNIEnv* env, jclass, j
          if (!AHardwareBuffer_fromHardwareBuffer_fn) {
             __android_log_print(ANDROID_LOG_WARN, "Filament", "AHardwareBuffer_fromHardwareBuffer is not available.");
             sHardwareBufferSupported = false;
-            return;
         }
+        return;
     }
 
     AHardwareBuffer* nativeBuffer = AHardwareBuffer_fromHardwareBuffer_fn(env, hwbuffer);
@@ -177,6 +221,5 @@ Java_com_google_android_filament_Stream_nSetAcquiredImage(JNIEnv* env, jclass, j
 
 #endif
 
-    stream->setAcquiredImage((void*) nativeBuffer,
-            callback->getHandler(), &JniImageCallback::postToJavaAndDestroy, callback);
+    stream->setAcquiredImage((void*) nativeBuffer, &JniImageCallback::invoke, callback);
 }

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

@@ -16,7 +16,6 @@
 
 #include <jni.h>
 
-#include <filament/Engine.h>
 #include <filament/SwapChain.h>
 
 #include "common/CallbackUtils.h"
@@ -28,14 +27,5 @@ 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([](void* user) {
-        JniCallback* callback = (JniCallback*)user;
-        JniCallback::postToJavaAndDestroy(callback);
-    }, callback);
-}
-
-extern "C" JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_SwapChain_nIsSRGBSwapChainSupported(JNIEnv *, jclass, jlong nativeEngine) {
-    Engine* engine = (Engine*) nativeEngine;
-    return (bool)SwapChain::isSRGBSwapChainSupported(*engine);
+    swapChain->setFrameCompletedCallback(&JniCallback::invoke, 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,8 +31,6 @@
 #include "common/CallbackUtils.h"
 #include "common/NioUtils.h"
 
-#include "private/backend/VirtualMachineEnv.h"
-
 using namespace filament;
 using namespace backend;
 
@@ -188,6 +186,68 @@ Java_com_google_android_filament_Texture_nGetInternalFormat(JNIEnv*, jclass,
     return (jint) texture->getFormat();
 }
 
+extern "C" JNIEXPORT jint JNICALL
+Java_com_google_android_filament_Texture_nSetImage(JNIEnv* env, jclass, jlong nativeTexture,
+        jlong nativeEngine, jint level, jint xoffset, jint yoffset, jint width, jint height,
+        jobject storage,  jint remaining,
+        jint left, jint top, jint type, jint alignment,
+        jint stride, jint format,
+        jobject handler, jobject runnable) {
+    Texture* texture = (Texture*) nativeTexture;
+    Engine* engine = (Engine*) nativeEngine;
+
+    size_t sizeInBytes = getTextureDataSize(texture, (size_t) level, (Texture::Format) format,
+            (Texture::Type) type, (size_t) stride, (size_t) height, (size_t) alignment);
+
+    AutoBuffer nioBuffer(env, storage, 0);
+    if (sizeInBytes > (size_t(remaining) << nioBuffer.getShift())) {
+        // BufferOverflowException
+        return -1;
+    }
+
+    void *buffer = nioBuffer.getData();
+    auto *callback = JniBufferCallback::make(engine, env, handler, runnable, std::move(nioBuffer));
+
+    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);
+
+    texture->setImage(*engine, (size_t) level, (uint32_t) xoffset, (uint32_t) yoffset,
+            (uint32_t) width, (uint32_t) height, std::move(desc));
+
+    return 0;
+}
+
+extern "C" JNIEXPORT jint JNICALL
+Java_com_google_android_filament_Texture_nSetImageCompressed(JNIEnv *env, jclass,
+        jlong nativeTexture, jlong nativeEngine, jint level, jint xoffset, jint yoffset,
+        jint width, jint height, jobject storage,  jint remaining,
+        jint, jint, jint, jint, jint compressedSizeInBytes, jint compressedFormat,
+        jobject handler, jobject runnable) {
+    Texture *texture = (Texture *) nativeTexture;
+    Engine *engine = (Engine *) nativeEngine;
+
+    size_t sizeInBytes = (size_t) compressedSizeInBytes;
+
+    AutoBuffer nioBuffer(env, storage, 0);
+    if (sizeInBytes > (size_t(remaining) << nioBuffer.getShift())) {
+        // BufferOverflowException
+        return -1;
+    }
+
+    void *buffer = nioBuffer.getData();
+    auto *callback = JniBufferCallback::make(engine, env, handler, runnable, std::move(nioBuffer));
+
+    Texture::PixelBufferDescriptor desc(buffer, sizeInBytes,
+            (backend::CompressedPixelDataType) compressedFormat, (uint32_t) compressedSizeInBytes,
+            &JniBufferCallback::invoke, callback);
+
+    texture->setImage(*engine, (size_t) level, (uint32_t) xoffset, (uint32_t) yoffset,
+            (uint32_t) width, (uint32_t) height, std::move(desc));
+
+    return 0;
+}
+
 extern "C" JNIEXPORT jint JNICALL
 Java_com_google_android_filament_Texture_nSetImage3D(JNIEnv* env, jclass, jlong nativeTexture,
         jlong nativeEngine, jint level,
@@ -214,8 +274,7 @@ 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,
-            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
+            (uint32_t) stride, &JniBufferCallback::invoke, callback);
 
     texture->setImage(*engine, (size_t) level,
             (uint32_t) xoffset, (uint32_t) yoffset, (uint32_t) zoffset,
@@ -249,7 +308,7 @@ Java_com_google_android_filament_Texture_nSetImage3DCompressed(JNIEnv *env, jcla
 
     Texture::PixelBufferDescriptor desc(buffer, sizeInBytes,
             (backend::CompressedPixelDataType) compressedFormat, (uint32_t) compressedSizeInBytes,
-            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
+            &JniBufferCallback::invoke, callback);
 
     texture->setImage(*engine, (size_t) level,
             (uint32_t) xoffset, (uint32_t) yoffset, (uint32_t) zoffset,
@@ -287,13 +346,9 @@ 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,
-            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
+            (uint32_t) stride, &JniBufferCallback::invoke, callback);
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     texture->setImage(*engine, (size_t) level, std::move(desc), faceOffsets);
-#pragma clang diagnostic pop
 
     return 0;
 }
@@ -326,12 +381,9 @@ Java_com_google_android_filament_Texture_nSetImageCubemapCompressed(JNIEnv *env,
 
     Texture::PixelBufferDescriptor desc(buffer, sizeInBytes,
             (backend::CompressedPixelDataType) compressedFormat, (uint32_t) compressedSizeInBytes,
-            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
+            &JniBufferCallback::invoke, callback);
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     texture->setImage(*engine, (size_t) level, std::move(desc), faceOffsets);
-#pragma clang diagnostic pop
 
     return 0;
 }
@@ -402,7 +454,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,
-            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
+            &JniBufferCallback::invoke, callback);
 
     Texture::PrefilterOptions options;
     options.sampleCount = sampleCount;
@@ -416,7 +468,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
@@ -425,37 +477,46 @@ Java_com_google_android_filament_Texture_nGeneratePrefilterMipmap(JNIEnv *env, j
 #define BITMAP_CONFIG_RGBA_F16  4
 #define BITMAP_CONFIG_HARDWARE  5
 
-class AutoBitmap : public JniCallback {
-private:
-
+class AutoBitmap {
+public:
     AutoBitmap(JNIEnv* env, jobject bitmap) noexcept
-            : JniCallback(),
-              mBitmap(env->NewGlobalRef(bitmap)) {
+            : mEnv(env)
+            , mBitmap(env->NewGlobalRef(bitmap))
+    {
         if (mBitmap) {
-            AndroidBitmap_getInfo(env, mBitmap, &mInfo);
-            AndroidBitmap_lockPixels(env, mBitmap, &mData);
+            AndroidBitmap_getInfo(mEnv, mBitmap, &mInfo);
+            AndroidBitmap_lockPixels(mEnv, mBitmap, &mData);
         }
     }
 
     AutoBitmap(JNIEnv* env, jobject bitmap, jobject handler, jobject runnable) noexcept
-            : JniCallback(env, handler, runnable),
-              mBitmap(env->NewGlobalRef(bitmap)) {
+            : mEnv(env)
+            , mBitmap(env->NewGlobalRef(bitmap))
+            , mHandler(env->NewGlobalRef(handler))
+            , mCallback(env->NewGlobalRef(runnable))
+    {
+        acquireCallbackJni(env, mCallbackUtils);
         if (mBitmap) {
-            AndroidBitmap_getInfo(env, mBitmap, &mInfo);
-            AndroidBitmap_lockPixels(env, mBitmap, &mData);
+            AndroidBitmap_getInfo(mEnv, mBitmap, &mInfo);
+            AndroidBitmap_lockPixels(mEnv, mBitmap, &mData);
         }
     }
 
-    void release(JNIEnv* env) {
+    ~AutoBitmap() noexcept {
+        releaseCallbackJni(mEnv, mCallbackUtils, mHandler, mCallback);
         if (mBitmap) {
-            AndroidBitmap_unlockPixels(env, mBitmap);
-            env->DeleteGlobalRef(mBitmap);
+            AndroidBitmap_unlockPixels(mEnv, mBitmap);
+            mEnv->DeleteGlobalRef(mBitmap);
         }
     }
 
-    ~AutoBitmap() override = default;
+    AutoBitmap(AutoBitmap &&rhs) noexcept {
+        mEnv = rhs.mEnv;
+        std::swap(mData, rhs.mData);
+        std::swap(mBitmap, rhs.mBitmap);
+        std::swap(mInfo, rhs.mInfo);
+    }
 
-public:
     void* getData() const noexcept {
         return mData;
     }
@@ -482,39 +543,28 @@ public:
         }
     }
 
-    // create a AutoBitmap
-    static AutoBitmap* make(JNIEnv* env, jobject bitmap, jobject handler, jobject runnable) {
-        return new AutoBitmap(env, bitmap, handler, runnable);
+    static void invoke(void* buffer, size_t n, void* user) {
+        AutoBitmap* data = reinterpret_cast<AutoBitmap*>(user);
+        delete data;
     }
 
-    // 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) {
+    static AutoBitmap* make(Engine* engine, 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;
+    static AutoBitmap* make(Engine* engine, JNIEnv* env, jobject bitmap,
+            jobject handler, jobject runnable) {
+        return new AutoBitmap(env, bitmap, handler, runnable);
     }
 
 private:
+    JNIEnv* mEnv;
     void* mData = nullptr;
     jobject mBitmap = nullptr;
     jobject mHandler = nullptr;
     jobject mCallback = nullptr;
-    AndroidBitmapInfo mInfo{};
+    AndroidBitmapInfo mInfo;
+    CallbackJni mCallbackUtils;
 };
 
 extern "C"
@@ -525,14 +575,14 @@ Java_com_google_android_filament_android_TextureHelper_nSetBitmap(JNIEnv* env, j
     Texture* texture = (Texture*) nativeTexture;
     Engine *engine = (Engine *) nativeEngine;
 
-    auto* autoBitmap = AutoBitmap::make(env, bitmap);
+    auto* autoBitmap = AutoBitmap::make(engine, env, bitmap);
 
     Texture::PixelBufferDescriptor desc(
             autoBitmap->getData(),
             autoBitmap->getSizeInBytes(),
             autoBitmap->getFormat(format),
             autoBitmap->getType(format),
-            &AutoBitmap::invokeNoCallback, autoBitmap);
+            &AutoBitmap::invoke, autoBitmap);
 
     texture->setImage(*engine, (size_t) level,
             (uint32_t) xoffset, (uint32_t) yoffset,
@@ -548,14 +598,14 @@ Java_com_google_android_filament_android_TextureHelper_nSetBitmapWithCallback(JN
     Texture* texture = (Texture*) nativeTexture;
     Engine *engine = (Engine *) nativeEngine;
 
-    auto* autoBitmap = AutoBitmap::make(env, bitmap, handler, runnable);
+    auto* autoBitmap = AutoBitmap::make(engine, env, bitmap, handler, runnable);
 
     Texture::PixelBufferDescriptor desc(
             autoBitmap->getData(),
             autoBitmap->getSizeInBytes(),
             autoBitmap->getFormat(format),
             autoBitmap->getType(format),
-            autoBitmap->getHandler(), &AutoBitmap::invoke, autoBitmap);
+            &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 midGrayIn, jfloat midGrayOut, jfloat hdrMax) {
-    return (jlong) new GenericToneMapper(contrast, midGrayIn, midGrayOut, hdrMax);
+        jfloat contrast, jfloat shoulder, jfloat midGrayIn, jfloat midGrayOut, jfloat hdrMax) {
+    return (jlong) new GenericToneMapper(contrast, shoulder, midGrayIn, midGrayOut, hdrMax);
 }
 
 extern "C" JNIEXPORT jfloat JNICALL
@@ -58,6 +58,11 @@ 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();
@@ -79,6 +84,12 @@ 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/TransformManager.cpp

@@ -70,23 +70,6 @@ Java_com_google_android_filament_TransformManager_nCreateArray(JNIEnv* env,
     return tm->getInstance(entity);
 }
 
-extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_TransformManager_nCreateArrayFp64(JNIEnv* env,
-        jclass, jlong nativeTransformManager, jint entity_, jint parent,
-        jdoubleArray localTransform_) {
-    TransformManager* tm = (TransformManager*) nativeTransformManager;
-    Entity& entity = *reinterpret_cast<Entity*>(&entity_);
-    if (localTransform_) {
-        jdouble *localTransform = env->GetDoubleArrayElements(localTransform_, NULL);
-        tm->create(entity, (TransformManager::Instance) parent,
-                *reinterpret_cast<const filament::math::mat4 *>(localTransform));
-        env->ReleaseDoubleArrayElements(localTransform_, localTransform, JNI_ABORT);
-    } else {
-        tm->create(entity, (TransformManager::Instance) parent);
-    }
-    return tm->getInstance(entity);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_TransformManager_nDestroy(JNIEnv*, jclass,
         jlong nativeTransformManager, jint entity_) {
@@ -110,26 +93,6 @@ Java_com_google_android_filament_TransformManager_nGetParent(JNIEnv*, jclass,
     return tm->getParent((TransformManager::Instance) i).getId();
 }
 
-extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_TransformManager_nGetChildCount(JNIEnv*, jclass,
-        jlong nativeTransformManager, jint i) {
-    TransformManager* tm = (TransformManager*) nativeTransformManager;
-    return tm->getChildCount((TransformManager::Instance) i);
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_TransformManager_nGetChildren(JNIEnv* env,
-        jclass, jlong nativeTransformManager, jint i,
-        jintArray outEntities_, jint count) {
-    TransformManager* tm = (TransformManager*) nativeTransformManager;
-    jint* entities = env->GetIntArrayElements(outEntities_, nullptr);
-    // This is very very gross, we just pretend Entity is just like an jint
-    // (which it is), but still.
-    tm->getChildren((TransformManager::Instance) i,
-            reinterpret_cast<Entity *>(entities), (size_t) count);
-    env->ReleaseIntArrayElements(outEntities_, entities, 0);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_TransformManager_nSetTransform(JNIEnv* env,
         jclass, jlong nativeTransformManager, jint i,
@@ -141,17 +104,6 @@ Java_com_google_android_filament_TransformManager_nSetTransform(JNIEnv* env,
     env->ReleaseFloatArrayElements(localTransform_, localTransform, JNI_ABORT);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_TransformManager_nSetTransformFp64(JNIEnv* env,
-        jclass, jlong nativeTransformManager, jint i,
-        jdoubleArray localTransform_) {
-    TransformManager* tm = (TransformManager*) nativeTransformManager;
-    jdouble *localTransform = env->GetDoubleArrayElements(localTransform_, NULL);
-    tm->setTransform((TransformManager::Instance) i,
-            *reinterpret_cast<const filament::math::mat4 *>(localTransform));
-    env->ReleaseDoubleArrayElements(localTransform_, localTransform, JNI_ABORT);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_TransformManager_nGetTransform(JNIEnv* env,
         jclass, jlong nativeTransformManager, jint i,
@@ -163,17 +115,6 @@ Java_com_google_android_filament_TransformManager_nGetTransform(JNIEnv* env,
     env->ReleaseFloatArrayElements(outLocalTransform_, outLocalTransform, 0);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_TransformManager_nGetTransformFp64(JNIEnv* env,
-        jclass, jlong nativeTransformManager, jint i,
-        jdoubleArray outLocalTransform_) {
-    TransformManager* tm = (TransformManager*) nativeTransformManager;
-    jdouble *outLocalTransform = env->GetDoubleArrayElements(outLocalTransform_, NULL);
-    *reinterpret_cast<filament::math::mat4 *>(outLocalTransform) = tm->getTransformAccurate(
-            (TransformManager::Instance) i);
-    env->ReleaseDoubleArrayElements(outLocalTransform_, outLocalTransform, 0);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_TransformManager_nGetWorldTransform(JNIEnv* env,
         jclass, jlong nativeTransformManager, jint i,
@@ -185,17 +126,6 @@ Java_com_google_android_filament_TransformManager_nGetWorldTransform(JNIEnv* env
     env->ReleaseFloatArrayElements(outWorldTransform_, outWorldTransform, 0);
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_TransformManager_nGetWorldTransformFp64(JNIEnv* env,
-        jclass, jlong nativeTransformManager, jint i,
-        jdoubleArray outWorldTransform_) {
-    TransformManager* tm = (TransformManager*) nativeTransformManager;
-    jdouble *outWorldTransform = env->GetDoubleArrayElements(outWorldTransform_, NULL);
-    *reinterpret_cast<filament::math::mat4 *>(outWorldTransform) = tm->getWorldTransformAccurate(
-            (TransformManager::Instance) i);
-    env->ReleaseDoubleArrayElements(outWorldTransform_, outWorldTransform, 0);
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_TransformManager_nOpenLocalTransformTransaction(
         JNIEnv*, jclass, jlong nativeTransformManager) {
@@ -209,19 +139,3 @@ Java_com_google_android_filament_TransformManager_nCommitLocalTransformTransacti
     TransformManager* tm = (TransformManager*) nativeTransformManager;
     tm->commitLocalTransformTransaction();
 }
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_TransformManager_nSetAccurateTranslationsEnabled(JNIEnv*,
-        jclass, jlong nativeTransformManager, jboolean enable) {
-    TransformManager* tm = (TransformManager*) nativeTransformManager;
-    tm->setAccurateTranslationsEnabled((bool)enable);
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_TransformManager_nIsAccurateTranslationsEnabled(JNIEnv*,
-        jclass, jlong nativeTransformManager) {
-    TransformManager* tm = (TransformManager*) nativeTransformManager;
-    return (jboolean)tm->isAccurateTranslationsEnabled();
-}

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*, jclass) {
+Java_com_google_android_filament_VertexBuffer_nCreateBuilder(JNIEnv *env, jclass type) {
     return (jlong) new VertexBuffer::Builder();
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_VertexBuffer_nDestroyBuilder(JNIEnv*, jclass,
+Java_com_google_android_filament_VertexBuffer_nDestroyBuilder(JNIEnv *env, jclass type,
         jlong nativeBuilder) {
     VertexBuffer::Builder* builder = (VertexBuffer::Builder *) nativeBuilder;
     delete builder;
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_VertexBuffer_nBuilderVertexCount(JNIEnv*, jclass,
+Java_com_google_android_filament_VertexBuffer_nBuilderVertexCount(JNIEnv *env, jclass type,
         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*, jclass,
+Java_com_google_android_filament_VertexBuffer_nBuilderEnableBufferObjects(JNIEnv *env, jclass type,
         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*, jclass,
+Java_com_google_android_filament_VertexBuffer_nBuilderBufferCount(JNIEnv *env, jclass type,
         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*, jclass,
+Java_com_google_android_filament_VertexBuffer_nBuilderAttribute(JNIEnv *env, jclass type,
         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*, jclass,
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_VertexBuffer_nBuilderNormalized(JNIEnv*, jclass,
+Java_com_google_android_filament_VertexBuffer_nBuilderNormalized(JNIEnv *env, jclass type,
         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*, jclass,
+Java_com_google_android_filament_VertexBuffer_nBuilderBuild(JNIEnv *env, jclass type,
         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*, jclass,
 }
 
 extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_VertexBuffer_nGetVertexCount(JNIEnv*, jclass,
+Java_com_google_android_filament_VertexBuffer_nGetVertexCount(JNIEnv *env, jclass type,
         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,
+Java_com_google_android_filament_VertexBuffer_nSetBufferAt(JNIEnv *env, jclass type,
         jlong nativeVertexBuffer, jlong nativeEngine, jint bufferIndex,
         jobject buffer, jint remaining,
         jint destOffsetInBytes, jint count, jobject handler, jobject runnable) {
@@ -114,8 +114,7 @@ Java_com_google_android_filament_VertexBuffer_nSetBufferAt(JNIEnv *env, jclass,
 
     auto* callback = JniBufferCallback::make(engine, env, handler, runnable, std::move(nioBuffer));
 
-    BufferDescriptor desc(data, sizeInBytes,
-            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
+    BufferDescriptor desc(data, sizeInBytes, &JniBufferCallback::invoke, callback);
 
     vertexBuffer->setBufferAt(*engine, (uint8_t) bufferIndex, std::move(desc),
             (uint32_t) destOffsetInBytes);
@@ -124,7 +123,7 @@ Java_com_google_android_filament_VertexBuffer_nSetBufferAt(JNIEnv *env, jclass,
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_VertexBuffer_nSetBufferObjectAt(JNIEnv*, jclass,
+Java_com_google_android_filament_VertexBuffer_nSetBufferObjectAt(JNIEnv *env, jclass type,
         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,10 +20,6 @@
 #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
@@ -86,19 +82,13 @@ 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
@@ -129,14 +119,13 @@ Java_com_google_android_filament_View_nGetDithering(JNIEnv*, jclass,
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetDynamicResolutionOptions(JNIEnv*, jclass, jlong nativeView,
         jboolean enabled, jboolean homogeneousScaling,
-        jfloat minScale, jfloat maxScale, jfloat sharpness, jint quality) {
+        jfloat minScale, jfloat maxScale, jint quality) {
     View* view = (View*)nativeView;
     View::DynamicResolutionOptions options;
     options.enabled = enabled;
     options.homogeneousScaling = homogeneousScaling;
     options.minScale = filament::math::float2{ minScale };
     options.maxScale = filament::math::float2{ maxScale };
-    options.sharpness = sharpness;
     options.quality = (View::QualityLevel)quality;
     view->setDynamicResolutionOptions(options);
 }
@@ -149,28 +138,18 @@ 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, jboolean highPrecision, jfloat minVarianceScale,
+        jint anisotropy, jboolean mipmapping, jfloat exponent, jfloat minVarianceScale,
         jfloat lightBleedReduction) {
     View* view = (View*) nativeView;
     View::VsmShadowOptions options;
     options.anisotropy = (uint8_t)anisotropy;
     options.mipmapping = (bool)mipmapping;
-    options.highPrecision = (bool)highPrecision;
+    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,
@@ -238,8 +217,7 @@ extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetAmbientOcclusionOptions(JNIEnv*, jclass,
     jlong nativeView, jfloat radius, jfloat bias, jfloat power, jfloat resolution, jfloat intensity,
     jfloat bilateralThreshold,
-    jint quality, jint lowPassFilter, jint upsampling, jboolean enabled, jboolean bentNormals,
-    jfloat minHorizonAngleRad) {
+    jint quality, jint lowPassFilter, jint upsampling, jboolean enabled, jfloat minHorizonAngleRad) {
     View* view = (View*) nativeView;
     View::AmbientOcclusionOptions options = view->getAmbientOcclusionOptions();
     options.radius = radius;
@@ -252,7 +230,6 @@ Java_com_google_android_filament_View_nSetAmbientOcclusionOptions(JNIEnv*, jclas
     options.lowPassFilter = (View::QualityLevel)lowPassFilter;
     options.upsampling = (View::QualityLevel)upsampling;
     options.enabled = (bool)enabled;
-    options.bentNormals = (bool)bentNormals;
     options.minHorizonAngleRad = minHorizonAngleRad;
     view->setAmbientOcclusionOptions(options);
 }
@@ -260,14 +237,14 @@ Java_com_google_android_filament_View_nSetAmbientOcclusionOptions(JNIEnv*, jclas
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetSSCTOptions(JNIEnv *, jclass, jlong nativeView,
-        jfloat ssctLightConeRad, jfloat ssctShadowDistance, jfloat ssctContactDistanceMax,
+        jfloat ssctLightConeRad, jfloat ssctStartTraceDistance, jfloat ssctContactDistanceMax,
         jfloat ssctIntensity, jfloat ssctLightDirX, jfloat ssctLightDirY, jfloat ssctLightDirZ,
         jfloat ssctDepthBias, jfloat ssctDepthSlopeBias, jint ssctSampleCount,
         jint ssctRayCount, jboolean ssctEnabled) {
     View* view = (View*) nativeView;
     View::AmbientOcclusionOptions options = view->getAmbientOcclusionOptions();
     options.ssct.lightConeRad = ssctLightConeRad;
-    options.ssct.shadowDistance = ssctShadowDistance;
+    options.ssct.shadowDistance = ssctStartTraceDistance;
     options.ssct.contactDistanceMax = ssctContactDistanceMax;
     options.ssct.intensity = ssctIntensity;
     options.ssct.lightDirection = math::float3{ ssctLightDirX, ssctLightDirY, ssctLightDirZ };
@@ -315,13 +292,12 @@ Java_com_google_android_filament_View_nSetBloomOptions(JNIEnv*, jclass,
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_View_nSetFogOptions(JNIEnv *, jclass , jlong nativeView,
-        jfloat distance, jfloat maximumOpacity, jfloat height, jfloat heightFalloff, jfloat cutOffDistance,
-        jfloat r, jfloat g, jfloat b, jfloat density, jfloat inScatteringStart,
+        jfloat distance, jfloat maximumOpacity, jfloat height, jfloat heightFalloff, jfloat r,
+        jfloat g, jfloat b, jfloat density, jfloat inScatteringStart,
         jfloat inScatteringSize, jboolean fogColorFromIbl, jboolean enabled) {
     View* view = (View*) nativeView;
     View::FogOptions options = {
              .distance = distance,
-             .cutOffDistance = cutOffDistance,
              .maximumOpacity = maximumOpacity,
              .height = height,
              .heightFalloff = heightFalloff,
@@ -342,8 +318,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 cocScale, jfloat maxApertureDiameter, jboolean enabled, jint filter,
+Java_com_google_android_filament_View_nSetDepthOfFieldOptions(JNIEnv *, jclass ,
+        jlong nativeView, jfloat focusDistance, jfloat cocScale, jfloat maxApertureDiameter, jboolean enabled, jint filter,
         jboolean nativeResolution, jint foregroundRingCount, jint backgroundRingCount, jint fastGatherRingCount,
         jint maxForegroundCOC, jint maxBackgroundCOC) {
     View* view = (View*) nativeView;
@@ -372,17 +348,6 @@ 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,
@@ -392,16 +357,6 @@ 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) {
@@ -424,92 +379,3 @@ 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());
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_View_nSetStencilBufferEnabled(JNIEnv *, jclass, jlong nativeView,
-        jboolean enabled) {
-    View* view = (View*) nativeView;
-    view->setStencilBufferEnabled(enabled);
-}
-
-extern "C"
-JNIEXPORT jboolean JNICALL
-Java_com_google_android_filament_View_nIsStencilBufferEnabled(JNIEnv *, jclass, jlong nativeView) {
-    View* view = (View*) nativeView;
-    return view->isStencilBufferEnabled();
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_View_nSetGuardBandOptions(JNIEnv *, jclass,
-        jlong nativeView, jboolean enabled) {
-    View* view = (View*) nativeView;
-    view->setGuardBandOptions({ .enabled = (bool)enabled });
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_View_nSetMaterialGlobal(JNIEnv * , jclass, jlong nativeView,
-        jint index, jfloat x, jfloat y, jfloat z, jfloat w) {
-    View *view = (View *) nativeView;
-    view->setMaterialGlobal((uint32_t)index, { x, y, z, w });
-}
-
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_google_android_filament_View_nGetMaterialGlobal(JNIEnv *env, jclass clazz,
-        jlong nativeView, jint index, jfloatArray out_) {
-    jfloat* out = env->GetFloatArrayElements(out_, nullptr);
-    View *view = (View *) nativeView;
-    auto result = view->getMaterialGlobal(index);
-    std::copy_n(result.v, 4, out);
-    env->ReleaseFloatArrayElements(out_, out, 0);
-}
-
-extern "C"
-JNIEXPORT int JNICALL
-Java_com_google_android_filament_View_nGetFogEntity(JNIEnv *env, jclass clazz,
-        jlong nativeView) {
-    View *view = (View *) nativeView;
-    return (jint)view->getFogEntity().getId();
-}

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

@@ -63,27 +63,12 @@ final class Asserts {
         return out;
     }
 
-    @NonNull @Size(min = 16)
-    static double[] assertMat4(@Nullable double[] out) {
-        if (out == null) out = new double[16];
-        else if (out.length < 16) {
-            throw new ArrayIndexOutOfBoundsException("Array length must be at least 16");
-        }
-        return out;
-    }
-
     static void assertMat4fIn(@NonNull @Size(min = 16) float[] in) {
         if (in.length < 16) {
             throw new ArrayIndexOutOfBoundsException("Array length must be at least 16");
         }
     }
 
-    static void assertMat4In(@NonNull @Size(min = 16) double[] in) {
-        if (in.length < 16) {
-            throw new ArrayIndexOutOfBoundsException("Array length must be at least 16");
-        }
-    }
-
     @NonNull @Size(min = 3)
     static float[] assertFloat3(@Nullable float[] out) {
         if (out == null) out = new float[3];

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

@@ -254,9 +254,6 @@ public class Camera {
     /**
      * Sets a custom projection matrix.
      *
-     * <p>The projection matrix must define an NDC system that must match the OpenGL convention,
-     * that is all 3 axis are mapped to [-1, 1].</p>
-     *
      * @param inProjection  custom projection matrix for rendering and culling
      *
      * @param near          distance in world units from the camera to the near plane.
@@ -282,9 +279,6 @@ public class Camera {
     /**
      * Sets a custom projection matrix.
      *
-     * <p>The projection matrices must define an NDC system that must match the OpenGL convention,
-     * that is all 3 axis are mapped to [-1, 1].</p>
-     *
      * @param inProjection              custom projection matrix for rendering.
      *
      * @param inProjectionForCulling    custom projection matrix for culling.
@@ -365,7 +359,7 @@ public class Camera {
      * By default, this is an identity matrix.
      * </p>
      *
-     * @param inScaling     diagonal of the scaling matrix to be applied after the projection matrix.
+     * @param scaling     diagonal of the scaling matrix to be applied after the projection matrix.
      *
      * @see Camera#setProjection
      * @see Camera#setLensProjection
@@ -400,7 +394,7 @@ public class Camera {
     }
 
     /**
-     * Sets the camera's model matrix.
+     * Sets the camera's view matrix.
      * <p>
      * Helper method to set the camera's entity transform component.
      * Remember that the Camera "looks" towards its -z axis.
@@ -409,32 +403,18 @@ public class Camera {
      *
      * <pre>
      *  engine.getTransformManager().setTransform(
-     *          engine.getTransformManager().getInstance(camera->getEntity()), modelMatrix);
+     *          engine.getTransformManager().getInstance(camera->getEntity()), viewMatrix);
      * </pre>
      *
-     * @param modelMatrix The camera position and orientation provided as a <b>rigid transform</b> matrix.
+     * @param viewMatrix The camera position and orientation provided as a <b>rigid transform</b> matrix.
      */
-    public void setModelMatrix(@NonNull @Size(min = 16) float[] modelMatrix) {
-        Asserts.assertMat4fIn(modelMatrix);
-        nSetModelMatrix(getNativeObject(), modelMatrix);
+    public void setModelMatrix(@NonNull @Size(min = 16) float[] viewMatrix) {
+        Asserts.assertMat4fIn(viewMatrix);
+        nSetModelMatrix(getNativeObject(), viewMatrix);
     }
 
     /**
-     * Sets the camera's model matrix.
-     * <p>
-     * Helper method to set the camera's entity transform component.
-     * Remember that the Camera "looks" towards its -z axis.
-     * <p>
-     *
-     * @param modelMatrix The camera position and orientation provided as a <b>rigid transform</b> matrix.
-     */
-    public void setModelMatrix(@NonNull @Size(min = 16) double[] modelMatrix) {
-        Asserts.assertMat4In(modelMatrix);
-        nSetModelMatrixFp64(getNativeObject(), modelMatrix);
-    }
-
-    /**
-     * Sets the camera's model matrix.
+     * Sets the camera's view matrix.
      *
      * @param eyeX      x-axis position of the camera in world space
      * @param eyeY      y-axis position of the camera in world space
@@ -456,7 +436,7 @@ public class Camera {
      * @return Distance to the near plane
      */
     public float getNear() {
-        return (float)nGetNear(getNativeObject());
+        return nGetNear(getNativeObject());
     }
 
     /**
@@ -464,7 +444,7 @@ public class Camera {
      * @return Distance to the far plane
      */
     public float getCullingFar() {
-        return (float)nGetCullingFar(getNativeObject());
+        return nGetCullingFar(getNativeObject());
     }
 
     /**
@@ -530,29 +510,13 @@ public class Camera {
         return out;
     }
 
-    /**
-     * Retrieves the camera's model matrix. The model matrix encodes the camera position and
-     * orientation, or pose.
-     *
-     * @param out A 16-double array where the model matrix will be stored, or null in which
-     *            case a new array is allocated.
-     *
-     * @return A 16-double array containing the camera's pose as a column-major matrix.
-     */
-    @NonNull @Size(min = 16)
-    public double[] getModelMatrix(@Nullable @Size(min = 16) double[] out) {
-        out = Asserts.assertMat4(out);
-        nGetModelMatrixFp64(getNativeObject(), out);
-        return out;
-    }
-
     /**
      * Retrieves the camera's view matrix. The view matrix is the inverse of the model matrix.
      *
-     * @param out A 16-float array where the view matrix will be stored, or null in which
+     * @param out A 16-float array where the model view will be stored, or null in which
      *            case a new array is allocated.
      *
-     * @return A 16-float array containing the camera's column-major view matrix.
+     * @return A 16-float array containing the camera's view as a column-major matrix.
      */
     @NonNull @Size(min = 16)
     public float[] getViewMatrix(@Nullable @Size(min = 16) float[] out) {
@@ -561,21 +525,6 @@ public class Camera {
         return out;
     }
 
-    /**
-     * Retrieves the camera's view matrix. The view matrix is the inverse of the model matrix.
-     *
-     * @param out A 16-double array where the model view will be stored, or null in which
-     *            case a new array is allocated.
-     *
-     * @return A 16-double array containing the camera's column-major view matrix.
-     */
-    @NonNull @Size(min = 16)
-    public double[] getViewMatrix(@Nullable @Size(min = 16) double[] out) {
-        out = Asserts.assertMat4(out);
-        nGetViewMatrixFp64(getNativeObject(), out);
-        return out;
-    }
-
     /**
      * Retrieves the camera position in world space.
      *
@@ -785,17 +734,14 @@ public class Camera {
     private static native void nSetScaling(long nativeCamera, double x, double y);
     private static native void nSetShift(long nativeCamera, double x, double y);
     private static native void nSetModelMatrix(long nativeCamera, float[] in);
-    private static native void nSetModelMatrixFp64(long nativeCamera, double[] in);
     private static native void nLookAt(long nativeCamera, double eyeX, double eyeY, double eyeZ, double centerX, double centerY, double centerZ, double upX, double upY, double upZ);
-    private static native double nGetNear(long nativeCamera);
-    private static native double nGetCullingFar(long nativeCamera);
+    private static native float nGetNear(long nativeCamera);
+    private static native float nGetCullingFar(long nativeCamera);
     private static native void nGetProjectionMatrix(long nativeCamera, double[] out);
     private static native void nGetCullingProjectionMatrix(long nativeCamera, double[] out);
     private static native void nGetScaling(long nativeCamera, double[] out);
     private static native void nGetModelMatrix(long nativeCamera, float[] out);
-    private static native void nGetModelMatrixFp64(long nativeCamera, double[] out);
     private static native void nGetViewMatrix(long nativeCamera, float[] out);
-    private static native void nGetViewMatrixFp64(long nativeCamera, double[] out);
     private static native void nGetPosition(long nativeCamera, float[] out);
     private static native void nGetLeftVector(long nativeCamera, float[] out);
     private static native void nGetUpVector(long nativeCamera, float[] out);

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

@@ -55,7 +55,6 @@ import static com.google.android.filament.Asserts.assertFloat4In;
  * The various transforms held by ColorGrading are applied in the following order:
  * <ul>
  * <li>Exposure</li>
- * <li>Night adaptation</li>
  * <li>White balance</li>
  * <li>Channel mixer</li>
  * <li>Shadows/mid-tones/highlights</li>
@@ -66,7 +65,6 @@ import static com.google.android.filament.Asserts.assertFloat4In;
  * <li>Curves</li>
  * <li>Tone mapping</li>
  * <li>Luminance scaling</li>
- * <li>Gamut mapping</li>
  * </ul>
  *
  * <h1>Defaults</h1>
@@ -74,7 +72,6 @@ import static com.google.android.filament.Asserts.assertFloat4In;
  * Here are the default color grading options:
  * <ul>
  * <li>Exposure: 0.0</li>
- * <li>Night adaptation: 0.0</li>
  * <li>White balance: temperature <code>0.0</code>, and tint <code>0.0</code></li>
  * <li>Channel mixer: red <code>{1,0,0}</code>, green <code>{0,1,0}</code>, blue <code>{0,0,1}</code></li>
  * <li>Shadows/mid-tones/highlights: shadows <code>{1,1,1,0}</code>, mid-tones <code>{1,1,1,0}</code>,
@@ -86,7 +83,6 @@ import static com.google.android.filament.Asserts.assertFloat4In;
  * <li>Curves: gamma <code>{1,1,1}</code>, midPoint <code>{1,1,1}</code>, and scale <code>{1,1,1}</code></li>
  * <li>Tone mapping: {@link ToneMapper.ACESLegacy}</li>
  * <li>Luminance scaling: false</li>
- * <li>Gamut mapping: false</li>
  * </ul>
  *
  * @see View
@@ -105,20 +101,11 @@ public class ColorGrading {
         ULTRA
     }
 
-    /**
-     * Color grading LUT format.
-     */
-    public enum LutFormat {
-        INTEGER,
-        FLOAT
-    }
-
     /**
      * List of available tone-mapping operators.
      *
      * @deprecated Use {@link ColorGrading.Builder#toneMapper(ToneMapper)}
      */
-    @Deprecated
     public enum ToneMapping {
         /** Linear tone mapping (i.e. no tone mapping). */
         LINEAR,
@@ -171,36 +158,6 @@ 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.
@@ -232,7 +189,6 @@ public class ColorGrading {
          *
          * @deprecated Use {@link #toneMapper(ToneMapper)}
          */
-        @Deprecated
         public Builder toneMapping(ToneMapping toneMapping) {
             nBuilderToneMapping(mNativeBuilder, toneMapping.ordinal());
             return this;
@@ -257,22 +213,6 @@ public class ColorGrading {
             return this;
         }
 
-        /**
-         * Enables or disables gamut mapping to the destination color space's gamut. When gamut
-         * mapping is turned off, out-of-gamut colors are clipped to the destination's gamut,
-         * which may produce hue skews (blue skewing to purple, green to yellow, etc.). When
-         * gamut mapping is enabled, out-of-gamut colors are brought back in gamut by trying to
-         * preserve the perceived chroma and lightness of the original values.
-         *
-         * @param gamutMapping Enables or disables gamut mapping
-         *
-         * @return This Builder, for chaining calls
-         */
-        public Builder gamutMapping(boolean gamutMapping) {
-            nBuilderGamutMapping(mNativeBuilder, gamutMapping);
-            return this;
-        }
-
         /**
          * Adjusts the exposure of this image. The exposure is specified in stops:
          * each stop brightens (positive values) or darkens (negative values) the image by
@@ -289,22 +229,6 @@ public class ColorGrading {
             return this;
         }
 
-        /**
-         * Controls the amount of night adaptation to replicate a more natural representation of
-         * low-light conditions as perceived by the human vision system. In low-light conditions,
-         * peak luminance sensitivity of the eye shifts toward the blue end of the color spectrum:
-         * darker tones appear brighter, reducing contrast, and colors are blue shifted (the darker
-         * the more intense the effect).
-         *
-         * @param adaptation Amount of adaptation, between 0 (no adaptation) and 1 (full adaptation).
-         *
-         * @return This Builder, for chaining calls
-         */
-        public Builder nightAdaptation(float adaptation) {
-            nBuilderNightAdaptation(mNativeBuilder, adaptation);
-            return this;
-        }
-
         /**
          * Adjusts the while balance of the image. This can be used to remove color casts
          * and correct the appearance of the white point in the scene, or to alter the
@@ -597,14 +521,10 @@ 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);
-    private static native void nBuilderGamutMapping(long nativeBuilder, boolean gamutMapping);
     private static native void nBuilderExposure(long nativeBuilder, float exposure);
-    private static native void nBuilderNightAdaptation(long nativeBuilder, float adaptation);
     private static native void nBuilderWhiteBalance(long nativeBuilder, float temperature, float tint);
     private static native void nBuilderChannelMixer(long nativeBuilder, float[] outRed, float[] outGreen, float[] outBlue);
     private static native void nBuilderShadowsMidtonesHighlights(long nativeBuilder, float[] shadows, float[] midtones, float[] highlights, float[] ranges);

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

@@ -47,7 +47,7 @@ import com.google.android.filament.proguard.UsedByReflection;
  * <pre>
  * import com.google.android.filament.*
  *
- * Engine engine        = Engine.create();
+ * Engin engine         = Engine.create();
  * SwapChain swapChain  = engine.createSwapChain(nativeWindow);
  * Renderer renderer    = engine.createRenderer();
  * Scene scene          = engine.createScene();
@@ -106,11 +106,7 @@ import com.google.android.filament.proguard.UsedByReflection;
  * @see Renderer
  */
 public class Engine {
-    private static final Backend[] sBackendValues = Backend.values();
-    private static final FeatureLevel[] sFeatureLevelValues = FeatureLevel.values();
-
     private long mNativeObject;
-
     @NonNull private final TransformManager mTransformManager;
     @NonNull private final LightManager mLightManager;
     @NonNull private final RenderableManager mRenderableManager;
@@ -142,18 +138,6 @@ public class Engine {
         NOOP,
     }
 
-    /**
-     * Defines the backend's feature levels.
-     */
-    public enum FeatureLevel {
-        /** Reserved, don't use */
-        FEATURE_LEVEL_0,
-        /** OpenGL ES 3.0 features (default) */
-        FEATURE_LEVEL_1,
-        /** OpenGL ES 3.1 features + 31 textures units + cubemap arrays */
-        FEATURE_LEVEL_2
-    };
-
     private Engine(long nativeEngine) {
         mNativeObject = nativeEngine;
         mTransformManager = new TransformManager(nGetTransformManager(nativeEngine));
@@ -268,91 +252,9 @@ public class Engine {
      */
     @NonNull
     public Backend getBackend() {
-        return sBackendValues[(int) nGetBackend(getNativeObject())];
+        return Backend.values()[(int) nGetBackend(getNativeObject())];
     }
 
-    /**
-     * Helper to enable accurate translations.
-     * If you need this Engine to handle a very large world space, one way to achieve this
-     * automatically is to enable accurate translations in the TransformManager. This helper
-     * provides a convenient way of doing that.
-     * This is typically called once just after creating the Engine.
-     */
-    public void enableAccurateTranslations() {
-        getTransformManager().setAccurateTranslationsEnabled(true);
-    }
-
-    /**
-     * Query the feature level supported by the selected backend.
-     *
-     * A specific feature level needs to be set before the corresponding features can be used.
-     *
-     * @return FeatureLevel supported the selected backend.
-     * @see #setActiveFeatureLevel
-     */
-    @NonNull
-    public FeatureLevel getSupportedFeatureLevel() {
-        return sFeatureLevelValues[(int) nGetSupportedFeatureLevel(getNativeObject())];
-    }
-
-    /**
-     * Activate all features of a given feature level. By default FeatureLevel::FEATURE_LEVEL_1 is
-     * active. The selected feature level must not be higher than the value returned by
-     * getActiveFeatureLevel() and it's not possible lower the active feature level.
-     *
-     * @param featureLevel the feature level to activate. If featureLevel is lower than
-     *                     getActiveFeatureLevel(), the current (higher) feature level is kept.
-     *                     If featureLevel is higher than getSupportedFeatureLevel(), an exception
-     *                     is thrown, or the program is terminated if exceptions are disabled.
-     *
-     * @return the active feature level.
-     *
-     * @see #getSupportedFeatureLevel
-     * @see #getActiveFeatureLevel
-     */
-    @NonNull
-    public FeatureLevel setActiveFeatureLevel(@NonNull FeatureLevel featureLevel) {
-        return sFeatureLevelValues[(int) nSetActiveFeatureLevel(getNativeObject(), featureLevel.ordinal())];
-    }
-
-    /**
-     * Returns the currently active feature level.
-     * @return currently active feature level
-     * @see #getSupportedFeatureLevel
-     * @see #setActiveFeatureLevel
-     */
-    @NonNull
-    public FeatureLevel getActiveFeatureLevel() {
-        return sFeatureLevelValues[(int) nGetActiveFeatureLevel(getNativeObject())];
-    }
-
-    /**
-     * Enables or disables automatic instancing of render primitives. Instancing of render primitive
-     * can greatly reduce CPU overhead but requires the instanced primitives to be identical
-     * (i.e. use the same geometry) and use the same MaterialInstance. If it is known that the
-     * scene doesn't contain any identical primitives, automatic instancing can have some
-     * overhead and it is then best to disable it.
-     *
-     * Disabled by default.
-     *
-     * @param enable true to enable, false to disable automatic instancing.
-     *
-     * @see RenderableManager
-     * @see MaterialInstance
-     */
-    public void setAutomaticInstancingEnabled(boolean enable) {
-        nSetAutomaticInstancingEnabled(getNativeObject(), enable);
-    }
-
-    /**
-     * @return true if automatic instancing is enabled, false otherwise.
-     * @see #setAutomaticInstancingEnabled
-     */
-    public boolean isAutomaticInstancingEnabled() {
-        return nIsAutomaticInstancingEnabled(getNativeObject());
-    }
-
-
     // SwapChain
 
     /**
@@ -611,15 +513,6 @@ 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
@@ -688,11 +581,8 @@ public class Engine {
     }
 
     /**
-     * Destroys all Filament-known components from this <code>entity</code>.
+     * Destroys an <code>entity</code> and all its components.
      * <p>
-     * This method destroys Filament components only, not the <code>entity</code> itself. To destroy
-     * the <code>entity</code> use <code>EntityManager#destroy</code>.
-     *
      * It is recommended to destroy components individually before destroying their
      * <code>entity</code>, this gives more control as to when the destruction really happens.
      * Otherwise, orphaned components are garbage collected, which can happen at a later time.
@@ -741,7 +631,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 does guarantee that the
+     * all commands to this point are executed. Note that this doesn't guarantee that the
      * hardware is actually finished.
      *
      * <p>This is typically used right after destroying the <code>SwapChain</code>,
@@ -800,7 +690,6 @@ 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);
@@ -815,9 +704,4 @@ public class Engine {
     private static native long nGetRenderableManager(long nativeEngine);
     private static native long nGetJobSystem(long nativeEngine);
     private static native long nGetEntityManager(long nativeEngine);
-    private static native void nSetAutomaticInstancingEnabled(long nativeEngine, boolean enable);
-    private static native boolean nIsAutomaticInstancingEnabled(long nativeEngine);
-    private static native int nGetSupportedFeatureLevel(long nativeEngine);
-    private static native int nSetActiveFeatureLevel(long nativeEngine, int ordinal);
-    private static native int nGetActiveFeatureLevel(long nativeEngine);
 }

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

@@ -117,8 +117,6 @@ import androidx.annotation.Size;
  * </ul>
  */
 public class LightManager {
-    private static final Type[] sTypeValues = Type.values();
-
     private long mNativeObject;
 
     LightManager(long nativeLightManager) {
@@ -240,19 +238,19 @@ public class LightManager {
          */
         @NonNull
         @Size(min = 3)
-        public float[] cascadeSplitPositions = { 0.125f, 0.25f, 0.50f };
+        public float[] cascadeSplitPositions = { 0.25f, 0.50f, 0.75f };
 
         /** Constant bias in world units (e.g. meters) by which shadows are moved away from the
          * light. 1mm by default.
          * This is ignored when the View's ShadowType is set to VSM.
          */
-        public float constantBias = 0.001f;
+        public float constantBias = 0.05f;
 
         /** 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 = 1.0f;
+        public float normalBias = 0.4f;
 
         /** 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
@@ -280,41 +278,8 @@ public class LightManager {
          * Controls whether the shadow map should be optimized for resolution or stability.
          * When set to true, all resolution enhancing features that can affect stability are
          * disabling, resulting in significantly lower resolution shadows, albeit stable ones.
-         *
-         * Setting this flag to true always disables LiSPSM (see below).
          */
-        public boolean stable = false;
-
-        /**
-         * LiSPSM, or light-space perspective shadow-mapping is a technique allowing to better
-         * optimize the use of the shadow-map texture. When enabled the effective resolution of
-         * shadows is greatly improved and yields result similar to using cascades without the
-         * extra cost. LiSPSM comes with some drawbacks however, in particular it is incompatible
-         * with blurring because it effectively affects the blur kernel size.
-         *
-         * Blurring is only an issue when using ShadowType.VSM with a large blur or with
-         * ShadowType.PCSS however.
-         *
-         * If these blurring artifacts become problematic, this flag can be used to disable LiSPSM.
-         */
-        public boolean lispsm = 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;
+        public boolean stable = true;
 
         /**
          * Whether screen-space contact shadows are used. This applies regardless of whether a
@@ -350,24 +315,23 @@ public class LightManager {
          */
 
         /**
-         * When elvsm is set to true, "Exponential Layered VSM without Layers" are used. It is
-         * an improvement to the default EVSM which suffers important light leaks. Enabling
-         * ELVSM for a single shadowmap doubles the memory usage of all shadow maps.
-         * ELVSM is mostly useful when large blurs are used.
+         * The number of MSAA samples to use when rendering VSM shadow maps.
+         * Must be a power-of-two and greater than or equal to 1. A value of 1 effectively turns
+         * off MSAA.
+         * Higher values may not be available depending on the underlying hardware.
+         *
+         * <p>
+         * <strong>Warning: This API is still experimental and subject to change.</strong>
+         * </p>
          */
-        public boolean elvsm = false;
+        @IntRange(from = 1)
+        public int vsmMsaaSamples = 1;
 
         /**
          * Blur width for the VSM blur. Zero do disable.
          * 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 {
@@ -466,21 +430,14 @@ public class LightManager {
             mFinalizer = new BuilderFinalizer(mNativeBuilder);
         }
 
-        /**
-         * Enables or disables a light channel. Light channel 0 is enabled by default.
-         *
-         * @param channel Light channel to enable or disable, between 0 and 7.
-         * @param enable Whether to enable or disable the light channel.
-         */
-        @NonNull
-        public Builder lightChannel(@IntRange(from = 0, to = 7) int channel, boolean enable) {
-            nBuilderLightChannel(mNativeBuilder, channel, enable);
-            return this;
-        }
-
         /**
          * Whether this Light casts shadows (disabled by default)
          *
+         * <p>
+         * <b>warning:</b>
+         *  {@link Type#POINT} lights cannot cast shadows.
+         * </p>
+         *
          * @param enable Enables or disables casting shadows from this Light.
          *
          * @return This Builder, for chaining calls.
@@ -502,11 +459,9 @@ public class LightManager {
             nBuilderShadowOptions(mNativeBuilder,
                     options.mapSize, options.shadowCascades, options.cascadeSplitPositions,
                     options.constantBias, options.normalBias, options.shadowFar, options.shadowNearHint,
-                    options.shadowFarHint, options.stable, options.lispsm,
-                    options.polygonOffsetConstant, options.polygonOffsetSlope,
-                    options.screenSpaceContactShadows,
-                    options.stepCount, options.maxShadowDistance,
-                    options.elvsm, options.blurWidth, options.shadowBulbRadius);
+                    options.shadowFarHint, options.stable, options.screenSpaceContactShadows,
+                    options.stepCount, options.maxShadowDistance, options.vsmMsaaSamples,
+                    options.blurWidth);
             return this;
         }
 
@@ -795,7 +750,7 @@ public class LightManager {
 
     @NonNull
     public Type getType(@EntityInstance int i) {
-        return sTypeValues[nGetType(mNativeObject, i)];
+        return Type.values()[nGetType(mNativeObject, i)];
     }
 
     /**
@@ -830,30 +785,6 @@ public class LightManager {
         return type == Type.SPOT || type == Type.FOCUSED_SPOT;
     }
 
-    /**
-     * Enables or disables a light channel.
-     * Light channel 0 is enabled by default.
-     *
-     * @param i        Instance of the component obtained from getInstance().
-     * @param channel  Light channel to set
-     * @param enable   true to enable, false to disable
-     *
-     * @see Builder#lightChannel
-     */
-    public void setLightChannel(@EntityInstance int i, @IntRange(from = 0, to = 7) int channel, boolean enable) {
-        nSetLightChannel(mNativeObject, i, channel, enable);
-    }
-
-    /**
-     * Returns whether a light channel is enabled on a specified renderable.
-     * @param i        Instance of the component obtained from getInstance().
-     * @param channel  Light channel to query
-     * @return         true if the light channel is enabled, false otherwise
-     */
-    public boolean getLightChannel(@EntityInstance int i, @IntRange(from = 0, to = 7) int channel) {
-        return nGetLightChannel(mNativeObject, i, channel);
-    }
-
     /**
      * Dynamically updates the light's position.
      *
@@ -1004,6 +935,8 @@ public class LightManager {
      *                      lightbulbs.
      *
      * @param efficiency    Efficiency in percent. This depends on the type of lightbulb used.
+     *
+     * @return This Builder, for chaining calls.
      */
     public void setIntensity(@EntityInstance int i, float watts, float efficiency) {
         nSetIntensity(mNativeObject, i , watts, efficiency);
@@ -1162,14 +1095,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 lispsm,
-             float polygonOffsetConstant, float polygonOffsetSlope,
-             boolean screenSpaceContactShadows, int stepCount, float maxShadowDistance,
-             boolean elvsm, float blurWidth, float shadowBulbRadius);
+    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 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);
@@ -1182,7 +1108,6 @@ public class LightManager {
     private static native void nBuilderAngularRadius(long nativeBuilder, float angularRadius);
     private static native void nBuilderHaloSize(long nativeBuilder, float haloSize);
     private static native void nBuilderHaloFalloff(long nativeBuilder, float haloFalloff);
-    private static native void nBuilderLightChannel(long nativeBuilder, int channel, boolean enable);
 
     private static native void nComputeUniformSplits(float[] splitPositions, int cascades);
     private static native void nComputeLogSplits(float[] splitPositions, int cascades, float near, float far);
@@ -1212,6 +1137,4 @@ public class LightManager {
     private static native boolean nIsShadowCaster(long nativeLightManager, int i);
     private static native float nGetOuterConeAngle(long nativeLightManager, int i);
     private static native float nGetInnerConeAngle(long nativeLightManager, int i);
-    private static native void nSetLightChannel(long nativeLightManager, int i, int channel, boolean enable);
-    private static native boolean nGetLightChannel(long nativeLightManager, int i, int channel);
 }

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

@@ -36,22 +36,7 @@ import java.util.Set;
  *
  * @see <a href="https://google.github.io/filament/Materials.html">Filament Materials Guide</a>
  */
-@UsedByNative("AssetLoader.cpp")
 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;
 
@@ -225,8 +210,6 @@ public class Material {
 
     @UsedByNative("Material.cpp")
     public static class Parameter {
-        private static final Type[] sTypeValues = Type.values();
-
         public enum Type {
             BOOL,
             BOOL2,
@@ -292,7 +275,7 @@ public class Material {
                 @IntRange(from = 0) int type, @IntRange(from = 0) int precision,
                 @IntRange(from = 1) int count) {
             parameters.add(
-                    new Parameter(name, sTypeValues[type], Precision.values()[precision], count));
+                    new Parameter(name, Type.values()[type], Precision.values()[precision], count));
         }
     }
 
@@ -390,7 +373,7 @@ public class Material {
      * Material Models</a>
      */
     public Shading getShading() {
-        return EnumCache.sShadingValues[nGetShading(getNativeObject())];
+        return Shading.values()[nGetShading(getNativeObject())];
     }
 
     /**
@@ -401,7 +384,7 @@ public class Material {
      * Vertex and attributes: interpolation</a>
      */
     public Interpolation getInterpolation() {
-        return EnumCache.sInterpolationValues[nGetInterpolation(getNativeObject())];
+        return Interpolation.values()[nGetInterpolation(getNativeObject())];
     }
 
     /**
@@ -412,7 +395,7 @@ public class Material {
      * Blending and transparency: blending</a>
      */
     public BlendingMode getBlendingMode() {
-        return EnumCache.sBlendingModeValues[nGetBlendingMode(getNativeObject())];
+        return BlendingMode.values()[nGetBlendingMode(getNativeObject())];
     }
 
     /**
@@ -423,7 +406,7 @@ public class Material {
      * Blending and transparency: refraction</a>
      */
     public RefractionMode getRefractionMode() {
-        return EnumCache.sRefractionModeValues[nGetRefractionMode(getNativeObject())];
+        return RefractionMode.values()[nGetRefractionMode(getNativeObject())];
     }
 
     /**
@@ -434,9 +417,10 @@ public class Material {
      * Blending and transparency: refractionType</a>
      */
     public RefractionType getRefractionType() {
-        return EnumCache.sRefractionTypeValues[nGetRefractionType(getNativeObject())];
+        return RefractionType.values()[nGetRefractionType(getNativeObject())];
     }
 
+
     /**
      * Returns the vertex domain of this material.
      *
@@ -445,7 +429,7 @@ public class Material {
      * Vertex and attributes: vertexDomain</a>
      */
     public VertexDomain getVertexDomain() {
-        return EnumCache.sVertexDomainValues[nGetVertexDomain(getNativeObject())];
+        return VertexDomain.values()[nGetVertexDomain(getNativeObject())];
     }
 
     /**
@@ -456,7 +440,7 @@ public class Material {
      * Rasterization: culling</a>
      */
     public CullingMode getCullingMode() {
-        return EnumCache.sCullingModeValues[nGetCullingMode(getNativeObject())];
+        return CullingMode.values()[nGetCullingMode(getNativeObject())];
     }
 
     /**
@@ -503,17 +487,6 @@ public class Material {
         return nIsDoubleSided(getNativeObject());
     }
 
-    /**
-     * Indicates whether instances of this material will use alpha to coverage.
-     *
-     * @see
-     * <a href="https://google.github.io/filament/Materials.html#materialdefinitions/materialblock/rasterization:alphatocoverage">
-     * Rasterization: alphaToCoverage</a>
-     */
-    public boolean isAlphaToCoverageEnabled() {
-        return nIsAlphaToCoverageEnabled(getNativeObject());
-    }
-
     /**
      * Returns the alpha mask threshold used when the blending mode is set to masked.
      *
@@ -558,7 +531,7 @@ public class Material {
         if (mRequiredAttributes == null) {
             int bitSet = nGetRequiredAttributes(getNativeObject());
             mRequiredAttributes = EnumSet.noneOf(VertexBuffer.VertexAttribute.class);
-            VertexBuffer.VertexAttribute[] values = EnumCache.sVertexAttributeValues;
+            VertexBuffer.VertexAttribute[] values = VertexBuffer.VertexAttribute.values();
             for (int i = 0; i < values.length; i++) {
                 if ((bitSet & (1 << i)) != 0) {
                     mRequiredAttributes.add(values[i]);
@@ -926,7 +899,6 @@ public class Material {
     private static native boolean nIsDepthWriteEnabled(long nativeMaterial);
     private static native boolean nIsDepthCullingEnabled(long nativeMaterial);
     private static native boolean nIsDoubleSided(long nativeMaterial);
-    private static native boolean nIsAlphaToCoverageEnabled(long nativeMaterial);
     private static native float nGetMaskThreshold(long nativeMaterial);
     private static native float nGetSpecularAntiAliasingVariance(long nativeMaterial);
     private static native float nGetSpecularAntiAliasingThreshold(long nativeMaterial);

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

@@ -20,11 +20,7 @@ import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Size;
 
-import com.google.android.filament.proguard.UsedByNative;
-
-@UsedByNative("AssetLoader.cpp")
 public class MaterialInstance {
-    private static final Material.CullingMode[] sCullingModeValues = Material.CullingMode.values();
     private Material mMaterial;
     private String mName;
     private long mNativeObject;
@@ -53,54 +49,6 @@ public class MaterialInstance {
         MAT4
     }
 
-    /**
-     * Operations that control how the stencil buffer is updated.
-     */
-    public enum StencilOperation {
-        /**
-         * Keeps the current value.
-         */
-        KEEP,
-        /**
-         * Sets the value to 0.
-         */
-        ZERO,
-        /**
-         * Sets the value to the stencil reference value.
-         */
-        REPLACE,
-        /**
-         * Increments the current value. Clamps to the maximum representable unsigned value.
-         */
-        INCR_CLAMP,
-        /**
-         * Increments the current value. Wraps value to zero when incrementing the maximum
-         * representable unsigned value.
-         */
-        INCR_WRAP,
-        /**
-         * Decrements the current value. Clamps to 0.
-         */
-        DECR_CLAMP,
-        /**
-         * Decrements the current value. Wraps value to the maximum representable unsigned value
-         * when decrementing a value of zero.
-         */
-        DECR_WRAP,
-        /**
-         * Bitwise inverts the current value.
-         */
-        INVERT,
-    }
-
-    public enum StencilFace {
-        FRONT,
-        BACK,
-        FRONT_AND_BACK
-    }
-    // Converts the StencilFace enum ordinal to Filament's equivalent bit field.
-    static final int[] sStencilFaceMapping = {0x1, 0x2, 0x3};
-
     public MaterialInstance(Engine engine, long nativeMaterialInstance) {
         mNativeObject = nativeMaterialInstance;
         mNativeMaterial = nGetMaterial(mNativeObject);
@@ -108,7 +56,6 @@ public class MaterialInstance {
 
     MaterialInstance(@NonNull Material material, long nativeMaterialInstance) {
         mMaterial = material;
-        mNativeMaterial = material.getNativeObject();
         mNativeObject = nativeMaterialInstance;
     }
 
@@ -130,7 +77,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.getMaterial(), nativeInstance);
+        return new MaterialInstance(other.mMaterial, nativeInstance);
     }
 
     /** @return the {@link Material} associated with this instance */
@@ -291,10 +238,6 @@ 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
@@ -403,40 +346,19 @@ public class MaterialInstance {
     }
 
     /**
-     * Set-up a custom scissor rectangle; by default it is disabled.
+     * Set up a custom scissor rectangle; by default this encompasses the View.
      *
-     * <p>
-     * The scissor rectangle gets clipped by the View's viewport, in other words, the scissor
-     * cannot affect fragments outside of the View's Viewport.
-     * </p>
-     *
-     * <p>
-     * Currently the scissor is not compatible with dynamic resolution and should always be
-     * disabled when dynamic resolution is used.
-     * </p>
-     *
-     * @param left      left coordinate of the scissor box relative to the viewport
-     * @param bottom    bottom coordinate of the scissor box relative to the viewport
+     * @param left      left coordinate of the scissor box
+     * @param bottom    bottom coordinate of the scissor box
      * @param width     width of the scissor box
      * @param height    height of the scissor box
-     *
-     * @see #unsetScissor
-     * @see View#setViewport
-     * @see View#setDynamicResolutionOptions
      */
     public void setScissor(@IntRange(from = 0) int left, @IntRange(from = 0) int bottom,
             @IntRange(from = 0) int width, @IntRange(from = 0) int height) {
         nSetScissor(getNativeObject(), left, bottom, width, height);
     }
 
-    /**
-     * Returns the scissor rectangle to its default disabled setting.
-     * <p>
-     * Currently the scissor is not compatible with dynamic resolution and should always be
-     * disabled when dynamic resolution is used.
-     * </p>
-     * @see View#setDynamicResolutionOptions
-     */
+    /** Returns the scissor rectangle to its default setting, which encompasses the View. */
     public void unsetScissor() {
         nUnsetScissor(getNativeObject());
     }
@@ -474,14 +396,6 @@ public class MaterialInstance {
         nSetMaskThreshold(getNativeObject(), threshold);
     }
 
-    /**
-     * Gets the minimum alpha value a fragment must have to not be discarded when the blend
-     * mode is MASKED
-     */
-    public float getMaskThreshold() {
-        return nGetMaskThreshold(getNativeObject());
-    }
-
     /**
      * Sets the screen space variance of the filter kernel used when applying specular
      * anti-aliasing. The default value is set to 0.15. The specified value should be between
@@ -495,14 +409,6 @@ public class MaterialInstance {
         nSetSpecularAntiAliasingVariance(getNativeObject(), variance);
     }
 
-    /**
-     * Gets the screen space variance of the filter kernel used when applying specular
-     * anti-aliasing.
-     */
-    public float getSpecularAntiAliasingVariance() {
-        return nGetSpecularAntiAliasingVariance(getNativeObject());
-    }
-
     /**
      * Sets the clamping threshold used to suppress estimation errors when applying specular
      * anti-aliasing. The default value is set to 0.2. The specified value should be between 0
@@ -516,14 +422,6 @@ public class MaterialInstance {
         nSetSpecularAntiAliasingThreshold(getNativeObject(), threshold);
     }
 
-    /**
-     * Gets the clamping threshold used to suppress estimation errors when applying specular
-     * anti-aliasing.
-     */
-    public float getSpecularAntiAliasingThreshold() {
-        return nGetSpecularAntiAliasingThreshold(getNativeObject());
-    }
-
     /**
      * Enables or disables double-sided lighting if the parent Material has double-sided capability,
      * otherwise prints a warning. If double-sided lighting is enabled, backface culling is
@@ -537,14 +435,6 @@ public class MaterialInstance {
         nSetDoubleSided(getNativeObject(), doubleSided);
     }
 
-    /**
-     * Returns whether double-sided lighting is enabled when the parent Material has double-sided
-     * capability.
-     */
-    public boolean isDoubleSided() {
-        return nIsDoubleSided(getNativeObject());
-    }
-
     /**
      * Overrides the default triangle culling state that was set on the material.
      *
@@ -552,18 +442,10 @@ public class MaterialInstance {
      * <a href="https://google.github.io/filament/Materials.html#materialdefinitions/materialblock/rasterization:culling">
      * Rasterization: culling</a>
      */
-    public void setCullingMode(@NonNull Material.CullingMode mode) {
+    public void setCullingMode(Material.CullingMode mode) {
         nSetCullingMode(getNativeObject(), mode.ordinal());
     }
 
-    /**
-     * Returns the face culling mode.
-     */
-    @NonNull
-    public Material.CullingMode getCullingMode() {
-        return sCullingModeValues[nGetCullingMode(getNativeObject())];
-    }
-
     /**
      * Overrides the default color-buffer write state that was set on the material.
      *
@@ -575,13 +457,6 @@ public class MaterialInstance {
         nSetColorWrite(getNativeObject(), enable);
     }
 
-    /**
-     * Returns whether color write is enabled.
-     */
-    public boolean isColorWriteEnabled() {
-        return nIsColorWriteEnabled(getNativeObject());
-    }
-
     /**
      * Overrides the default depth-buffer write state that was set on the material.
      *
@@ -593,27 +468,6 @@ public class MaterialInstance {
         nSetDepthWrite(getNativeObject(), enable);
     }
 
-    /**
-     * Returns whether depth write is enabled.
-     */
-    public boolean isDepthWriteEnabled() {
-        return nIsDepthWriteEnabled(getNativeObject());
-    }
-
-    /**
-     * Enables or Disable stencil writes
-     */
-    public void setStencilWrite(boolean enable) {
-        nSetStencilWrite(getNativeObject(), enable);
-    }
-
-    /**
-     * Returns whether stencil write is enabled.
-     */
-    public boolean isStencilWriteEnabled() {
-        return nIsStencilWriteEnabled(getNativeObject());
-    }
-
     /**
      * Overrides the default depth testing state that was set on the material.
      *
@@ -625,215 +479,6 @@ public class MaterialInstance {
         nSetDepthCulling(getNativeObject(), enable);
     }
 
-    /**
-     * Returns whether depth culling is enabled.
-     */
-    public boolean isDepthCullingEnabled() {
-        return nIsDepthCullingEnabled(getNativeObject());
-    }
-
-    /**
-     * Sets the stencil comparison function (default is {@link TextureSampler.CompareFunction#ALWAYS}).
-     *
-     * <p>
-     * It's possible to set separate stencil comparison functions; one for front-facing polygons,
-     * and one for back-facing polygons. The face parameter determines the comparison function(s)
-     * updated by this call.
-     * </p>
-     *
-     * @param func the stencil comparison function
-     * @param face the faces to update the comparison function for
-     */
-    public void setStencilCompareFunction(TextureSampler.CompareFunction func, StencilFace face) {
-        nSetStencilCompareFunction(getNativeObject(), func.ordinal(),
-                sStencilFaceMapping[face.ordinal()]);
-    }
-
-    /**
-     * Sets the stencil comparison function for both front and back-facing polygons.
-     * @see #setStencilCompareFunction(TextureSampler.CompareFunction, StencilFace)
-     */
-    public void setStencilCompareFunction(TextureSampler.CompareFunction func) {
-        setStencilCompareFunction(func, StencilFace.FRONT_AND_BACK);
-    }
-
-    /**
-     * Sets the stencil fail operation (default is {@link StencilOperation#KEEP}).
-     *
-     * <p>
-     * The stencil fail operation is performed to update values in the stencil buffer when the
-     * stencil test fails.
-     * </p>
-     *
-     * <p>
-     * It's possible to set separate stencil fail operations; one for front-facing polygons, and one
-     * for back-facing polygons. The face parameter determines the stencil fail operation(s) updated
-     * by this call.
-     * </p>
-     *
-     * @param op the stencil fail operation
-     * @param face the faces to update the stencil fail operation for
-     */
-    public void setStencilOpStencilFail(StencilOperation op, StencilFace face) {
-        nSetStencilOpStencilFail(getNativeObject(), op.ordinal(),
-                sStencilFaceMapping[face.ordinal()]);
-    }
-
-    /**
-     * Sets the stencil fail operation for both front and back-facing polygons.
-     * @see #setStencilOpStencilFail(StencilOperation, StencilFace)
-     */
-    public void setStencilOpStencilFail(StencilOperation op) {
-        setStencilOpStencilFail(op, StencilFace.FRONT_AND_BACK);
-    }
-
-    /**
-     * Sets the depth fail operation (default is {@link StencilOperation#KEEP}).
-     *
-     * <p>
-     * The depth fail operation is performed to update values in the stencil buffer when the depth
-     * test fails.
-     * </p>
-     *
-     * <p>
-     * It's possible to set separate depth fail operations; one for front-facing polygons, and one
-     * for back-facing polygons. The face parameter determines the depth fail operation(s) updated
-     * by this call.
-     * </p>
-     *
-     * @param op the depth fail operation
-     * @param face the faces to update the depth fail operation for
-     */
-    public void setStencilOpDepthFail(StencilOperation op, StencilFace face) {
-        nSetStencilOpDepthFail(getNativeObject(), op.ordinal(),
-                sStencilFaceMapping[face.ordinal()]);
-    }
-
-    /**
-     * Sets the depth fail operation for both front and back-facing polygons.
-     * @see #setStencilOpDepthFail(StencilOperation, StencilFace)
-     */
-    public void setStencilOpDepthFail(StencilOperation op) {
-        setStencilOpDepthFail(op, StencilFace.FRONT_AND_BACK);
-    }
-
-    /**
-     * Sets the depth-stencil pass operation (default is {@link StencilOperation#KEEP}).
-     *
-     * <p>
-     * The depth-stencil pass operation is performed to update values in the stencil buffer when
-     * both the stencil test and depth test pass.
-     * </p>
-     *
-     * <p>
-     * It's possible to set separate depth-stencil pass operations; one for front-facing polygons,
-     * and one for back-facing polygons. The face parameter determines the depth-stencil pass
-     * operation(s) updated by this call.
-     * </p>
-     *
-     * @param op the depth-stencil pass operation
-     * @param face the faces to update the depth-stencil operation for
-     */
-    public void setStencilOpDepthStencilPass(StencilOperation op, StencilFace face) {
-        nSetStencilOpDepthStencilPass(getNativeObject(), op.ordinal(),
-                sStencilFaceMapping[face.ordinal()]);
-    }
-
-    /**
-     * Sets the depth-stencil pass operation for both front and back-facing polygons.
-     * @see #setStencilOpDepthStencilPass(StencilOperation, StencilFace)
-     */
-    public void setStencilOpDepthStencilPass(StencilOperation op) {
-        setStencilOpDepthStencilPass(op, StencilFace.FRONT_AND_BACK);
-    }
-
-    /**
-     * Sets the stencil reference value (default is 0).
-     *
-     * <p>
-     * The stencil reference value is the left-hand side for stencil comparison tests. It's also
-     * used as the replacement stencil value when {@link StencilOperation} is
-     * {@link StencilOperation#REPLACE}.
-     * </p>
-     *
-     * <p>
-     * It's possible to set separate stencil reference values; one for front-facing polygons, and
-     * one for back-facing polygons. The face parameter determines the reference value(s) updated by
-     * this call.
-     * </p>
-     *
-     * @param value the stencil reference value (only the least significant 8 bits are used)
-     * @param face the faces to update the reference value for
-     */
-    public void setStencilReferenceValue(@IntRange(from = 0, to = 255) int value, StencilFace face) {
-        nSetStencilReferenceValue(getNativeObject(), value, sStencilFaceMapping[face.ordinal()]);
-    }
-
-    /**
-     * Sets the stencil reference value for both front and back-facing polygons.
-     * @see #setStencilReferenceValue(int, StencilFace)
-     */
-    public void setStencilReferenceValue(@IntRange(from = 0, to = 255) int value) {
-        setStencilReferenceValue(value, StencilFace.FRONT_AND_BACK);
-    }
-
-    /**
-     * Sets the stencil read mask (default is 0xFF).
-     *
-     * <p>
-     * The stencil read mask masks the bits of the values participating in the stencil comparison
-     * test- both the value read from the stencil buffer and the reference value.
-     * </p>
-     *
-     * <p>
-     * It's possible to set separate stencil read masks; one for front-facing polygons, and one for
-     * back-facing polygons. The face parameter determines the stencil read mask(s) updated by this
-     * call.
-     * </p>
-     *
-     * @param readMask the read mask (only the least significant 8 bits are used)
-     * @param face the faces to update the read mask for
-     */
-    public void setStencilReadMask(@IntRange(from = 0, to = 255) int readMask, StencilFace face) {
-        nSetStencilReadMask(getNativeObject(), readMask, sStencilFaceMapping[face.ordinal()]);
-    }
-
-    /**
-     * Sets the stencil read mask for both front and back-facing polygons.
-     * @see #setStencilReadMask(int, StencilFace)
-     */
-    public void setStencilReadMask(@IntRange(from = 0, to = 255) int readMask) {
-        setStencilReadMask(readMask, StencilFace.FRONT_AND_BACK);
-    }
-
-    /**
-     * Sets the stencil write mask (default is 0xFF).
-     *
-     * <p>
-     * The stencil write mask masks the bits in the stencil buffer updated by stencil operations.
-     * </p>
-     *
-     * <p>
-     * It's possible to set separate stencil write masks; one for front-facing polygons, and one for
-     * back-facing polygons. The face parameter determines the stencil write mask(s) updated by this
-     * call.
-     * </p>
-     *
-     * @param writeMask the write mask (only the least significant 8 bits are used)
-     * @param face the faces to update the read mask for
-     */
-    public void setStencilWriteMask(@IntRange(from = 0, to = 255) int writeMask, StencilFace face) {
-        nSetStencilWriteMask(getNativeObject(), writeMask, sStencilFaceMapping[face.ordinal()]);
-    }
-
-    /**
-     * Sets the stencil write mask for both front and back-facing polygons.
-     * @see #setStencilWriteMask(int, StencilFace)
-     */
-    public void setStencilWriteMask(int writeMask) {
-        setStencilWriteMask(writeMask, StencilFace.FRONT_AND_BACK);
-    }
-
     public long getNativeObject() {
         if (mNativeObject == 0) {
             throw new IllegalStateException("Calling method on destroyed MaterialInstance");
@@ -906,37 +551,10 @@ public class MaterialInstance {
     private static native void nSetCullingMode(long nativeMaterialInstance, long mode);
     private static native void nSetColorWrite(long nativeMaterialInstance, boolean enable);
     private static native void nSetDepthWrite(long nativeMaterialInstance, boolean enable);
-    private static native void nSetStencilWrite(long nativeMaterialInstance, boolean enable);
     private static native void nSetDepthCulling(long nativeMaterialInstance, boolean enable);
 
-    private static native void nSetStencilCompareFunction(long nativeMaterialInstance,
-            long function, long face);
-    private static native void nSetStencilOpStencilFail(long nativeMaterialInstance, long op,
-            long face);
-    private static native void nSetStencilOpDepthFail(long nativeMaterialInstance, long op,
-            long face);
-    private static native void nSetStencilOpDepthStencilPass(long nativeMaterialInstance, long op,
-            long face);
-    private static native void nSetStencilReferenceValue(long nativeMaterialInstance, int value,
-            long face);
-    private static native void nSetStencilReadMask(long nativeMaterialInstance, int readMask,
-            long face);
-    private static native void nSetStencilWriteMask(long nativeMaterialInstance, int writeMask,
-            long face);
-
     private static native String nGetName(long nativeMaterialInstance);
     private static native long nGetMaterial(long nativeMaterialInstance);
 
     private static native long nDuplicate(long otherNativeMaterialInstance, String name);
-
-
-    private static native float nGetMaskThreshold(long nativeMaterialInstance);
-    private static native float nGetSpecularAntiAliasingVariance(long nativeMaterialInstance);
-    private static native float nGetSpecularAntiAliasingThreshold(long nativeMaterialInstance);
-    private static native boolean nIsDoubleSided(long nativeMaterialInstance);
-    private static native int nGetCullingMode(long nativeMaterialInstance);
-    private static native boolean nIsColorWriteEnabled(long nativeMaterialInstance);
-    private static native boolean nIsDepthWriteEnabled(long nativeMaterialInstance);
-    private static native boolean nIsStencilWriteEnabled(long nativeMaterialInstance);
-    private static native boolean nIsDepthCullingEnabled(long nativeMaterialInstance);
 }

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

@@ -1,180 +0,0 @@
-/*
- * 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 float4 positions for the given morph target.
-     *
-     * @param engine {@link Engine} instance
-     * @param targetIndex The index of morph target to be updated
-     * @param positions An array with at least count*4 floats
-     * @param count Number of float4 vectors in positions to be consumed
-     */
-    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 for the given morph target.
-     *
-     * These quaternions must be represented as signed shorts, where real numbers in the [-1,+1]
-     * range multiplied by 32767.
-     *
-     * @param engine {@link Engine} instance
-     * @param targetIndex The index of morph target to be updated
-     * @param tangents An array with at least "count*4" shorts
-     * @param count number of short4 quaternions 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 vertices in this {@link MorphTargetBuffer}
-     */
-    public int getVertexCount() {
-        return nGetVertexCount(mNativeObject);
-    }
-
-    /**
-     * @return number of morph targets 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,10 +31,8 @@ import androidx.annotation.Nullable;
  * @see View
  */
 public class RenderTarget {
-    private static final int ATTACHMENT_COUNT = AttachmentPoint.values().length;
-    private static final Texture.CubemapFace[] sCubemapFaceValues = Texture.CubemapFace.values();
-
     private long mNativeObject;
+    private static final int ATTACHMENT_COUNT = AttachmentPoint.values().length;
     private final Texture[] mTextures = new Texture[ATTACHMENT_COUNT];
 
     private RenderTarget(long nativeRenderTarget, Builder builder) {
@@ -196,7 +194,7 @@ public class RenderTarget {
      * a cubemap.
      */
     public Texture.CubemapFace getFace(AttachmentPoint attachment) {
-        return sCubemapFaceValues[nGetFace(getNativeObject(), attachment.ordinal())];
+        return Texture.CubemapFace.values()[nGetFace(getNativeObject(), attachment.ordinal())];
     }
 
     /**

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

@@ -58,10 +58,6 @@ 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) {
@@ -96,9 +92,7 @@ public class RenderableManager {
     public enum PrimitiveType {
         POINTS(0),
         LINES(1),
-        LINE_STRIP(3),
-        TRIANGLES(4),
-        TRIANGLE_STRIP(5);
+        TRIANGLES(4);
 
         private final int mType;
         PrimitiveType(int value) { mType = value; }
@@ -191,9 +185,7 @@ public class RenderableManager {
         }
 
         /**
-         * Sets the drawing order for blended primitives. The drawing order is either global or
-         * local (default) to this Renderable. In either case, the Renderable priority takes
-         * precedence.
+         * Sets an ordering index for blended primitives that all live at the same Z value.
          *
          * @param index the primitive of interest
          * @param blendOrder draw order number (0 by default). Only the lowest 15 bits are used.
@@ -205,18 +197,6 @@ public class RenderableManager {
             return this;
         }
 
-       /**
-         * Sets whether the blend order is global or local to this Renderable (by default).
-         *
-         * @param index the primitive of interest
-         * @param enabled true for global, false for local blend ordering.
-         */
-        @NonNull
-        public Builder globalBlendOrderEnabled(@IntRange(from = 0) int index, boolean enabled) {
-            nBuilderGlobalBlendOrderEnabled(mNativeBuilder, index, enabled);
-            return this;
-        }
-
         /**
          * The axis-aligned bounding box of the renderable.
          *
@@ -257,79 +237,23 @@ public class RenderableManager {
          * Provides coarse-grained control over draw order.
          *
          * <p>In general Filament reserves the right to re-order renderables to allow for efficient
-         * rendering. However clients can control ordering at a coarse level using \em priority.
-         * The priority is applied separately for opaque and translucent objects, that is, opaque
-         * objects are always drawn before translucent objects regardless of the priority.</p>
+         * rendering. However clients can control ordering at a coarse level using <em>priority</em>.</p>
          *
          * <p>For example, this could be used to draw a semitransparent HUD, if a client wishes to
          * avoid using a separate View for the HUD. Note that priority is completely orthogonal to
          * {@link Builder#layerMask}, which merely controls visibility.</p>
-
-         * <p>The Skybox always using the lowest priority, so it's drawn last, which may improve
-         * performance.</p>
          *
          * <p>The priority is clamped to the range [0..7], defaults to 4; 7 is lowest priority
          * (rendered last).</p>
          *
          * @see Builder#blendOrder
          */
-
-        /**
-         * Provides coarse-grained control over draw order.
-         *
-         * <p>In general Filament reserves the right to re-order renderables to allow for efficient
-         * rendering. However clients can control ordering at a coarse level using priority.
-         * The priority is applied separately for opaque and translucent objects, that is, opaque
-         * objects are always drawn before translucent objects regardless of the priority.</p>
-         *
-         * <p>For example, this could be used to draw a semitransparent HUD, if a client wishes to
-         * avoid using a separate View for the HUD. Note that priority is completely orthogonal to
-         * {@link Builder#layerMask}, which merely controls visibility.</p>
-
-         * <p>The Skybox always using the lowest priority, so it's drawn last, which may improve
-         * performance.</p>
-         *
-         * @param priority clamped to the range [0..7], defaults to 4; 7 is lowest priority
-         *                 (rendered last).
-         *
-         * @return Builder reference for chaining calls.
-         *
-         * @see Builder#channel
-         * @see Builder#blendOrder
-         * @see #setPriority
-         * @see #setBlendOrderAt
-         */
         @NonNull
         public Builder priority(@IntRange(from = 0, to = 7) int priority) {
             nBuilderPriority(mNativeBuilder, priority);
             return this;
         }
 
-        /**
-         * Set the channel this renderable is associated to. There can be 4 channels.
-         *
-         * <p>All renderables in a given channel are rendered together, regardless of anything else.
-         * They are sorted as usual within a channel.</p>
-         * <p>Channels work similarly to priorities, except that they enforce the strongest
-         * ordering.</p>
-         *
-         * <p>Channels 0 and 1 may not have render primitives using a material with `refractionType`
-         * set to `screenspace`.</p>
-         *
-         * @param channel clamped to the range [0..3], defaults to 2.
-         *
-         * @return Builder reference for chaining calls.
-         *
-         * @see Builder::blendOrder()
-         * @see Builder::priority()
-         * @see RenderableManager::setBlendOrderAt()
-         */
-        @NonNull
-        public Builder channel(@IntRange(from = 0, to = 3) int channel) {
-            nBuilderChannel(mNativeBuilder, channel);
-            return this;
-        }
-
         /**
          * Controls frustum culling, true by default.
          *
@@ -342,34 +266,6 @@ public class RenderableManager {
             return this;
         }
 
-        /**
-         * Enables or disables a light channel. Light channel 0 is enabled by default.
-         *
-         * @param channel Light channel to enable or disable, between 0 and 7.
-         * @param enable Whether to enable or disable the light channel.
-         */
-        @NonNull
-        public Builder lightChannel(@IntRange(from = 0, to = 7) int channel, boolean enable) {
-            nBuilderLightChannel(mNativeBuilder, channel, enable);
-            return this;
-        }
-
-        /**
-         * Specifies the number of draw instance of this renderable. The default is 1 instance and
-         * the maximum number of instances allowed is 32767. 0 is invalid.
-         * All instances are culled using the same bounding box, so care must be taken to make
-         * sure all instances render inside the specified bounding box.
-         * The material can use getInstanceIndex() in the vertex shader to get the instance index and
-         * possibly adjust the position or transform.
-         *
-         * @param instanceCount the number of instances silently clamped between 1 and 32767.
-         */
-        @NonNull
-        public Builder instances(@IntRange(from = 1, to = 32767) int instanceCount) {
-            nBuilderInstances(mNativeBuilder, instanceCount);
-            return this;
-        }
-
         /**
          * Controls if this renderable casts shadows, false by default.
          *
@@ -417,19 +313,7 @@ public class RenderableManager {
          */
         @NonNull
         public Builder enableSkinningBuffers(boolean enabled) {
-            nBuilderEnableSkinningBuffers(mNativeBuilder, enabled);
-            return this;
-        }
-
-        /**
-         * Controls if this renderable is affected by the large-scale fog.
-         * @param enabled If true, enables large-scale fog on this object. Disables it otherwise.
-         *                True by default.
-         * @return this <code>Builder</code> object for chaining calls
-         */
-         @NonNull
-        public Builder fog(boolean enabled) {
-            nBuilderFog(mNativeBuilder, enabled);
+            nEnableSkinningBuffers(mNativeBuilder, enabled);
             return this;
         }
 
@@ -498,67 +382,17 @@ public class RenderableManager {
         }
 
         /**
-         * Controls if the renderable has vertex morphing targets, zero by default. This is
-         * required to enable GPU morphing.
+         * Controls if the renderable has vertex morphing targets, false by default.
          *
-         * <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>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>See also {@link RenderableManager#setMorphWeights}, which can be called on a per-frame basis
          * to advance the animation.</p>
          */
         @NonNull
-        public Builder morphing(@IntRange(from = 0, to = 255) int targetCount) {
-            nBuilderMorphing(mNativeBuilder, targetCount);
-            return this;
-        }
-
-        /**
-         * Specifies the morph target buffer for a primitive.
-         *
-         * The morph target buffer must have an associated renderable and geometry. Two conditions
-         * must be met:
-         * 1. The number of morph targets in the buffer must equal the renderable's morph target
-         *    count.
-         * 2. The vertex count of each morph target must equal the geometry's vertex count.
-         *
-         * @param level the level of detail (lod), only 0 can be specified
-         * @param primitiveIndex zero-based index of the primitive, must be less than the count passed to Builder constructor
-         * @param morphTargetBuffer specifies the morph target buffer
-         * @param offset specifies where in the morph target buffer to start reading (expressed as a number of vertices)
-         * @param count number of vertices in the morph target buffer to read, must equal the geometry's count (for triangles, this should be a multiple of 3)
-         */
-        @NonNull
-        public Builder morphing(@IntRange(from = 0) int level,
-                                @IntRange(from = 0) int primitiveIndex,
-                                @NonNull MorphTargetBuffer morphTargetBuffer,
-                                @IntRange(from = 0) int offset,
-                                @IntRange(from = 0) int count) {
-            nBuilderSetMorphTargetBufferAt(mNativeBuilder, level, primitiveIndex,
-                    morphTargetBuffer.getNativeObject(), offset, count);
-            return this;
-        }
-
-        /**
-         * Utility method to specify morph target buffer for a primitive.
-         * For details, see the {@link RenderableManager.Builder#morphing}.
-         */
-        @NonNull
-        public Builder morphing(@IntRange(from = 0) int level,
-                                @IntRange(from = 0) int primitiveIndex,
-                                @NonNull MorphTargetBuffer morphTargetBuffer) {
-            nBuilderSetMorphTargetBufferAt(mNativeBuilder, level, primitiveIndex,
-                    morphTargetBuffer.getNativeObject(), 0, morphTargetBuffer.getVertexCount());
+        public Builder morphing(boolean enabled) {
+            nBuilderMorphing(mNativeBuilder, enabled);
             return this;
         }
 
@@ -645,50 +479,15 @@ public class RenderableManager {
     /**
      * Updates the vertex morphing weights on a renderable, all zeroes by default.
      *
-     * <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>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.</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 offset,
-                                       @IntRange(from = 0) int count) {
-        nSetMorphTargetBufferAt(mNativeObject, i, level, primitiveIndex,
-                morphTargetBuffer.getNativeObject(), offset, count);
-    }
-
-    /**
-     * Utility method to change morph target buffer for the given primitive.
-     * For details, see the {@link RenderableManager#setMorphTargetBufferAt}.
-     */
-    public void setMorphTargetBufferAt(@EntityInstance int i,
-                                       @IntRange(from = 0) int level,
-                                       @IntRange(from = 0) int primitiveIndex,
-                                       @NonNull MorphTargetBuffer morphTargetBuffer) {
-        nSetMorphTargetBufferAt(mNativeObject, i, level, primitiveIndex,
-                morphTargetBuffer.getNativeObject(), 0, morphTargetBuffer.getVertexCount());
-    }
-
-    /**
-     * Gets the morph target count on a renderable.
-     */
-    @IntRange(from = 0)
-    public int getMorphTargetCount(@EntityInstance int i) {
-        return nGetMorphTargetCount(mNativeObject, i);
+    public void setMorphWeights(@EntityInstance int i, @NonNull @Size(min = 4) float[] weights) {
+        nSetMorphWeights(mNativeObject, i, weights);
     }
 
     /**
@@ -723,15 +522,6 @@ public class RenderableManager {
         nSetPriority(mNativeObject, i, priority);
     }
 
-    /**
-     * Changes the channel of a renderable
-     *
-     * @see Builder#channel
-     */
-    public void setChannel(@EntityInstance int i, @IntRange(from = 0, to = 3) int channel) {
-        nSetChannel(mNativeObject, i, channel);
-    }
-
     /**
      * Changes whether or not frustum culling is on.
      *
@@ -741,47 +531,6 @@ public class RenderableManager {
         nSetCulling(mNativeObject, i, enabled);
     }
 
-    /**
-     * Changes whether or not the large-scale fog is applied to this renderable
-     * @see Builder#fog
-     */
-    public void setFogEnabled(@EntityInstance int i, boolean enabled) {
-        nSetFogEnabled(mNativeObject, i, enabled);
-    }
-
-    /**
-     * Returns whether large-scale fog is enabled for this renderable.
-     * @return True if fog is enabled for this renderable.
-     * @see Builder#fog
-     */
-    public boolean getFogEnabled(@EntityInstance int i) {
-        return nGetFogEnabled(mNativeObject, i);
-    }
-
-    /**
-     * Enables or disables a light channel.
-     * Light channel 0 is enabled by default.
-     *
-     * @param i        Instance of the component obtained from getInstance().
-     * @param channel  Light channel to set
-     * @param enable   true to enable, false to disable
-     *
-     * @see Builder#lightChannel
-     */
-    public void setLightChannel(@EntityInstance int i, @IntRange(from = 0, to = 7) int channel, boolean enable) {
-        nSetLightChannel(mNativeObject, i, channel, enable);
-    }
-
-    /**
-     * Returns whether a light channel is enabled on a specified renderable.
-     * @param i        Instance of the component obtained from getInstance().
-     * @param channel  Light channel to query
-     * @return         true if the light channel is enabled, false otherwise
-     */
-    public boolean getLightChannel(@EntityInstance int i, @IntRange(from = 0, to = 7) int channel) {
-        return nGetLightChannel(mNativeObject, i, channel);
-    }
-
     /**
      * Changes whether or not the renderable casts shadows.
      *
@@ -900,9 +649,18 @@ public class RenderableManager {
                 0, indices.getIndexCount());
     }
 
-     /**
-     * Changes the drawing order for blended primitives. The drawing order is either global or
-     * local (default) to this Renderable. In either case, the Renderable priority takes precedence.
+    /**
+     * Changes the geometry for the given primitive.
+     *
+     * @see Builder#geometry Builder.geometry
+     */
+    public void setGeometryAt(@EntityInstance int i, @IntRange(from = 0) int primitiveIndex,
+            @NonNull PrimitiveType type, @IntRange(from = 0) int offset, @IntRange(from = 0) int count) {
+        nSetGeometryAt(mNativeObject, i, primitiveIndex, type.getValue(), offset, count);
+    }
+
+    /**
+     * Changes the ordering index for blended primitives that all live at the same Z value.
      *
      * @see Builder#blendOrder
      *
@@ -915,36 +673,18 @@ public class RenderableManager {
         nSetBlendOrderAt(mNativeObject, instance, primitiveIndex, blendOrder);
     }
 
-    /**
-     * Changes whether the blend order is global or local to this Renderable (by default).
-     *
-     * @see Builder#globalBlendOrderEnabled
-     *
-     * @param instance the renderable of interest
-     * @param primitiveIndex the primitive of interest
-     * @param enabled true for global, false for local blend ordering.
-     */
-    public void setGlobalBlendOrderEnabledAt(@EntityInstance int instance, @IntRange(from = 0) int primitiveIndex,
-            boolean enabled) {
-        nSetGlobalBlendOrderEnabledAt(mNativeObject, instance, primitiveIndex, enabled);
-    }
-
     /**
      * 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 = sVertexAttributeValues;
-
+        Set<VertexBuffer.VertexAttribute> requiredAttributes = EnumSet.noneOf(VertexBuffer.VertexAttribute.class);
+        VertexBuffer.VertexAttribute[] values = VertexBuffer.VertexAttribute.values();
         for (int j = 0; j < values.length; j++) {
             if ((bitSet & (1 << j)) != 0) {
                 requiredAttributes.add(values[j]);
             }
         }
-
         requiredAttributes = Collections.unmodifiableSet(requiredAttributes);
         return requiredAttributes;
     }
@@ -966,11 +706,9 @@ public class RenderableManager {
     private static native void nBuilderGeometry(long nativeBuilder, int index, int value, long nativeVertexBuffer, long nativeIndexBuffer, int offset, int minIndex, int maxIndex, int count);
     private static native void nBuilderMaterial(long nativeBuilder, int index, long nativeMaterialInstance);
     private static native void nBuilderBlendOrder(long nativeBuilder, int index, int blendOrder);
-    private static native void nBuilderGlobalBlendOrderEnabled(long nativeBuilder, int index, boolean enabled);
     private static native void nBuilderBoundingBox(long nativeBuilder, float cx, float cy, float cz, float ex, float ey, float ez);
     private static native void nBuilderLayerMask(long nativeBuilder, int select, int value);
     private static native void nBuilderPriority(long nativeBuilder, int priority);
-    private static native void nBuilderChannel(long nativeBuilder, int channel);
     private static native void nBuilderCulling(long nativeBuilder, boolean enabled);
     private static native void nBuilderCastShadows(long nativeBuilder, boolean enabled);
     private static native void nBuilderReceiveShadows(long nativeBuilder, boolean enabled);
@@ -978,28 +716,17 @@ 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, int targetCount);
-    private static native void nBuilderSetMorphTargetBufferAt(long nativeBuilder, int level, int primitiveIndex, long nativeMorphTargetBuffer, int offset, int count);
-    private static native void nBuilderEnableSkinningBuffers(long nativeBuilder, boolean enabled);
-    private static native void nBuilderFog(long nativeBuilder, boolean enabled);
-    private static native void nBuilderLightChannel(long nativeRenderableManager, int channel, boolean enable);
-    private static native void nBuilderInstances(long nativeRenderableManager, int instances);
+    private static native void nBuilderMorphing(long nativeBuilder, boolean enabled);
+    private static native void nEnableSkinningBuffers(long nativeBuilder, boolean enabled);
 
     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, 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 nSetMorphWeights(long nativeObject, int instance, float[] weights);
     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);
-    private static native void nSetChannel(long nativeRenderableManager, int i, int channel);
     private static native void nSetCulling(long nativeRenderableManager, int i, boolean enabled);
-    private static native void nSetFogEnabled(long nativeRenderableManager, int i, boolean enabled);
-    private static native boolean nGetFogEnabled(long nativeRenderableManager, int i);
-    private static native void nSetLightChannel(long nativeRenderableManager, int i, int channel, boolean enable);
-    private static native boolean nGetLightChannel(long nativeRenderableManager, int i, int channel);
     private static native void nSetCastShadows(long nativeRenderableManager, int i, boolean enabled);
     private static native void nSetReceiveShadows(long nativeRenderableManager, int i, boolean enabled);
     private static native void nSetScreenSpaceContactShadows(long nativeRenderableManager, int i, boolean enabled);
@@ -1010,7 +737,7 @@ public class RenderableManager {
     private static native void nSetMaterialInstanceAt(long nativeRenderableManager, int i, int primitiveIndex, long nativeMaterialInstance);
     private static native long nGetMaterialInstanceAt(long nativeRenderableManager, int i, int primitiveIndex);
     private static native void nSetGeometryAt(long nativeRenderableManager, int i, int primitiveIndex, int primitiveType, long nativeVertexBuffer, long nativeIndexBuffer, int offset, int count);
+    private static native void nSetGeometryAt(long nativeRenderableManager, int i, int primitiveIndex, int primitiveType, int offset, int count);
     private static native void nSetBlendOrderAt(long nativeRenderableManager, int i, int primitiveIndex, int blendOrder);
-    private static native void nSetGlobalBlendOrderEnabledAt(long nativeRenderableManager, int i, int primitiveIndex, boolean enabled);
     private static native int nGetEnabledAttributesAt(long nativeRenderableManager, int i, int primitiveIndex);
 }

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

@@ -61,17 +61,13 @@ public class Renderer {
         /**
          * How far in advance a buffer must be queued for presentation at a given time in ns
          * On Android you can use {@link android.view.Display#getPresentationDeadlineNanos()}.
-         * @deprecated this value is ignored
          */
-        @Deprecated
         public long presentationDeadlineNanos = 0;
 
         /**
          * Offset by which vsyncSteadyClockTimeNano provided in beginFrame() is offset in ns
          * On Android you can use {@link android.view.Display#getAppVsyncOffsetNanos()}.
-         * @deprecated this value is ignored
          */
-        @Deprecated
         public long vsyncOffsetNanos = 0;
     };
 
@@ -111,12 +107,12 @@ public class Renderer {
         /**
          * Rate at which the scale will change to reach the target frame rate.
          */
-        public float scaleRate = 1.0f / 15.0f;
+        public float scaleRate = 0.125f;
 
         /**
-         * History size. higher values, tend to filter more (clamped to 31).
+         * History size. higher values, tend to filter more (clamped to 30).
          */
-        public int history = 15;
+        public int history = 9;
     }
 
     /**
@@ -124,24 +120,7 @@ public class Renderer {
      */
     public static class ClearOptions {
         /**
-         * Color (sRGB linear) to use to clear the RenderTarget (typically the SwapChain).
-         *
-         * The RenderTarget is cleared using this color, which won't be tone-mapped since
-         * tone-mapping is part of View rendering (this is not).
-         *
-         * When a View is rendered, there are 3 scenarios to consider:
-         * - Pixels rendered by the View replace the clear color (or blend with it in
-         *   `BlendMode.TRANSLUCENT` mode).
-         *
-         * - With blending mode set to `BlendMode.TRANSLUCENT`, Pixels untouched by the View
-         *   are considered fulling transparent and let the clear color show through.
-         *
-         * - With blending mode set to `BlendMode.OPAQUE`, Pixels untouched by the View
-         *   are set to the clear color. However, because it is now used in the context of a View,
-         *   it will go through the post-processing stage, which includes tone-mapping.
-         *
-         * For consistency, it is recommended to always use a Skybox to clear an opaque View's
-         * background, or to use black or fully-transparent (i.e. {0,0,0,0}) as the clear color.
+         * Color to use to clear the SwapChain
          */
         @NonNull
         public float[] clearColor = { 0.0f, 0.0f, 0.0f, 0.0f };
@@ -196,7 +175,8 @@ public class Renderer {
      */
     public void setDisplayInfo(@NonNull DisplayInfo info) {
         mDisplayInfo = info;
-        nSetDisplayInfo(getNativeObject(), info.refreshRate);
+        nSetDisplayInfo(getNativeObject(),
+                info.refreshRate, info.presentationDeadlineNanos, info.vsyncOffsetNanos);
     }
 
     /**
@@ -267,23 +247,6 @@ public class Renderer {
         return mEngine;
     }
 
-    /**
-     * Set the time at which the frame must be presented to the display.
-     * <p>
-     * This must be called between {@link #beginFrame} and {@link #endFrame}.
-     * </p>
-     *
-     * @param monotonicClockNanos  The time in nanoseconds corresponding to the system monotonic
-     *                             up-time clock. The presentation time is typically set in the
-     *                             middle of the period of interest and cannot be too far in the
-     *                             future as it is limited by how many buffers are available in
-     *                             the display sub-system. Typically it is set to 1 or 2 vsync
-     *                             periods away.
-     */
-    public void setPresentationTime(long monotonicClockNanos) {
-        nSetPresentationTime(getNativeObject(), monotonicClockNanos);
-    }
-
     /**
      * Sets up a frame for this <code>Renderer</code>.
      * <p><code>beginFrame</code> manages frame pacing, and returns whether or not a frame should be
@@ -346,7 +309,7 @@ public class Renderer {
      *
      * <p><code>render()</code> generates commands for each of the following stages:</p>
      * <ul>
-     * <li>Shadow map passes, if needed</li>
+     * <li>Shadow map pass, if needed (currently only a single shadow map is supported)</li>
      * <li>Depth pre-pass</li>
      * <li>SSAO pass, if enabled</li>
      * <li>Color pass</li>
@@ -474,9 +437,8 @@ public class Renderer {
      *</pre>
      *
      *
-     * <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>
+     * <p>Typically <code>readPixels</code> will be called after {@link #render} and before
+     * {@link #endFrame}.</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.
@@ -568,10 +530,6 @@ public class Renderer {
      * Typically, this will happen after multiple calls to {@link #beginFrame},
      * {@link #render}, {@link #endFrame}.</p>
      * <br>
-     * <p>OpenGL only: if issuing a <code>readPixels</code> on a {@link RenderTarget} backed by a
-     * {@link Texture} that had data uploaded to it via {@link Texture#setImage}, the data returned
-     * from <code>readPixels</code> will be y-flipped with respect to the {@link Texture#setImage}
-     * call.</p>
      * <p><code>readPixels</code> is intended for debugging and testing.
      * It will impact performance significantly.</p>
      *
@@ -701,7 +659,6 @@ public class Renderer {
         mNativeObject = 0;
     }
 
-    private static native void nSetPresentationTime(long nativeObject, long monotonicClockNanos);
     private static native boolean nBeginFrame(long nativeRenderer, long nativeSwapChain, long frameTimeNanos);
     private static native void nEndFrame(long nativeRenderer);
     private static native void nRender(long nativeRenderer, long nativeView);
@@ -723,7 +680,8 @@ public class Renderer {
             Object handler, Runnable callback);
     private static native double nGetUserTime(long nativeRenderer);
     private static native void nResetUserTime(long nativeRenderer);
-    private static native void nSetDisplayInfo(long nativeRenderer, float refreshRate);
+    private static native void nSetDisplayInfo(long nativeRenderer,
+            float refreshRate, long presentationDeadlineNanos, long vsyncOffsetNanos);
     private static native void nSetFrameRateOptions(long nativeRenderer,
             float interval, float headRoomRatio, float scaleRate, int history);
     private static native void nSetClearOptions(long nativeRenderer,

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

@@ -163,15 +163,6 @@ public class Scene {
         return nGetLightCount(getNativeObject());
     }
 
-    /**
-     * Returns true if the given entity is in the Scene.
-     *
-     * @return Whether the given entity is in the Scene.
-     */
-    public boolean hasEntity(@Entity int entity) {
-        return nHasEntity(getNativeObject(), entity);
-    }
-
     public long getNativeObject() {
         if (mNativeObject == 0) {
             throw new IllegalStateException("Calling method on destroyed Scene");
@@ -191,5 +182,4 @@ public class Scene {
     private static native void nRemoveEntities(long nativeScene, int[] entities);
     private static native int nGetRenderableCount(long nativeScene);
     private static native int nGetLightCount(long nativeScene);
-    private static native boolean nHasEntity(long nativeScene, int entity);
 }

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

@@ -29,6 +29,7 @@ import java.nio.ReadOnlyBufferException;
  * Stream supports three different configurations:
  *
  * <dl>
+ * <dt>TEXTURE_ID</dt>   <dd>takes an OpenGL texture ID and incurs a copy</dd>
  * <dt>ACQUIRED</dt>     <dd>connects to an Android AHardwareBuffer</dd>
  * <dt>NATIVE</dt>       <dd>connects to an Android SurfaceTexture</dd>
  * </dl>
@@ -65,6 +66,12 @@ import java.nio.ReadOnlyBufferException;
  * </ul>
  *
  * <p>
+ * The <b>TEXTURE_ID</b> configuration achieves synchronization automatically. In this mode,
+ * Filament performs a copy on the main thread during beginFrame by blitting the external image into
+ * an internal round-robin queue of images. This copy has a run-time cost.
+ * </p>
+ *
+ * <p>
  * For <b>ACQUIRED</b> streams, there is no need to perform the copy because Filament explictly
  * acquires the stream, then releases it later via a callback function. This configuration is
  * especially useful when the Vulkan backend is enabled.
@@ -84,8 +91,6 @@ import java.nio.ReadOnlyBufferException;
  * @see Engine#destroyStream
  */
 public class Stream {
-    private static final StreamType[] sStreamTypeValues = StreamType.values();
-
     private long mNativeObject;
     private long mNativeEngine;
 
@@ -96,6 +101,9 @@ public class Stream {
         /** Not synchronized but copy-free. Good for video. */
         NATIVE,
 
+        /** Synchronized, but GL-only and incurs copies. Good for AR on devices before API 26. */
+        TEXTURE_ID,
+
         /** Synchronized, copy-free, and take a release callback. Good for AR but requires API 26+. */
         ACQUIRED,
     };
@@ -111,7 +119,8 @@ public class Stream {
      * By default, Stream objects are {@link StreamType#ACQUIRED ACQUIRED} and must have external images pushed to them via
      * {@link #setAcquiredImage}.
      *
-     * To create a {@link StreamType#NATIVE NATIVE} stream, call the <pre>stream</pre> method on the builder.
+     * To create a {@link StreamType#NATIVE NATIVE} or {@link StreamType#TEXTURE_ID TEXTURE_ID} stream, call one of the <pre>stream</pre> methods
+     * on the builder.
      */
     public static class Builder {
         @SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"}) // Keep to finalize native resources
@@ -145,6 +154,27 @@ public class Stream {
             throw new IllegalArgumentException("Invalid stream source: " + streamSource);
         }
 
+        /**
+         * Creates a {@link StreamType#TEXTURE_ID TEXTURE_ID} stream. A copy stream will sample data from the supplied
+         * external texture and copy it into an internal private texture.
+         *
+         * <p>Currently only OpenGL external texture ids are supported.</p>
+         *
+         * @param externalTextureId An opaque texture id (typically a GLuint created with
+         *                          <code>glGenTextures()</code>) in a context shared with
+         *                          filament -- in that case this texture's target must be
+         *                          <code>GL_TEXTURE_EXTERNAL_OES.</code>
+         * @return This Builder, for chaining calls.
+         * @see Texture#setExternalStream
+         * @deprecated this method existed only for ARCore which doesn't need this anymore, use {@link Texture.Builder#importTexture(long)} instead.
+         */
+        @Deprecated
+        @NonNull
+        public Builder stream(long externalTextureId) {
+            nBuilderStream(mNativeBuilder, externalTextureId);
+            return this;
+        }
+
         /**
          * @param width initial width of the incoming stream. Whether this value is used is
          *              stream dependent. On Android, it must be set when using
@@ -203,10 +233,10 @@ public class Stream {
     }
 
     /**
-     * Indicates whether this <code>Stream</code> is NATIVE or ACQUIRED.
+     * Indicates whether this <code>Stream</code> is NATIVE, TEXTURE_ID, or ACQUIRED.
      */
     public StreamType getStreamType() {
-        return sStreamTypeValues[nGetStreamType(getNativeObject())];
+        return StreamType.values()[nGetStreamType(getNativeObject())];
     }
 
     /**
@@ -222,7 +252,7 @@ public class Stream {
      * also where the callback is invoked. This method can only be used for streams that were
      * constructed without calling the {@link Builder.stream} method.
      *
-     * See {@link Stream} for more information about NATIVE and ACQUIRED configurations.
+     * See {@link Stream} for more information about NATIVE, TEXTURE_ID, and ACQUIRED configurations.
      *
      * @param hwbuffer {@link android.hardware.HardwareBuffer HardwareBuffer} (requires API level 26)
      * @param handler {@link java.util.concurrent.Executor Executor} or {@link android.os.Handler Handler}.
@@ -244,6 +274,92 @@ public class Stream {
         nSetDimensions(getNativeObject(), width, height);
     }
 
+    /**
+     * Reads back the content of the last frame of a <code>Stream</code> since the last call to
+     * {@link Renderer#beginFrame}.
+     *
+     * <p>The Stream must be a copy stream, which can be checked with {@link #getStreamType()}.
+     * This function is a no-op otherwise.</p>
+     *
+     * <pre>
+     *
+     *  Stream buffer                  User buffer (PixelBufferDescriptor)
+     *  +--------------------+
+     *  |                    |                .stride         .alignment
+     *  |                    |         ----------------------->-->
+     *  |                    |         O----------------------+--+   low addresses
+     *  |                    |         |          |           |  |
+     *  |             w      |         |          | .top      |  |
+     *  |       <--------->  |         |          V           |  |
+     *  |       +---------+  |         |     +---------+      |  |
+     *  |       |     ^   |  | ======> |     |         |      |  |
+     *  |   x   |    h|   |  |         |.left|         |      |  |
+     *  +------>|     v   |  |         +---->|         |      |  |
+     *  |       +.........+  |         |     +.........+      |  |
+     *  |            ^       |         |                      |  |
+     *  |          y |       |         +----------------------+--+  high addresses
+     *  O------------+-------+
+     *
+     * </pre>
+     *
+     * <p>Typically readPixels() will be called after {@link Renderer#beginFrame}.</p>
+     *
+     * <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.
+     * Typically, this will happen after multiple calls to {@link Renderer#beginFrame},
+     * {@link Renderer#render}, {@link Renderer#endFrame}.</p>
+     *
+     * <p><code>readPixels</code> is intended for debugging and testing.
+     * It will impact performance significantly.</p>
+     *
+     * @param xoffset   left offset of the sub-region to read back
+     * @param yoffset   bottom offset of the sub-region to read back
+     * @param width     width of the sub-region to read back
+     * @param height    height of the sub-region to read back
+     * @param buffer    client-side buffer where the read-back will be written
+     *
+     *                  <p>
+     *                  The following format are always supported:
+     *                      <li>{@link Texture.Format#RGBA}</li>
+     *                      <li>{@link Texture.Format#RGBA_INTEGER}</li>
+     *                  </p>
+     *
+     *                  <p>
+     *                  The following types are always supported:
+     *                      <li>{@link Texture.Type#UBYTE}</li>
+     *                      <li>{@link Texture.Type#UINT}</li>
+     *                      <li>{@link Texture.Type#INT}</li>
+     *                      <li>{@link Texture.Type#FLOAT}</li>
+     *                  </p>
+     *
+     *                  <p>Other combination of format/type may be supported. If a combination is
+     *                  not supported, this operation may fail silently. Use a DEBUG build
+     *                  to get some logs about the failure.</p>
+     *
+     * @exception BufferOverflowException if the specified parameters would result in reading
+     * outside of <code>buffer</code>.
+     */
+    public void readPixels(
+            @IntRange(from = 0) int xoffset, @IntRange(from = 0) int yoffset,
+            @IntRange(from = 0) int width, @IntRange(from = 0) int height,
+            @NonNull Texture.PixelBufferDescriptor buffer) {
+
+        if (buffer.storage.isReadOnly()) {
+            throw new ReadOnlyBufferException();
+        }
+
+        int result = nReadPixels(getNativeObject(), mNativeEngine,
+                xoffset, yoffset, width, height,
+                buffer.storage, buffer.storage.remaining(),
+                buffer.left, buffer.top, buffer.type.ordinal(), buffer.alignment,
+                buffer.stride, buffer.format.ordinal(),
+                buffer.handler, buffer.callback);
+
+        if (result < 0) {
+            throw new BufferOverflowException();
+        }
+    }
+
     /**
      * Returns the presentation time of the currently displayed frame in nanosecond.
      *
@@ -269,6 +385,7 @@ public class Stream {
     private static native long nCreateBuilder();
     private static native void nDestroyBuilder(long nativeStreamBuilder);
     private static native void nBuilderStreamSource(long nativeStreamBuilder, Object streamSource);
+    private static native void nBuilderStream(long nativeStreamBuilder, long externalTextureId);
     private static native void nBuilderWidth(long nativeStreamBuilder, int width);
     private static native void nBuilderHeight(long nativeStreamBuilder, int height);
     private static native long nBuilderBuild(long nativeStreamBuilder, long nativeEngine);

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

@@ -91,34 +91,11 @@ public class SwapChain {
      */
     public static final long CONFIG_ENABLE_XCB = 0x4;
 
-    /**
-     * Indicates that the SwapChain must automatically perform linear to sRGB encoding.
-     *
-     * This flag is ignored if isSRGBSwapChainSupported() is false.
-     *
-     * When using this flag, post-processing should be disabled.
-     *
-     * @see SwapChain#isSRGBSwapChainSupported
-     * @see View#setPostProcessingEnabled
-     */
-    public static final long CONFIG_SRGB_COLORSPACE = 0x10;
-
     SwapChain(long nativeSwapChain, Object surface) {
         mNativeObject = nativeSwapChain;
         mSurface = surface;
     }
 
-    /**
-     * Return whether createSwapChain supports the SWAP_CHAIN_CONFIG_SRGB_COLORSPACE flag.
-     * The default implementation returns false.
-     *
-     * @param engine A reference to the filament Engine
-     * @return true if SWAP_CHAIN_CONFIG_SRGB_COLORSPACE is supported, false otherwise.
-     */
-    public static boolean isSRGBSwapChainSupported(@NonNull Engine engine) {
-        return nIsSRGBSwapChainSupported(engine.getNativeObject());
-    }
-
     /**
      * @return the native <code>Object</code> this <code>SwapChain</code> was created from or null
      *         for a headless SwapChain.
@@ -164,5 +141,4 @@ public class SwapChain {
     }
 
     private static native void nSetFrameCompletedCallback(long nativeSwapChain, Object handler, Runnable callback);
-    private static native boolean nIsSRGBSwapChainSupported(long nativeEngine);
 }

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

@@ -71,9 +71,6 @@ 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) {
@@ -219,50 +216,7 @@ public class Texture {
         ETC2_EAC_RGBA8, ETC2_EAC_SRGBA8,
 
         // Available everywhere except Android/iOS
-        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,
-
-        // RGTC formats available with a GLES extension
-        RED_RGTC1,              // BC4 unsigned
-        SIGNED_RED_RGTC1,       // BC4 signed
-        RED_GREEN_RGTC2,        // BC5 unsigned
-        SIGNED_RED_GREEN_RGTC2, // BC5 signed
-
-        // BPTC formats available with a GLES extension
-        RGB_BPTC_SIGNED_FLOAT,  // BC6H signed
-        RGB_BPTC_UNSIGNED_FLOAT,// BC6H unsigned
-        RGBA_BPTC_UNORM,        // BC7
-        SRGB_ALPHA_BPTC_UNORM   // BC7 sRGB
+        DXT1_RGB, DXT1_RGBA, DXT3_RGBA, DXT5_RGBA
     }
 
     /**
@@ -277,50 +231,7 @@ public class Texture {
         ETC2_EAC_RGBA8, ETC2_EAC_SRGBA8,
 
         // Available everywhere except Android/iOS
-        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,
-
-        // RGTC formats available with a GLES extension
-        RED_RGTC1,              // BC4 unsigned
-        SIGNED_RED_RGTC1,       // BC4 signed
-        RED_GREEN_RGTC2,        // BC5 unsigned
-        SIGNED_RED_GREEN_RGTC2, // BC5 signed
-
-        // BPTC formats available with a GLES extension
-        RGB_BPTC_SIGNED_FLOAT,  // BC6H signed
-        RGB_BPTC_UNSIGNED_FLOAT,// BC6H unsigned
-        RGBA_BPTC_UNORM,        // BC7
-        SRGB_ALPHA_BPTC_UNORM   // BC7 sRGB
+        DXT1_RGB, DXT1_RGBA, DXT3_RGBA, DXT5_RGBA
     }
 
     /**
@@ -566,7 +477,7 @@ public class Texture {
          * @param alignment     Alignment in bytes.
          * @return              Size of the buffer in bytes.
          */
-        public static int computeDataSize(@NonNull Format format, @NonNull Type type,
+        static int computeDataSize(@NonNull Format format, @NonNull Type type,
                 int stride, int height, @IntRange(from = 1, to = 8) int alignment) {
             if (type == Type.COMPRESSED) {
                 return 0;
@@ -894,7 +805,7 @@ public class Texture {
      */
     @NonNull
     public Sampler getTarget() {
-        return sSamplerValues[nGetTarget(getNativeObject())];
+        return Sampler.values()[nGetTarget(getNativeObject())];
     }
 
     /**
@@ -902,13 +813,13 @@ public class Texture {
      */
     @NonNull
     public InternalFormat getFormat() {
-        return sInternalFormatValues[nGetInternalFormat(getNativeObject())];
+        return InternalFormat.values()[nGetInternalFormat(getNativeObject())];
     }
 
     // TODO: add a setImage() version that takes an android Bitmap
 
     /**
-     * <code>setImage</code> is used to modify the whole content of the texture from a CPU-buffer.
+     * <code>setImage</code> is used to modify the whole content of the texure from a CPU-buffer.
      *
      *  <p>This <code>Texture</code> instance must use {@link Sampler#SAMPLER_2D SAMPLER_2D} or
      *  {@link Sampler#SAMPLER_EXTERNAL SAMPLER_EXTERNAL}. If the later is specified
@@ -936,7 +847,7 @@ public class Texture {
     public void setImage(@NonNull Engine engine,
             @IntRange(from = 0) int level,
             @NonNull PixelBufferDescriptor buffer) {
-        setImage(engine, level, 0, 0, 0, getWidth(level), getHeight(level), 1, buffer);
+        setImage(engine, level, 0, 0, getWidth(level), getHeight(level), buffer);
     }
 
 
@@ -971,15 +882,33 @@ public class Texture {
             @IntRange(from = 0) int xoffset, @IntRange(from = 0) int yoffset,
             @IntRange(from = 0) int width, @IntRange(from = 0) int height,
             @NonNull PixelBufferDescriptor buffer) {
-        setImage(engine, level, xoffset, yoffset, 0, width, height, 1, buffer);
+        int result;
+        if (buffer.type == COMPRESSED) {
+            result = nSetImageCompressed(getNativeObject(), engine.getNativeObject(), level,
+                    xoffset, yoffset, width, height,
+                    buffer.storage, buffer.storage.remaining(),
+                    buffer.left, buffer.top, buffer.type.ordinal(), buffer.alignment,
+                    buffer.compressedSizeInBytes, buffer.compressedFormat.ordinal(),
+                    buffer.handler, buffer.callback);
+        } else {
+            result = nSetImage(getNativeObject(), engine.getNativeObject(), level,
+                    xoffset, yoffset, width, height,
+                    buffer.storage, buffer.storage.remaining(),
+                    buffer.left, buffer.top, buffer.type.ordinal(), buffer.alignment,
+                    buffer.stride, buffer.format.ordinal(),
+                    buffer.handler, buffer.callback);
+        }
+        if (result < 0) {
+            throw new BufferOverflowException();
+        }
     }
 
     /**
-     * <code>setImage</code> is used to modify a sub-region of a 3D texture, 2D texture array or
-     * cubemap from a CPU-buffer. Cubemaps are treated like a 2D array of six layers.
+     * <code>setImage</code> is used to modify a sub-region of the 3D texture or 2D texture array
+     * from a CPU-buffer.
      *
-     *  <p>This <code>Texture</code> instance must use {@link Sampler#SAMPLER_2D_ARRAY SAMPLER_2D_ARRAY},
-     *  {@link Sampler#SAMPLER_3D SAMPLER_3D} or {@link Sampler#SAMPLER_CUBEMAP SAMPLER_CUBEMAP}.</p>
+     *  <p>This <code>Texture</code> instance must use {@link Sampler#SAMPLER_2D_ARRAY SAMPLER_2D_ARRAY} or
+     *  {@link Sampler#SAMPLER_3D SAMPLER_3D}.</p>
      *
      * @param engine    {@link Engine} this texture is associated to. Must be the
      *                  instance passed to {@link Builder#build Builder.build()}.
@@ -1052,9 +981,7 @@ public class Texture {
      *
      * @see Builder#sampler
      * @see PixelBufferDescriptor
-     * @deprecated use {@link #setImage(Engine, int, int, int, int, int, int, int, PixelBufferDescriptor)}
      */
-     @Deprecated
     public void setImage(@NonNull Engine engine, @IntRange(from = 0) int level,
             @NonNull PixelBufferDescriptor buffer,
             @NonNull @Size(min = 6) int[] faceOffsetsInBytes) {
@@ -1266,6 +1193,18 @@ public class Texture {
     private static native int nGetTarget(long nativeTexture);
     private static native int nGetInternalFormat(long nativeTexture);
 
+    private static native int nSetImage(long nativeTexture, long nativeEngine,
+            int level, int xoffset, int yoffset, int width, int height,
+            Buffer storage, int remaining, int left, int top, int type, int alignment,
+            int stride, int format,
+            Object handler, Runnable callback);
+
+    private static native int nSetImageCompressed(long nativeTexture, long nativeEngine,
+            int level, int xoffset, int yoffset, int width, int height,
+            Buffer storage, int remaining, int left, int top, int type, int alignment,
+            int compressedSizeInBytes, int compressedFormat,
+            Object handler, Runnable callback);
+
     private static native int nSetImage3D(long nativeTexture, long nativeEngine,
             int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth,
             Buffer storage, int remaining, int left, int top, int type, int alignment,

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

@@ -22,14 +22,6 @@ 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.
@@ -210,7 +202,7 @@ public class TextureSampler {
      * @return the minification filter
      */
     public MinFilter getMinFilter() {
-        return EnumCache.sMinFilterValues[nGetMinFilter(mSampler)];
+        return MinFilter.values()[nGetMinFilter(mSampler)];
     }
 
     /**
@@ -226,7 +218,7 @@ public class TextureSampler {
      * @return the magnification filter
      */
     public MagFilter getMagFilter() {
-        return EnumCache.sMagFilterValues[nGetMagFilter(mSampler)];
+        return MagFilter.values()[nGetMagFilter(mSampler)];
     }
 
     /**
@@ -242,7 +234,7 @@ public class TextureSampler {
      * @return the wrapping mode in the s (horizontal) direction
      */
     public WrapMode getWrapModeS() {
-        return EnumCache.sWrapModeValues[nGetWrapModeS(mSampler)];
+        return WrapMode.values()[nGetWrapModeS(mSampler)];
     }
 
     /**
@@ -257,7 +249,7 @@ public class TextureSampler {
      * @return the wrapping mode in the t (vertical) direction
      */
     public WrapMode getWrapModeT() {
-        return EnumCache.sWrapModeValues[nGetWrapModeT(mSampler)];
+        return WrapMode.values()[nGetWrapModeT(mSampler)];
     }
 
     /**
@@ -272,11 +264,11 @@ public class TextureSampler {
      * @return the wrapping mode in the r (depth) direction
      */
     public WrapMode getWrapModeR() {
-        return EnumCache.sWrapModeValues[nGetWrapModeR(mSampler)];
+        return WrapMode.values()[nGetWrapModeR(mSampler)];
     }
 
     /**
-     * Sets the wrapping mode in the r (depth) direction.
+     * Sets the wrapping mode in the t (depth) direction.
      * @param mode wrapping mode
      */
     public void setWrapModeR(WrapMode mode) {
@@ -305,7 +297,7 @@ public class TextureSampler {
      * @return the comparison mode
      */
     public CompareMode getCompareMode() {
-        return EnumCache.sCompareModeValues[nGetCompareMode(mSampler)];
+        return CompareMode.values()[nGetCompareMode(mSampler)];
     }
 
     /**
@@ -321,7 +313,7 @@ public class TextureSampler {
      * @return the comparison function
      */
     public CompareFunction getCompareFunction() {
-        return EnumCache.sCompareFunctionValues[nGetCompareFunction(mSampler)];
+        return CompareFunction.values()[nGetCompareFunction(mSampler)];
     }
 
     /**

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

@@ -109,6 +109,7 @@ 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>
@@ -122,14 +123,15 @@ public class ToneMapper {
          * the {@link ACESLegacy} tone mapper. The default values are:
          *
          * <ul>
-         * <li>contrast = 1.55f</li>
+         * <li>contrast = 1.4f</li>
+         * <li>shoulder = 0.5f</li>
          * <li>midGrayIn = 0.18f</li>
-         * <li>midGrayOut = 0.215f</li>
+         * <li>midGrayOut = 0.266f</li>
          * <li>hdrMax = 10.0f</li>
          * </ul>
          */
         public Generic() {
-            this(1.55f, 0.18f, 0.215f, 10.0f);
+            this(1.4f, 0.5f, 0.18f, 0.266f, 10.0f);
         }
 
         /**
@@ -137,14 +139,16 @@ 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 midGrayIn, float midGrayOut, float hdrMax) {
-            super(nCreateGenericToneMapper(contrast, midGrayIn, midGrayOut, hdrMax));
+                float contrast, float shoulder, float midGrayIn, float midGrayOut, float hdrMax) {
+            super(nCreateGenericToneMapper(contrast, shoulder, midGrayIn, midGrayOut, hdrMax));
         }
 
         /** Returns the contrast of the curve as a strictly positive value. */
@@ -157,6 +161,16 @@ 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());
@@ -195,15 +209,17 @@ public class ToneMapper {
     private static native long nCreateACESLegacyToneMapper();
     private static native long nCreateFilmicToneMapper();
     private static native long nCreateGenericToneMapper(
-            float contrast, float midGrayIn, float midGrayOut, float hdrMax);
+            float contrast, float shoulder, 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/TransformManager.java

@@ -16,7 +16,6 @@
 
 package com.google.android.filament;
 
-import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Size;
@@ -84,35 +83,6 @@ import androidx.annotation.Size;
         return nGetInstance(mNativeObject, entity);
     }
 
-    /**
-     * Enables or disable the accurate translation mode. Disabled by default.
-     *
-     * When accurate translation mode is active, the translation component of all transforms is
-     * maintained at double precision. This is only useful if the mat4 version of setTransform()
-     * is used, as well as getTransformAccurate().
-     *
-     * @param enable true to enable the accurate translation mode, false to disable.
-     *
-     * @see #isAccurateTranslationsEnabled
-     * @see #create(int, int, double[])
-     * @see #setTransform(int, double[])
-     * @see #getTransform(int, double[])
-     * @see #getWorldTransform(int, double[])
-     */
-    public void setAccurateTranslationsEnabled(boolean enable) {
-        nSetAccurateTranslationsEnabled(mNativeObject, enable);
-    }
-
-    /**
-     * Returns whether the high precision translation mode is active.
-     *
-     * @return true if accurate translations mode is active, false otherwise
-     * @see #setAccurateTranslationsEnabled
-     */
-    public boolean isAccurateTranslationsEnabled() {
-        return nIsAccurateTranslationsEnabled(mNativeObject);
-    }
-
     /**
      * Creates a transform component and associates it with the given entity. The component is
      * initialized with the identity transform.
@@ -144,23 +114,6 @@ import androidx.annotation.Size;
         return nCreateArray(mNativeObject, entity, parent, localTransform);
     }
 
-    /**
-     * Creates a transform component with a parent and associates it with the given entity.
-     * If this component already exists on the given entity, it is first
-     * destroyed as if {@link #destroy} was called.
-     *
-     * @param entity         an {@link Entity} to associate a transform component to.
-     * @param parent         the  {@link EntityInstance} of the parent transform
-     * @param localTransform the transform, relative to the parent, to initialize the transform
-     *                       component with.
-     * @see #destroy
-     */
-    @EntityInstance
-    public int create(@Entity int entity, @EntityInstance int parent,
-            @Nullable @Size(min = 16) double[] localTransform) {
-        return nCreateArrayFp64(mNativeObject, entity, parent, localTransform);
-    }
-
     /**
      * Destroys this component from the given entity, children are orphaned.
      *
@@ -200,36 +153,6 @@ import androidx.annotation.Size;
         return nGetParent(mNativeObject, i);
     }
 
-    /**
-     * Returns the number of children of an {@link EntityInstance}.
-     *
-     * @param i the {@link EntityInstance} of the transform component to query.
-     * @return The number of children of the queried component.
-     */
-    public int getChildCount(@EntityInstance int i) {
-        return nGetChildCount(mNativeObject, i);
-    }
-
-    /**
-     * Gets a list of children for a transform component.
-     *
-     * @param i           the {@link EntityInstance} of the transform component to get the children
-     *                    from.
-     * @param outEntities array to receive the result sized to the maximum number of children to
-     *                    retrieve. If <code>null</code> is given, a new suitable array sized to
-     *                    {@link #getChildCount(int)} is allocated.
-     * @return Array of retrieved children {@link Entity}.
-     */
-    public @Entity @NonNull int[] getChildren(@EntityInstance int i, @Nullable int[] outEntities) {
-        if (outEntities == null) {
-            outEntities = new int[getChildCount(i)];
-        }
-        if (outEntities.length > 0) {
-            nGetChildren(mNativeObject, i, outEntities, outEntities.length);
-        }
-        return outEntities;
-    }
-
     /**
      * Sets a local transform of a transform component.
      * <p>This operation can be slow if the hierarchy of transform is too deep, and this
@@ -247,24 +170,6 @@ import androidx.annotation.Size;
         nSetTransform(mNativeObject, i, localTransform);
     }
 
-    /**
-     * Sets a local transform of a transform component.
-     * <p>This operation can be slow if the hierarchy of transform is too deep, and this
-     * will be particularly bad when updating a lot of transforms. In that case,
-     * consider using {@link #openLocalTransformTransaction} / {@link #commitLocalTransformTransaction}.</p>
-     *
-     * @param i              the {@link EntityInstance} of the transform component to set the local
-     *                       transform to.
-     * @param localTransform the local transform (i.e. relative to the parent).
-     * @see #getTransform(int, double[])
-     * @see #getWorldTransform(int, double[])
-     */
-    public void setTransform(@EntityInstance int i,
-            @NonNull @Size(min = 16) double[] localTransform) {
-        Asserts.assertMat4In(localTransform);
-        nSetTransformFp64(mNativeObject, i, localTransform);
-    }
-
     /**
      * Returns the local transform of a transform component.
      *
@@ -285,26 +190,6 @@ import androidx.annotation.Size;
         return outLocalTransform;
     }
 
-    /**
-     * Returns the local transform of a transform component.
-     *
-     * @param i                 the {@link EntityInstance} of the transform component to query the
-     *                          local transform from.
-     * @param outLocalTransform a 16 <code>float</code> array to receive the result.
-     *                          If <code>null</code> is given,  a new suitable array is allocated.
-     * @return the local transform of the component (i.e. relative to the parent). This always
-     * returns the value set by setTransform().
-     * @see #setTransform
-     */
-    @NonNull
-    @Size(min = 16)
-    public double[] getTransform(@EntityInstance int i,
-            @Nullable @Size(min = 16) double[] outLocalTransform) {
-        outLocalTransform = Asserts.assertMat4(outLocalTransform);
-        nGetTransformFp64(mNativeObject, i, outLocalTransform);
-        return outLocalTransform;
-    }
-
     /**
      * Returns the world transform of a transform component.
      *
@@ -325,26 +210,6 @@ import androidx.annotation.Size;
         return outWorldTransform;
     }
 
-    /**
-     * Returns the world transform of a transform component.
-     *
-     * @param i                 the {@link EntityInstance} of the transform component to query the
-     *                          world transform from.
-     * @param outWorldTransform a 16 <code>float</code> array to receive the result.
-     *                          If <code>null</code> is given,  a new suitable array is allocated
-     * @return The world transform of the component (i.e. relative to the root). This is the
-     * composition of this component's local transform with its parent's world transform.
-     * @see #setTransform
-     */
-    @NonNull
-    @Size(min = 16)
-    public double[] getWorldTransform(@EntityInstance int i,
-            @Nullable @Size(min = 16) double[] outWorldTransform) {
-        outWorldTransform = Asserts.assertMat4(outWorldTransform);
-        nGetWorldTransformFp64(mNativeObject, i, outWorldTransform);
-        return outWorldTransform;
-    }
-
     /**
      * Opens a local transform transaction. During a transaction, {@link #getWorldTransform} can
      * return an invalid transform until {@link #commitLocalTransformTransaction} is called.
@@ -387,20 +252,12 @@ import androidx.annotation.Size;
     private static native int nGetInstance(long nativeTransformManager, int entity);
     private static native int nCreate(long nativeTransformManager, int entity);
     private static native int nCreateArray(long mNativeObject, int entity, int parent, float[] localTransform);
-    private static native int nCreateArrayFp64(long mNativeObject, int entity, int parent, double[] localTransform);
     private static native void nDestroy(long nativeTransformManager, int entity);
     private static native void nSetParent(long nativeTransformManager, int i, int newParent);
     private static native int nGetParent(long nativeTransformManager, int i);
-    private static native int nGetChildCount(long nativeTransformManager, int i);
-    private static native void nGetChildren(long nativeEntityManager, int i, int[] outEntities, int count);
     private static native void nSetTransform(long nativeTransformManager, int i, float[] localTransform);
-    private static native void nSetTransformFp64(long nativeTransformManager, int i, double[] localTransform);
     private static native void nGetTransform(long nativeTransformManager, int i, float[] outLocalTransform);
-    private static native void nGetTransformFp64(long nativeTransformManager, int i, double[] outLocalTransform);
     private static native void nGetWorldTransform(long nativeTransformManager, int i, float[] outWorldTransform);
-    private static native void nGetWorldTransformFp64(long nativeTransformManager, int i, double[] outWorldTransform);
     private static native void nOpenLocalTransformTransaction(long nativeTransformManager);
     private static native void nCommitLocalTransformTransaction(long nativeTransformManager);
-    private static native void nSetAccurateTranslationsEnabled(long nativeTransformManager, boolean enable);
-    private static native boolean nIsAccurateTranslationsEnabled(long nativeTransformManager);
 }

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

@@ -157,6 +157,8 @@ public class DisplayHelper {
             info = new Renderer.DisplayInfo();
         }
         info.refreshRate = DisplayHelper.getRefreshRate(display);
+        info.presentationDeadlineNanos = DisplayHelper.getPresentationDeadlineNanos(display);
+        info.vsyncOffsetNanos = DisplayHelper.getAppVsyncOffsetNanos(display);
         return info;
     }
 

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

@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2023 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.android;
-
-import com.google.android.filament.Engine;
-import com.google.android.filament.Fence;
-
-public class FilamentHelper {
-
-    /**
-     * Wait for all pending frames to be processed before returning. This is to
-     * avoid a race between the surface being resized before pending frames are
-     * rendered into it. This is typically called from {@link UiHelper.RendererCallback#onResized},
-     * {@link android.view.SurfaceHolder.Callback#surfaceChanged} or
-     * {@link android.view.TextureView.SurfaceTextureListener#onSurfaceTextureSizeChanged}.
-     *
-     * @param engine Filament engine to synchronize
-     *
-     * @see UiHelper.RendererCallback#onResized
-     * @see android.view.SurfaceHolder.Callback#surfaceChanged
-     * @see android.view.TextureView.SurfaceTextureListener#onSurfaceTextureSizeChanged
-     */
-    static public void synchronizePendingFrames(Engine engine) {
-        Fence fence = engine.createFence();
-        fence.wait(Fence.Mode.FLUSH, Fence.WAIT_FOR_EVER);
-        engine.destroyFence(fence);
-    }
-}

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

@@ -84,14 +84,6 @@ import com.google.android.filament.SwapChain;
  *             // The native surface has changed size. This is always called at least once
  *             // after the surface is created (after onNativeWindowChanged() is invoked).
  *             public void onResized(int width, int height) {
- *
- *                 // Wait for all pending frames to be processed before returning. This is to
- *                 // avoid a race between the surface being resized before pending frames are
- *                 // rendered into it.
- *                 Fence fence = mEngine.createFence();
- *                 fence.wait(Fence.Mode.FLUSH, Fence.WAIT_FOR_EVER);
- *                 mEngine.destroyFence(fence);
- *
  *                 // Compute camera projection and set the viewport on the view
  *             }
  *         });
@@ -183,7 +175,7 @@ public class UiHelper {
     }
 
     private static class SurfaceViewHandler implements RenderSurface {
-        private final SurfaceView mSurfaceView;
+        private SurfaceView mSurfaceView;
 
         SurfaceViewHandler(SurfaceView surface) {
             mSurfaceView = surface;
@@ -200,7 +192,7 @@ public class UiHelper {
     }
 
     private static class SurfaceHolderHandler implements RenderSurface {
-        private final SurfaceHolder mSurfaceHolder;
+        private SurfaceHolder mSurfaceHolder;
 
         SurfaceHolderHandler(SurfaceHolder surface) {
             mSurfaceHolder = surface;
@@ -217,7 +209,7 @@ public class UiHelper {
     }
 
     private class TextureViewHandler implements RenderSurface {
-        private final TextureView mTextureView;
+        private TextureView mTextureView;
         private Surface mSurface;
 
         TextureViewHandler(TextureView surface) { mTextureView = surface; }

android/filament-utils-android/CMakeLists.txt

@@ -14,10 +14,6 @@ add_library(image STATIC IMPORTED)
 set_target_properties(image PROPERTIES IMPORTED_LOCATION
         ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libimage.a)
 
-add_library(ktxreader STATIC IMPORTED)
-set_target_properties(ktxreader PROPERTIES IMPORTED_LOCATION
-        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libktxreader.a)
-
 add_library(viewer STATIC IMPORTED)
 set_target_properties(viewer PROPERTIES IMPORTED_LOCATION
         ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libviewer.a)
@@ -54,7 +50,6 @@ 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)
 
@@ -68,6 +63,5 @@ target_link_libraries(filament-utils-jni
         camutils
         iblprefilter
         image
-        ktxreader
         viewer
 )

android/filament-utils-android/build.gradle

@@ -1,10 +1,16 @@
 apply plugin: 'kotlin-android'
-kotlin {
-    jvmToolchain(versions.jdk)
-}
 
 android {
-    namespace 'com.google.android.filament.utils'
+    flavorDimensions "functionality"
+    productFlavors {
+        full {
+            dimension "functionality"
+        }
+
+        lite {
+            dimension "functionality"
+        }
+    }
 
     sourceSets {
         main {
@@ -12,23 +18,24 @@ android {
         }
     }
 
-    defaultConfig {
-        missingDimensionStrategy 'functionality', 'full'
-    }
+    // No need to package up the following shared libs, which arise as a side effect of our
+    // externalNativeBuild dependencies. When clients pick and choose from project-level gradle
+    // dependencies, these shared libs already get pulled in, so we need to avoid the error:
+    // "More than one file was found with OS independent path ..."
     packagingOptions {
-        // No need to package up the following shared libs, which arise as a side effect of our
-        // externalNativeBuild dependencies. When clients pick and choose from project-level gradle
-        // dependencies, these shared libs already get pulled in, so we need to avoid the error:
-        // "More than one file was found with OS independent path ..."
-        jniLibs {
-            excludes += ['lib/*/libfilament-jni.so', 'lib/*/libgltfio-jni.so']
-        }
+        exclude 'lib/*/libfilament-jni.so'
+        exclude 'lib/*/libgltfio-jni.so'
     }
+}
 
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-            withJavadocJar()
+configurations.all { config ->
+    // Hack to preserve the version of the dependencies
+    if (!config.name.endsWith('Publication')) {
+        resolutionStrategy {
+            dependencySubstitution {
+                substitute(module("com.google.android.filament:gltfio-android:${VERSION_NAME}")).with(project(":gltfio-android"))
+                substitute(module("com.google.android.filament:gltfio-android-lite:${VERSION_NAME}")).with(project(":gltfio-android"))
+            }
         }
     }
 }
@@ -36,12 +43,13 @@ android {
 dependencies {
     implementation deps.kotlin
     implementation deps.androidx.annotations
+    implementation project(':filament-android')
 
-    implementation deps.coroutines.core
-    implementation deps.coroutines.android
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
 
-    api project(':filament-android')
-    api project(':gltfio-android')
+    fullImplementation module("com.google.android.filament:gltfio-android:${VERSION_NAME}")
+    liteImplementation module("com.google.android.filament:gltfio-android-lite:${VERSION_NAME}")
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
@@ -49,9 +57,14 @@ apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
 afterEvaluate {
     publishing {
         publications {
-            release(MavenPublication) {
-                artifactId = POM_ARTIFACT_ID
-                from components.release
+            fullRelease(MavenPublication) {
+                artifactId = POM_ARTIFACT_ID_FULL
+                from components.fullRelease
+            }
+
+            liteRelease(MavenPublication) {
+                artifactId = POM_ARTIFACT_ID_LITE
+                from components.liteRelease
             }
         }
     }

android/filament-utils-android/gradle.properties

@@ -1,3 +1,4 @@
 POM_NAME=Filament Android Utilities
-POM_ARTIFACT_ID=filament-utils-android
+POM_ARTIFACT_ID_FULL=filament-utils-android
+POM_ARTIFACT_ID_LITE=filament-utils-android-lite
 POM_PACKAGING=aar

android/filament-utils-android/src/main/cpp/AutomationEngine.cpp

@@ -70,8 +70,7 @@ Java_com_google_android_filament_utils_AutomationEngine_nStartBatchMode(JNIEnv*
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_utils_AutomationEngine_nTick(JNIEnv* env, jclass klass,
-        jlong nativeAutomation, jlong nativeEngine,
-        jlong view, jlongArray materials, jlong renderer, jfloat deltaTime) {
+        jlong nativeAutomation, jlong view, jlongArray materials, jlong renderer, jfloat deltaTime) {
     using MaterialPointer = MaterialInstance*;
     jsize materialCount = 0;
     jlong* longMaterials = nullptr;
@@ -91,8 +90,7 @@ Java_com_google_android_filament_utils_AutomationEngine_nTick(JNIEnv* env, jclas
         .materials = ptrMaterials,
         .materialCount = (size_t) materialCount,
     };
-    Engine* engine = (Engine*)nativeEngine;
-    automation->tick(engine, content, deltaTime);
+    automation->tick(content, deltaTime);
     if (longMaterials) {
         env->ReleaseLongArrayElements(materials, longMaterials, 0);
         delete[] ptrMaterials;
@@ -101,8 +99,7 @@ Java_com_google_android_filament_utils_AutomationEngine_nTick(JNIEnv* env, jclas
 
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_utils_AutomationEngine_nApplySettings(JNIEnv* env, jclass klass,
-        jlong nativeAutomation, jlong nativeEngine,
-        jstring json, jlong view, jlongArray materials, jlong nativeIbl,
+        jlong nativeAutomation, jstring json, jlong view, jlongArray materials, jlong nativeIbl,
         jint sunlightEntity, jintArray assetLights, jlong nativeLm, jlong scene, jlong renderer) {
     using MaterialPointer = MaterialInstance*;
 
@@ -143,8 +140,8 @@ Java_com_google_android_filament_utils_AutomationEngine_nApplySettings(JNIEnv* e
         .assetLights = (Entity*) intLights,
         .assetLightCount = (size_t) lightCount,
     };
-    Engine* engine = (Engine*)nativeEngine;
-    automation->applySettings(engine, nativeJson, jsonLength, content);
+
+    automation->applySettings(nativeJson, jsonLength, content);
     env->ReleaseStringUTFChars(json, nativeJson);
     if (longMaterials) {
         env->ReleaseLongArrayElements(materials, longMaterials, 0);
@@ -166,28 +163,22 @@ Java_com_google_android_filament_utils_AutomationEngine_nGetViewerOptions(JNIEnv
     const jfieldID cameraAperture = env->GetFieldID(klass, "cameraAperture", "F");
     const jfieldID cameraSpeed = env->GetFieldID(klass, "cameraSpeed", "F");
     const jfieldID cameraISO = env->GetFieldID(klass, "cameraISO", "F");
-    const jfieldID cameraNear = env->GetFieldID(klass, "cameraNear", "F");
-    const jfieldID cameraFar = env->GetFieldID(klass, "cameraFar", "F");
     const jfieldID groundShadowStrength = env->GetFieldID(klass, "groundShadowStrength", "F");
     const jfieldID groundPlaneEnabled = env->GetFieldID(klass, "groundPlaneEnabled", "Z");
     const jfieldID skyboxEnabled = env->GetFieldID(klass, "skyboxEnabled", "Z");
     const jfieldID cameraFocalLength = env->GetFieldID(klass, "cameraFocalLength", "F");
     const jfieldID cameraFocusDistance = env->GetFieldID(klass, "cameraFocusDistance", "F");
     const jfieldID autoScaleEnabled = env->GetFieldID(klass, "autoScaleEnabled", "Z");
-    const jfieldID autoInstancingEnabled = env->GetFieldID(klass, "autoInstancingEnabled", "Z");
 
     env->SetFloatField(result, cameraAperture, options.cameraAperture);
     env->SetFloatField(result, cameraSpeed, options.cameraSpeed);
     env->SetFloatField(result, cameraISO, options.cameraISO);
-    env->SetFloatField(result, cameraNear, options.cameraNear);
-    env->SetFloatField(result, cameraFar, options.cameraFar);
     env->SetFloatField(result, groundShadowStrength, options.groundShadowStrength);
     env->SetBooleanField(result, groundPlaneEnabled, options.groundPlaneEnabled);
     env->SetBooleanField(result, skyboxEnabled, options.skyboxEnabled);
     env->SetFloatField(result, cameraFocalLength, options.cameraFocalLength);
     env->SetFloatField(result, cameraFocusDistance, options.cameraFocusDistance);
     env->SetBooleanField(result, autoScaleEnabled, options.autoScaleEnabled);
-    env->SetBooleanField(result, autoInstancingEnabled, options.autoInstancingEnabled);
 }
 
 extern "C" JNIEXPORT jlong JNICALL

android/filament-utils-android/src/main/cpp/Utils.cpp

@@ -20,14 +20,13 @@
 #include <filament/IndirectLight.h>
 #include <filament/Skybox.h>
 
-#include <ktxreader/Ktx1Reader.h>
+#include <image/KtxUtility.h>
 
 #include "common/NioUtils.h"
 
 using namespace filament;
 using namespace filament::math;
 using namespace image;
-using namespace ktxreader;
 
 jlong nCreateHDRTexture(JNIEnv* env, jclass,
         jlong nativeEngine, jobject javaBuffer, jint remaining, jint internalFormat);
@@ -36,9 +35,9 @@ static jlong nCreateKTXTexture(JNIEnv* env, jclass,
         jlong nativeEngine, jobject javaBuffer, jint remaining, jboolean srgb) {
     Engine* engine = (Engine*) nativeEngine;
     AutoBuffer buffer(env, javaBuffer, remaining);
-    Ktx1Bundle* bundle = new Ktx1Bundle((const uint8_t*) buffer.getData(), buffer.getSize());
-    return (jlong) Ktx1Reader::createTexture(engine, *bundle, srgb, [](void* userdata) {
-        Ktx1Bundle* bundle = (Ktx1Bundle*) userdata;
+    KtxBundle* bundle = new KtxBundle((const uint8_t*) buffer.getData(), buffer.getSize());
+    return (jlong) ktx::createTexture(engine, *bundle, srgb, [](void* userdata) {
+        KtxBundle* bundle = (KtxBundle*) userdata;
         delete bundle;
     }, bundle);
 }
@@ -47,9 +46,9 @@ static jlong nCreateIndirectLight(JNIEnv* env, jclass,
         jlong nativeEngine, jobject javaBuffer, jint remaining, jboolean srgb) {
     Engine* engine = (Engine*) nativeEngine;
     AutoBuffer buffer(env, javaBuffer, remaining);
-    Ktx1Bundle* bundle = new Ktx1Bundle((const uint8_t*) buffer.getData(), buffer.getSize());
-    Texture* cubemap = Ktx1Reader::createTexture(engine, *bundle, srgb,  [](void* userdata) {
-        Ktx1Bundle* bundle = (Ktx1Bundle*) userdata;
+    KtxBundle* bundle = new KtxBundle((const uint8_t*) buffer.getData(), buffer.getSize());
+    Texture* cubemap = ktx::createTexture(engine, *bundle, srgb,  [](void* userdata) {
+        KtxBundle* bundle = (KtxBundle*) userdata;
         delete bundle;
     }, bundle);
 
@@ -69,9 +68,9 @@ static jlong nCreateSkybox(JNIEnv* env, jclass,
         jlong nativeEngine, jobject javaBuffer, jint remaining, jboolean srgb) {
     Engine* engine = (Engine*) nativeEngine;
     AutoBuffer buffer(env, javaBuffer, remaining);
-    Ktx1Bundle* bundle = new Ktx1Bundle((const uint8_t*) buffer.getData(), buffer.getSize());
-    Texture* cubemap = Ktx1Reader::createTexture(engine, *bundle, srgb,  [](void* userdata) {
-        Ktx1Bundle* bundle = (Ktx1Bundle*) userdata;
+    KtxBundle* bundle = new KtxBundle((const uint8_t*) buffer.getData(), buffer.getSize());
+    Texture* cubemap = ktx::createTexture(engine, *bundle, srgb,  [](void* userdata) {
+        KtxBundle* bundle = (KtxBundle*) userdata;
         delete bundle;
     }, bundle);
     return (jlong) Skybox::Builder().environment(cubemap).showSun(true).build(*engine);
@@ -80,7 +79,7 @@ static jlong nCreateSkybox(JNIEnv* env, jclass,
 static jboolean nGetSphericalHarmonics(JNIEnv* env, jclass, jobject javaBuffer, jint remaining,
         jfloatArray outSphericalHarmonics_) {
     AutoBuffer buffer(env, javaBuffer, remaining);
-    Ktx1Bundle bundle((const uint8_t*) buffer.getData(), buffer.getSize());
+    KtxBundle bundle((const uint8_t*) buffer.getData(), buffer.getSize());
 
     jfloat* outSphericalHarmonics = env->GetFloatArrayElements(outSphericalHarmonics_, nullptr);
     const auto success = bundle.getSphericalHarmonics(
@@ -99,8 +98,8 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) {
 
     int rc;
 
-    // KTX1Loader
-    jclass ktxloaderClass = env->FindClass("com/google/android/filament/utils/KTX1Loader");
+    // KTXLoader
+    jclass ktxloaderClass = env->FindClass("com/google/android/filament/utils/KTXLoader");
     if (ktxloaderClass == nullptr) return JNI_ERR;
     static const JNINativeMethod ktxMethods[] = {
         {(char*)"nCreateKTXTexture", (char*)"(JLjava/nio/Buffer;IZ)J", reinterpret_cast<void*>(nCreateKTXTexture)},

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

@@ -40,7 +40,7 @@ import com.google.android.filament.Renderer;
  *
  * When executing a test, clients should call tick() after each frame is rendered, which provides an
  * opportunity to push settings to Filament, increment the current test index (if enough time has
- * elapsed), and request an asynchronous screenshot.
+ * elapsed), and request an asychronous screenshot.
  *
  * The time to sleep between tests is configurable and can be set to zero. Automation also waits a
  * specified minimum number of frames between tests.
@@ -97,15 +97,12 @@ public class AutomationEngine {
         public float cameraAperture = 16.0f;
         public float cameraSpeed = 125.0f;
         public float cameraISO = 100.0f;
-        public float cameraNear = 0.1f;
-        public float cameraFar = 100.0f;
         public float groundShadowStrength = 0.75f;
         public boolean groundPlaneEnabled = false;
         public boolean skyboxEnabled = true;
         public float cameraFocalLength = 28.0f;
         public float cameraFocusDistance = 0.0f;
         public boolean autoScaleEnabled = true;
-        public boolean autoInstancingEnabled = false;
     }
 
     /**
@@ -158,11 +155,10 @@ public class AutomationEngine {
      * This is when settings get applied, screenshots are (optionally) exported, and the internal
      * test counter is potentially incremented.
      *
-     * @param engine        The filament Engine of interest.
      * @param content       Contains the Filament View, Materials, and Renderer that get modified.
      * @param deltaTime     The amount of time that has passed since the previous tick in seconds.
      */
-    public void tick(@NonNull Engine engine, @NonNull ViewerContent content, float deltaTime) {
+    public void tick(@NonNull ViewerContent content, float deltaTime) {
         if (content.view == null || content.renderer == null) {
             throw new IllegalStateException("Must provide a View and Renderer");
         }
@@ -175,7 +171,7 @@ public class AutomationEngine {
         }
         long nativeView = content.view.getNativeObject();
         long nativeRenderer = content.renderer.getNativeObject();
-        nTick(mNativeObject, engine.getNativeObject(), nativeView, nativeMaterialInstances, nativeRenderer, deltaTime);
+        nTick(mNativeObject, nativeView, nativeMaterialInstances, nativeRenderer, deltaTime);
     }
 
     /**
@@ -187,12 +183,10 @@ public class AutomationEngine {
      * This updates the stashed Settings object, then pushes those settings to the given
      * Filament objects. Clients can optionally call getColorGrading() after calling this method.
      *
-     * @param engine        Filament Engine to use.
      * @param settingsJson  Contains the JSON string with a set of changes that need to be pushed.
      * @param content       Contains a set of Filament objects that you want to mutate.
      */
-    public void applySettings(@NonNull Engine engine, @NonNull String settingsJson,
-        @NonNull ViewerContent content) {
+    public void applySettings(@NonNull String settingsJson, @NonNull ViewerContent content) {
         if (content.view == null || content.renderer == null) {
             throw new IllegalStateException("Must provide a View and Renderer");
         }
@@ -211,8 +205,7 @@ public class AutomationEngine {
         long nativeLm = content.lightManager.getNativeObject();
         long nativeScene = content.scene.getNativeObject();
         long nativeRenderer = content.renderer.getNativeObject();
-        nApplySettings(mNativeObject, engine.getNativeObject(),
-                settingsJson, nativeView, nativeMaterialInstances,
+        nApplySettings(mNativeObject, settingsJson, nativeView, nativeMaterialInstances,
                 nativeIbl, content.sunlight, content.assetLights, nativeLm, nativeScene,
                 nativeRenderer);
     }
@@ -273,10 +266,9 @@ public class AutomationEngine {
             int minFrameCount, boolean verbose);
     private static native void nStartRunning(long nativeObject);
     private static native void nStartBatchMode(long nativeObject);
-    private static native void nTick(long nativeObject, long nativeEngine,
-            long view, long[] materials, long renderer, float deltaTime);
-    private static native void nApplySettings(long nativeObject, long nativeEngine,
-            String jsonSettings, long view,
+    private static native void nTick(long nativeObject, long view, long[] materials, long renderer,
+            float deltaTime);
+    private static native void nApplySettings(long nativeObject, String jsonSettings, long view,
             long[] materials, long ibl, int sunlight, int[] assetLights, long lightManager,
             long scene, long renderer);
     private static native void nGetViewerOptions(long nativeObject, Object result);

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

@@ -32,13 +32,9 @@ 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)
@@ -47,76 +43,83 @@ import com.google.android.filament.Texture;
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 public class IBLPrefilterContext {
-    private long mNativeObject;
+    private final long mNativeObject;
 
     public IBLPrefilterContext(Engine engine) {
         mNativeObject = nCreate(engine.getNativeObject());
         if (mNativeObject == 0) throw new IllegalStateException("Couldn't create IBLPrefilterContext");
     }
 
-    public void destroy() {
-        nDestroy(getNativeObject());
-        mNativeObject = 0;
+    @Override
+    protected void finalize() throws Throwable {
+        nDestroy(mNativeObject);
+        super.finalize();
     }
 
     public static class EquirectangularToCubemap {
-        private long mNativeObject;
+        @SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"}) // Keep to finalize native resources
+        private final HelperFinalizer mFinalizer;
+        private final long mNativeHelper;
 
         public EquirectangularToCubemap(IBLPrefilterContext context) {
-            mNativeObject = nCreateEquirectHelper(context.getNativeObject());
+            mNativeHelper = nCreateEquirectHelper(context.mNativeObject);
+            mFinalizer = new HelperFinalizer(mNativeHelper);
         }
 
         public Texture run(Texture equirect) {
-            long nativeTexture = nEquirectHelperRun(getNativeObject(), equirect.getNativeObject());
+            long nativeTexture = nEquirectHelperRun(mNativeHelper, equirect.getNativeObject());
             return new Texture(nativeTexture);
         }
 
-        public void destroy() {
-            nDestroyEquirectHelper(getNativeObject());
-            mNativeObject = 0;
-        }
+        private static class HelperFinalizer {
+            private final long mNativeObject;
 
-        protected long getNativeObject() {
-            if (mNativeObject == 0) {
-                throw new IllegalStateException("Calling method on destroyed EquirectangularToCubemap");
+            HelperFinalizer(long nativeObject) { mNativeObject = nativeObject; }
+
+            @Override
+            public void finalize() {
+                try {
+                    super.finalize();
+                } catch (Throwable t) { // Ignore
+                } finally {
+                    nDestroyEquirectHelper(mNativeObject);
+                }
             }
-            return mNativeObject;
         }
     }
 
     public static class SpecularFilter {
-        private long mNativeObject;
+        @SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"}) // Keep to finalize native resources
+        private final HelperFinalizer mFinalizer;
+        private final long mNativeHelper;
 
         public SpecularFilter(IBLPrefilterContext context) {
-            mNativeObject = nCreateSpecularFilter(context.getNativeObject());
+            mNativeHelper = nCreateSpecularFilter(context.mNativeObject);
+            mFinalizer = new HelperFinalizer(mNativeHelper);
         }
 
         public Texture run(Texture skybox) {
-            long nativeTexture = nSpecularFilterRun(getNativeObject(), skybox.getNativeObject());
+            long nativeTexture = nSpecularFilterRun(mNativeHelper, skybox.getNativeObject());
             return new Texture(nativeTexture);
         }
 
-        public void destroy() {
-            nDestroySpecularFilter(getNativeObject());
-            mNativeObject = 0;
-        }
+        private static class HelperFinalizer {
+            private final long mNativeObject;
 
-        protected long getNativeObject() {
-            if (mNativeObject == 0) {
-                throw new IllegalStateException("Calling method on destroyed SpecularFilter");
+            HelperFinalizer(long nativeObject) { mNativeObject = nativeObject; }
+
+            @Override
+            public void finalize() {
+                try {
+                    super.finalize();
+                } catch (Throwable t) { // Ignore
+                } finally {
+                    nDestroySpecularFilter(mNativeObject);
+                }
             }
-            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);
     private static native void nDestroy(long nativeObject);
 

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

@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2020 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.utils
-
-import com.google.android.filament.Engine
-import com.google.android.filament.IndirectLight
-import com.google.android.filament.Skybox
-import com.google.android.filament.Texture
-
-import java.nio.Buffer
-
-/**
- * Utilities for consuming KTX1 files and producing Filament textures, IBLs, and sky boxes.
- *
- * KTX is a simple container format that makes it easy to bundle miplevels and cubemap faces
- * into a single file.
- */
-object KTX1Loader {
-    class Options {
-        var srgb = false
-    }
-
-    /**
-     * Consumes the content of a KTX file and produces a [Texture] object.
-     *
-     * @param engine Gets passed to the builder.
-     * @param buffer The content of the KTX File.
-     * @param options Loader options.
-     * @return The resulting Filament texture, or null on failure.
-     */
-    fun createTexture(engine: Engine, buffer: Buffer, options: Options = Options()): Texture {
-        val nativeEngine = engine.nativeObject
-        val nativeTexture = nCreateKTXTexture(nativeEngine, buffer, buffer.remaining(), options.srgb)
-        return Texture(nativeTexture)
-    }
-
-    /**
-     * Consumes the content of a KTX file and produces an [IndirectLight] object.
-     *
-     * @param engine Gets passed to the builder.
-     * @param buffer The content of the KTX File.
-     * @param options Loader options.
-     * @return The resulting Filament texture, or null on failure.
-     */
-    fun createIndirectLight(engine: Engine, buffer: Buffer, options: Options = Options()): IndirectLight {
-        val nativeEngine = engine.nativeObject
-        val nativeIndirectLight = nCreateIndirectLight(nativeEngine, buffer, buffer.remaining(), options.srgb)
-        return IndirectLight(nativeIndirectLight)
-    }
-
-    /**
-     * Consumes the content of a KTX file and produces a [Skybox] object.
-     *
-     * @param engine Gets passed to the builder.
-     * @param buffer The content of the KTX File.
-     * @param options Loader options.
-     * @return The resulting Filament texture, or null on failure.
-     */
-    fun createSkybox(engine: Engine, buffer: Buffer, options: Options = Options()): Skybox {
-        val nativeEngine = engine.nativeObject
-        val nativeSkybox = nCreateSkybox(nativeEngine, buffer, buffer.remaining(), options.srgb)
-        return Skybox(nativeSkybox)
-    }
-
-    /**
-     * Retrieves spherical harmonics from the content of a KTX file.
-     *
-     * @param buffer The content of the KTX File.
-     * @return The resulting array of 9 * 3 floats, or null on failure.
-     */
-    fun getSphericalHarmonics(buffer: Buffer): FloatArray? {
-        val sphericalHarmonics = FloatArray(9 * 3)
-        val success = nGetSphericalHarmonics(buffer, buffer.remaining(), sphericalHarmonics)
-        return if (success) sphericalHarmonics else null
-    }
-
-    private external fun nCreateKTXTexture(nativeEngine: Long, buffer: Buffer, remaining: Int, srgb: Boolean): Long
-    private external fun nCreateIndirectLight(nativeEngine: Long, buffer: Buffer, remaining: Int, srgb: Boolean): Long
-    private external fun nGetSphericalHarmonics(buffer: Buffer, remaining: Int, outSphericalHarmonics: FloatArray): Boolean
-    private external fun nCreateSkybox(nativeEngine: Long, buffer: Buffer, remaining: Int, srgb: Boolean): Long
-}

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

@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2020 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.utils
+
+import com.google.android.filament.Engine
+import com.google.android.filament.IndirectLight
+import com.google.android.filament.Skybox
+import com.google.android.filament.Texture
+
+import java.nio.Buffer
+
+/**
+ * Utilities for consuming KTX files and producing Filament textures, IBLs, and sky boxes.
+ *
+ * KTX is a simple container format that makes it easy to bundle miplevels and cubemap faces
+ * into a single file.
+ */
+object KTXLoader {
+    class Options {
+        var srgb = false
+    }
+
+    /**
+     * Consumes the content of a KTX file and produces a [Texture] object.
+     *
+     * @param engine Gets passed to the builder.
+     * @param buffer The content of the KTX File.
+     * @param options Loader options.
+     * @return The resulting Filament texture, or null on failure.
+     */
+    fun createTexture(engine: Engine, buffer: Buffer, options: Options = Options()): Texture {
+        val nativeEngine = engine.nativeObject
+        val nativeTexture = nCreateKTXTexture(nativeEngine, buffer, buffer.remaining(), options.srgb)
+        return Texture(nativeTexture)
+    }
+
+    /**
+     * Consumes the content of a KTX file and produces an [IndirectLight] object.
+     *
+     * @param engine Gets passed to the builder.
+     * @param buffer The content of the KTX File.
+     * @param options Loader options.
+     * @return The resulting Filament texture, or null on failure.
+     */
+    fun createIndirectLight(engine: Engine, buffer: Buffer, options: Options = Options()): IndirectLight {
+        val nativeEngine = engine.nativeObject
+        val nativeIndirectLight = nCreateIndirectLight(nativeEngine, buffer, buffer.remaining(), options.srgb)
+        return IndirectLight(nativeIndirectLight)
+    }
+
+    /**
+     * Consumes the content of a KTX file and produces a [Skybox] object.
+     *
+     * @param engine Gets passed to the builder.
+     * @param buffer The content of the KTX File.
+     * @param options Loader options.
+     * @return The resulting Filament texture, or null on failure.
+     */
+    fun createSkybox(engine: Engine, buffer: Buffer, options: Options = Options()): Skybox {
+        val nativeEngine = engine.nativeObject
+        val nativeSkybox = nCreateSkybox(nativeEngine, buffer, buffer.remaining(), options.srgb)
+        return Skybox(nativeSkybox)
+    }
+
+    /**
+     * Retrieves spherical harmonics from the content of a KTX file.
+     *
+     * @param buffer The content of the KTX File.
+     * @return The resulting array of 9 * 3 floats, or null on failure.
+     */
+    fun getSphericalHarmonics(buffer: Buffer): FloatArray? {
+        val sphericalHarmonics = FloatArray(9 * 3)
+        val success = nGetSphericalHarmonics(buffer, buffer.remaining(), sphericalHarmonics)
+        return if (success) sphericalHarmonics else null
+    }
+
+    private external fun nCreateKTXTexture(nativeEngine: Long, buffer: Buffer, remaining: Int, srgb: Boolean): Long
+    private external fun nCreateIndirectLight(nativeEngine: Long, buffer: Buffer, remaining: Int, srgb: Boolean): Long
+    private external fun nGetSphericalHarmonics(buffer: Buffer, remaining: Int, outSphericalHarmonics: FloatArray): Boolean
+    private external fun nCreateSkybox(nativeEngine: Long, buffer: Buffer, remaining: Int, srgb: Boolean): Long
+}

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

@@ -32,9 +32,7 @@ import androidx.annotation.Size;
  * @see Bookmark
  */
 public class Manipulator {
-    private static final Mode[] sModeValues = Mode.values();
-
-    private final long mNativeObject;
+    private long mNativeObject;
 
     private Manipulator(long nativeIndexBuffer) {
         mNativeObject = nativeIndexBuffer;
@@ -322,7 +320,7 @@ public class Manipulator {
     /**
      * Gets the immutable mode of the manipulator.
      */
-    public Mode getMode() { return sModeValues[nGetMode(mNativeObject)]; }
+    public Mode getMode() { return Mode.values()[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,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:Suppress("NOTHING_TO_INLINE", "unused")
-
 package com.google.android.filament.utils
 
 import kotlin.math.*
@@ -24,18 +22,6 @@ enum class MatrixColumn {
     X, Y, Z, W
 }
 
-enum class RotationsOrder(
-        val yaw: VectorComponent,
-        val pitch: VectorComponent,
-        val roll: VectorComponent) {
-    XYZ(VectorComponent.X, VectorComponent.Y, VectorComponent.Z),
-    XZY(VectorComponent.X, VectorComponent.Z, VectorComponent.Y),
-    YXZ(VectorComponent.Y, VectorComponent.X, VectorComponent.Z),
-    YZX(VectorComponent.Y, VectorComponent.Z, VectorComponent.X),
-    ZXY(VectorComponent.Z, VectorComponent.X, VectorComponent.Y),
-    ZYX(VectorComponent.Z, VectorComponent.Y, VectorComponent.X);
-}
-
 data class Mat2(
         var x: Float2 = Float2(x = 1.0f),
         var y: Float2 = Float2(y = 1.0f)) {
@@ -53,14 +39,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")
@@ -78,19 +64,21 @@ data class Mat2(
     }
 
     operator fun unaryMinus() = Mat2(-x, -y)
-    operator fun inc() = Mat2(x++, y++)
-    operator fun dec() = Mat2(x--, y--)
+    operator fun inc(): Mat2 {
+        x++
+        y++
+        return this
+    }
+    operator fun dec(): Mat2 {
+        x--
+        y--
+        return this
+    }
 
     operator fun plus(v: Float) = Mat2(x + v, y + v)
     operator fun minus(v: Float) = Mat2(x - v, y - v)
     operator fun times(v: Float) = Mat2(x * v, y * v)
     operator fun div(v: Float) = Mat2(x / v, y / v)
-    inline fun compareTo(v: Float, delta: Float = 0.0f) = Mat2(
-        x.compareTo(v, delta),
-        y.compareTo(v, delta)
-    )
-
-    inline fun equals(v: Float, delta: Float = 0.0f) = x.equals(v, delta) && y.equals(v, delta)
 
     operator fun times(m: Mat2) = Mat2(
             Float2(
@@ -103,18 +91,12 @@ data class Mat2(
             )
     )
 
-    inline fun compareTo(m: Mat2, delta: Float = 0.0f) = Mat2(
-        x.compareTo(m.x, delta),
-        y.compareTo(m.y, delta)
-    )
-
-    inline fun equals(m: Mat2, delta: Float = 0.0f) = x.equals(m.x, delta) && y.equals(m.y, delta)
-
     operator fun times(v: Float2) = Float2(
             x.x * v.x + y.x * v.y,
             x.y * v.x + y.y * v.y,
     )
 
+
     fun toFloatArray() = floatArrayOf(
             x.x, y.x,
             x.y, y.y
@@ -126,6 +108,7 @@ data class Mat2(
             |${x.y} ${y.y}|
             """.trimIndent()
     }
+
 }
 
 data class Mat3(
@@ -147,7 +130,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
@@ -155,7 +138,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
@@ -174,21 +157,23 @@ data class Mat3(
     }
 
     operator fun unaryMinus() = Mat3(-x, -y, -z)
-    operator fun inc() = Mat3(x++, y++, z++)
-    operator fun dec() = Mat3(x--, y--, z--)
+    operator fun inc(): Mat3 {
+        x++
+        y++
+        z++
+        return this
+    }
+    operator fun dec(): Mat3 {
+        x--
+        y--
+        z--
+        return this
+    }
 
     operator fun plus(v: Float) = Mat3(x + v, y + v, z + v)
     operator fun minus(v: Float) = Mat3(x - v, y - v, z - v)
     operator fun times(v: Float) = Mat3(x * v, y * v, z * v)
     operator fun div(v: Float) = Mat3(x / v, y / v, z / v)
-    inline fun compareTo(v: Float, delta: Float = 0.0f) = Mat3(
-        x.compareTo(v, delta),
-        y.compareTo(v, delta),
-        z.compareTo(v, delta)
-    )
-
-    inline fun equals(v: Float, delta: Float = 0.0f) =
-        x.equals(v, delta) && y.equals(v, delta) && z.equals(v, delta)
 
     operator fun times(m: Mat3) = Mat3(
             Float3(
@@ -208,15 +193,6 @@ data class Mat3(
             )
     )
 
-    inline fun compareTo(m: Mat3, delta: Float = 0.0f) = Mat3(
-        x.compareTo(m.x, delta),
-        y.compareTo(m.y, delta),
-        z.compareTo(m.z, delta)
-    )
-
-    inline fun equals(m: Mat3, delta: Float = 0.0f) =
-        x.equals(m.x, delta) && y.equals(m.y, delta) && z.equals(m.z, delta)
-
     operator fun times(v: Float3) = Float3(
             x.x * v.x + y.x * v.y + z.x * v.z,
             x.y * v.x + y.y * v.y + z.y * v.z,
@@ -248,7 +224,6 @@ data class Mat4(
     constructor(m: Mat4) : this(m.x.copy(), m.y.copy(), m.z.copy(), m.w.copy())
 
     companion object {
-
         fun of(vararg a: Float): Mat4 {
             require(a.size >= 16)
             return Mat4(
@@ -304,7 +279,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
@@ -313,7 +288,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
@@ -332,22 +307,25 @@ data class Mat4(
     }
 
     operator fun unaryMinus() = Mat4(-x, -y, -z, -w)
-    operator fun inc() = Mat4(x++, y++, z++, w++)
-    operator fun dec() = 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 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)
     operator fun times(v: Float) = Mat4(x * v, y * v, z * v, w * v)
     operator fun div(v: Float) = Mat4(x / v, y / v, z / v, w / v)
-    inline fun compareTo(v: Float, delta: Float = 0.0f) = Mat4(
-        x.compareTo(v, delta),
-        y.compareTo(v, delta),
-        z.compareTo(v, delta),
-        w.compareTo(v, delta)
-    )
-
-    inline fun equals(v: Float, delta: Float = 0.0f) =
-        x.equals(v, delta) && y.equals(v, delta) && z.equals(v, delta) && w.equals(v, delta)
 
     operator fun times(m: Mat4) = Mat4(
             Float4(
@@ -376,16 +354,6 @@ data class Mat4(
             )
     )
 
-    inline fun compareTo(m: Mat4, delta: Float = 0.0f) = Mat4(
-        x.compareTo(m.x, delta),
-        y.compareTo(m.y, delta),
-        z.compareTo(m.z, delta),
-        w.compareTo(m.w, delta)
-    )
-
-    inline fun equals(m: Mat4, delta: Float = 0.0f) =
-        x.equals(m.x, delta) && y.equals(m.y, delta) && z.equals(m.z, delta) && w.equals(m.w, delta)
-
     operator fun times(v: Float4) = Float4(
             x.x * v.x + y.x * v.y + z.x * v.z+ w.x * v.w,
             x.y * v.x + y.y * v.y + z.y * v.z+ w.y * v.w,
@@ -393,28 +361,6 @@ data class Mat4(
             x.w * v.x + y.w * v.y + z.w * v.z+ w.w * v.w
     )
 
-    /**
-     * Get the Euler angles in degrees from this rotation Matrix
-     *
-     * Don't forget to extract the rotation with [rotation] if this is a transposed matrix
-     *
-     * @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.
-     *
-     * @see eulerAngles
-     */
-    fun toEulerAngles(order: RotationsOrder = RotationsOrder.ZYX) = eulerAngles(this, order)
-
-    /**
-     * Get the [Quaternion] from this rotation Matrix
-     *
-     * Don't forget to extract the rotation with [rotation] if this is a transposed matrix
-     *
-     * @see quaternion
-     */
-    fun toQuaternion() = quaternion(this)
-
     fun toFloatArray() = floatArrayOf(
             x.x, y.x, z.x, w.x,
             x.y, y.y, z.y, w.y,
@@ -432,78 +378,6 @@ data class Mat4(
     }
 }
 
-inline fun equal(a: Mat2, b: Float, delta: Float = 0.0f) = Bool2(
-    a.x.equals(b, delta),
-    a.y.equals(b, delta)
-)
-
-inline fun equal(a: Mat2, b: Mat2, delta: Float = 0.0f) = Bool2(
-    a.x.equals(b.x, delta),
-    a.y.equals(b.y, delta)
-)
-
-inline fun notEqual(a: Mat2, b: Float, delta: Float = 0.0f) = Bool2(
-    !a.x.equals(b, delta),
-    !a.y.equals(b, delta)
-)
-
-inline fun notEqual(a: Mat2, b: Mat2, delta: Float = 0.0f) = Bool2(
-    !a.x.equals(b.x, delta),
-    !a.y.equals(b.y, delta)
-)
-
-inline fun equal(a: Mat3, b: Float, delta: Float = 0.0f) = Bool3(
-    a.x.equals(b, delta),
-    a.y.equals(b, delta),
-    a.z.equals(b, delta)
-)
-
-inline fun equal(a: Mat3, b: Mat3, delta: Float = 0.0f) = Bool3(
-    a.x.equals(b.x, delta),
-    a.y.equals(b.y, delta),
-    a.z.equals(b.z, delta)
-)
-
-inline fun notEqual(a: Mat3, b: Float, delta: Float = 0.0f) = Bool3(
-    !a.x.equals(b, delta),
-    !a.y.equals(b, delta),
-    !a.z.equals(b, delta)
-)
-
-inline fun notEqual(a: Mat3, b: Mat3, delta: Float = 0.0f) = Bool3(
-    !a.x.equals(b.x, delta),
-    !a.y.equals(b.y, delta),
-    !a.z.equals(b.z, delta)
-)
-
-inline fun equal(a: Mat4, b: Float, delta: Float = 0.0f) = Bool4(
-    a.x.equals(b, delta),
-    a.y.equals(b, delta),
-    a.z.equals(b, delta),
-    a.w.equals(b, delta)
-)
-
-inline fun equal(a: Mat4, b: Mat4, delta: Float = 0.0f) = Bool4(
-    a.x.equals(b.x, delta),
-    a.y.equals(b.y, delta),
-    a.z.equals(b.z, delta),
-    a.w.equals(b.w, delta)
-)
-
-inline fun notEqual(a: Mat4, b: Float, delta: Float = 0.0f) = Bool4(
-    !a.x.equals(b, delta),
-    !a.y.equals(b, delta),
-    !a.z.equals(b, delta),
-    !a.w.equals(b, delta)
-)
-
-inline fun notEqual(a: Mat4, b: Mat4, delta: Float = 0.0f) = Bool4(
-    !a.x.equals(b.x, delta),
-    !a.y.equals(b.y, delta),
-    !a.z.equals(b.z, delta),
-    !a.w.equals(b.w, delta)
-)
-
 fun transpose(m: Mat2) = Mat2(
         Float2(m.x.x, m.y.x),
         Float2(m.x.y, m.y.y)
@@ -534,7 +408,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
     )
@@ -622,83 +496,18 @@ 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))
-
-/**
- * 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 {
+fun rotation(d: Float3): Mat4 {
     val r = transform(d, ::radians)
-    return rotation(r[order.yaw], r[order.pitch], r[order.roll], order)
+    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 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
@@ -710,165 +519,10 @@ 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
-    )
-}
-
-/**
- * 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)
-            )
-    )
-}
-
-/**
- * Get the Euler angles in degrees from a rotation Matrix
- *
- * @param m The rotation matrix.
- * Don't forget to extract the rotation with [rotation] if it's transposed
- * @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.
- */
-fun eulerAngles(m: Mat4, order: RotationsOrder = RotationsOrder.ZYX): Float3 {
-    // We need to more simplify this with RotationsOrder VectorComponents mapped to MatrixColumn
-    return transform(Float3().apply {
-        when (order) {
-            RotationsOrder.XYZ -> {
-                this[order.pitch] = asin(clamp(m.z.x, -1.0f, 1.0f))
-                if (abs(m.z.x) < 0.9999999f) {
-                    this[order.yaw] = atan2(-m.z.y, m.z.z)
-                    this[order.roll] = atan2(-m.y.x, m.x.x)
-                } else {
-                    this[order.yaw] = atan2(m.y.z, m.y.y)
-                    this[order.roll] = 0.0f
-                }
-            }
-            RotationsOrder.XZY -> {
-                this[order.pitch] = asin(-clamp(m.y.x, -1.0f, 1.0f))
-                if (abs(m.y.x) < 0.9999999f) {
-                    this[order.yaw] = atan2(m.y.z, m.y.y)
-                    this[order.roll] = atan2(m.z.x, m.x.x)
-                } else {
-                    this[order.yaw] = atan2(-m.z.y, m.z.z)
-                    this[order.roll] = 0.0f
-                }
-            }
-            RotationsOrder.YXZ -> {
-                this[order.pitch] = asin(-clamp(m.z.y, -1.0f, 1.0f))
-                if (abs(m.z.y) < 0.9999999f) {
-                    this[order.yaw] = atan2(m.z.x, m.z.z)
-                    this[order.roll] = atan2(m.x.y, m.y.y)
-                } else {
-                    this[order.yaw] = atan2(-m.x.z, m.x.x)
-                    this[order.roll] = 0.0f
-                }
-            }
-            RotationsOrder.YZX -> {
-                this[order.pitch] = asin(clamp(m.x.y, -1.0f, 1.0f))
-                if (abs(m.x.y) < 0.9999999f) {
-                    this[order.roll] = atan2(-m.z.y, m.y.y)
-                    this[order.yaw] = atan2(-m.x.z, m.x.x)
-                } else {
-                    this[order.roll] = 0.0f
-                    this[order.yaw] = atan2(m.z.x, m.z.z)
-                }
-            }
-            RotationsOrder.ZXY -> {
-                this[order.pitch] = asin(clamp(m.y.z, -1.0f, 1.0f))
-                if (abs(m.y.z) < 0.9999999f) {
-                    this[order.roll] = atan2(-m.x.z, m.z.z)
-                    this[order.yaw] = atan2(-m.y.x, m.y.y)
-                } else {
-                    this[order.roll] = 0.0f
-                    this[order.yaw] = atan2(m.x.y, m.x.x)
-                }
-            }
-            RotationsOrder.ZYX -> {
-                this[order.pitch] = asin(-clamp(m.x.z, -1.0f, 1.0f))
-                if (abs(m.x.z) < 0.9999999f) {
-                    this[order.roll] = atan2(m.y.z, m.z.z)
-                    this[order.yaw] = atan2(m.x.y, m.x.x)
-                } else {
-                    this[order.roll] = 0.0f
-                    this[order.yaw] = atan2(-m.y.x, m.y.y)
-                }
-            }
-        }
-    }, ::degrees)
-}
-
-/**
- * Get the [Quaternion] from a rotation Matrix
- *
- * @param m The rotation matrix.
- * Don't forget to extract the rotation with [rotation] if it's transposed
- */
-fun quaternion(m: Mat4): Quaternion {
-    val trace = m.x.x + m.y.y + m.z.z
-    return normalize(
-        when {
-            trace > 0.0f -> {
-                val s = 2.0f * sqrt(trace + 1.0f)
-                Quaternion(
-                    (m.y.z - m.z.y) / s,
-                    (m.z.x - m.x.z) / s,
-                    (m.x.y - m.y.x) / s,
-                    0.25f * s
-                )
-            }
-            m.x.x > m.y.y && m.x.x > m.z.z -> {
-                val s = 2.0f * sqrt(1.0f + m.x.x - m.y.y - m.z.z)
-                Quaternion(
-                    0.25f * s,
-                    (m.y.x + m.x.y) / s,
-                    (m.z.x + m.x.z) / s,
-                    (m.y.z - m.z.y) / s
-                )
-            }
-            m.y.y > m.z.z -> {
-                val s = 2.0f * sqrt(1.0f + m.y.y - m.x.x - m.z.z)
-                Quaternion(
-                    (m.y.x + m.x.y) / s,
-                    0.25f * s,
-                    (m.z.y + m.y.z) / s,
-                    (m.z.x - m.x.z) / s
-                )
-            }
-            else -> {
-                val s = 2.0f * sqrt(1.0f + m.z.z - m.x.x - m.y.y)
-                Quaternion(
-                    (m.z.x + m.x.z) / s,
-                    (m.z.y + m.y.z) / s,
-                    0.25f * s,
-                    (m.x.y - m.y.x) / s
-                )
-            }
-        }
+            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
     )
 }
 
@@ -882,7 +536,7 @@ fun lookTowards(eye: Float3, forward: Float3, up: Float3 = Float3(z = 1.0f)): Ma
     val f = normalize(forward)
     val r = normalize(f x up)
     val u = normalize(r x f)
-    return Mat4(Float4(r), Float4(u), Float4(-f), Float4(eye, 1.0f))
+    return Mat4(Float4(r), Float4(u), Float4(f), Float4(eye, 1.0f))
 }
 
 fun perspective(fov: Float, ratio: Float, near: Float, far: Float): Mat4 {
@@ -894,14 +548,9 @@ fun perspective(fov: Float, ratio: Float, near: Float, far: Float): Mat4 {
 }
 
 fun ortho(l: Float, r: Float, b: Float, t: Float, n: Float, f: Float) = Mat4(
-    Float4(x = 2.0f / (r - l)),
-    Float4(y = 2.0f / (t - b)),
-    Float4(z = -2.0f / (f - n)),
-    Float4(
-        -(r + l) / (r - l),
-        -(t + b) / (t - b),
-        -(f + n) / (f - n),
-        1.0f
-    )
+        Float4(x = 2.0f / (r - 1.0f)),
+        Float4(y = 2.0f / (t - b)),
+        Float4(z = -2.0f / (f - n)),
+        Float4(-(r + l) / (r - l), -(t + b) / (t - b), -(f + n) / (f - n), 1.0f)
 )
 

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

@@ -27,8 +27,8 @@ import com.google.android.filament.gltfio.*
 import kotlinx.coroutines.*
 import java.nio.Buffer
 
-private const val kNearPlane = 0.05f     // 5 cm
-private const val kFarPlane = 1000.0f    // 1 km
+private const val kNearPlane = 0.05     // 5 cm
+private const val kFarPlane = 1000.0    // 1 km
 private const val kAperture = 16f
 private const val kShutterSpeed = 1f / 125f
 private const val kSensitivity = 100f
@@ -58,10 +58,7 @@ private const val kSensitivity = 100f
  *
  * See `sample-gltf-viewer` for a usage example.
  */
-class ModelViewer(
-        val engine: Engine,
-        private val uiHelper: UiHelper
-) : android.view.View.OnTouchListener {
+class ModelViewer(val engine: Engine) : android.view.View.OnTouchListener {
     var asset: FilamentAsset? = null
         private set
 
@@ -73,6 +70,7 @@ class ModelViewer(
         get() = resourceLoader.asyncGetLoadProgress()
 
     var normalizeSkinningWeights = true
+    var recomputeBoundingBoxes = false
 
     var cameraFocalLength = 28f
         set(value) {
@@ -80,24 +78,13 @@ class ModelViewer(
             updateCameraProjection()
         }
 
-    var cameraNear = kNearPlane
-        set(value) {
-            field = value
-            updateCameraProjection()
-        }
-
-    var cameraFar = kFarPlane
-        set(value) {
-            field = value
-            updateCameraProjection()
-        }
-
     val scene: Scene
     val view: View
     val camera: Camera
     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
@@ -108,7 +95,6 @@ class ModelViewer(
 
     private var swapChain: SwapChain? = null
     private var assetLoader: AssetLoader
-    private var materialProvider: MaterialProvider
     private var resourceLoader: ResourceLoader
     private val readyRenderables = IntArray(128) // add up to 128 entities at a time
 
@@ -124,9 +110,8 @@ class ModelViewer(
         view.scene = scene
         view.camera = camera
 
-        materialProvider = UbershaderProvider(engine)
-        assetLoader = AssetLoader(engine, materialProvider, EntityManager.get())
-        resourceLoader = ResourceLoader(engine, normalizeSkinningWeights)
+        assetLoader = AssetLoader(engine, UbershaderLoader(engine), EntityManager.get())
+        resourceLoader = ResourceLoader(engine, normalizeSkinningWeights, recomputeBoundingBoxes)
 
         // Always add a direct light source since it is required for shadowing.
         // We highly recommend adding an indirect light as well.
@@ -144,12 +129,7 @@ class ModelViewer(
         scene.addEntity(light)
     }
 
-    constructor(
-            surfaceView: SurfaceView,
-            engine: Engine = Engine.create(),
-            uiHelper: UiHelper = UiHelper(UiHelper.ContextErrorPolicy.DONT_CHECK),
-            manipulator: Manipulator? = null
-    ) : this(engine, uiHelper) {
+    constructor(surfaceView: SurfaceView, engine: Engine = Engine.create(), manipulator: Manipulator? = null) : this(engine) {
         cameraManipulator = manipulator ?: Manipulator.Builder()
                 .targetPosition(kDefaultObjectPosition.x, kDefaultObjectPosition.y, kDefaultObjectPosition.z)
                 .viewport(surfaceView.width, surfaceView.height)
@@ -164,12 +144,7 @@ class ModelViewer(
     }
 
     @Suppress("unused")
-    constructor(
-            textureView: TextureView,
-            engine: Engine = Engine.create(),
-            uiHelper: UiHelper = UiHelper(UiHelper.ContextErrorPolicy.DONT_CHECK),
-            manipulator: Manipulator? = null
-    ) : this(engine, uiHelper) {
+    constructor(textureView: TextureView, engine: Engine = Engine.create(), manipulator: Manipulator? = null) : this(engine) {
         cameraManipulator = manipulator ?: Manipulator.Builder()
                 .targetPosition(kDefaultObjectPosition.x, kDefaultObjectPosition.y, kDefaultObjectPosition.z)
                 .viewport(textureView.width, textureView.height)
@@ -188,10 +163,10 @@ class ModelViewer(
      */
     fun loadModelGlb(buffer: Buffer) {
         destroyModel()
-        asset = assetLoader.createAsset(buffer)
+        asset = assetLoader.createAssetFromBinary(buffer)
         asset?.let { asset ->
             resourceLoader.asyncBeginLoad(asset)
-            animator = asset.getInstance().animator
+            animator = asset.animator
             asset.releaseSourceData()
         }
     }
@@ -203,7 +178,7 @@ class ModelViewer(
      */
     fun loadModelGltf(buffer: Buffer, callback: (String) -> Buffer?) {
         destroyModel()
-        asset = assetLoader.createAsset(buffer)
+        asset = assetLoader.createAssetFromJson(buffer)
         asset?.let { asset ->
             for (uri in asset.resourceUris) {
                 val resourceBuffer = callback(uri)
@@ -214,7 +189,7 @@ class ModelViewer(
                 resourceLoader.addResourceData(uri, resourceBuffer)
             }
             resourceLoader.asyncBeginLoad(asset)
-            animator = asset.getInstance().animator
+            animator = asset.animator
             asset.releaseSourceData()
         }
     }
@@ -226,7 +201,7 @@ class ModelViewer(
      */
     fun loadModelGltfAsync(buffer: Buffer, callback: (String) -> Buffer) {
         destroyModel()
-        asset = assetLoader.createAsset(buffer)
+        asset = assetLoader.createAssetFromJson(buffer)
         fetchResourcesJob = CoroutineScope(Dispatchers.IO).launch {
             fetchResources(asset!!, callback)
         }
@@ -240,8 +215,8 @@ class ModelViewer(
     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
@@ -309,9 +284,9 @@ class ModelViewer(
     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)
             }
@@ -322,14 +297,12 @@ class ModelViewer(
 
     private fun addDetachListener(view: android.view.View) {
         view.addOnAttachStateChangeListener(object : android.view.View.OnAttachStateChangeListener {
-            override fun onViewAttachedToWindow(v: android.view.View) {}
-            override fun onViewDetachedFromWindow(v: android.view.View) {
+            override fun onViewAttachedToWindow(v: android.view.View?) {}
+            override fun onViewDetachedFromWindow(v: android.view.View?) {
                 uiHelper.detach()
 
                 destroyModel()
                 assetLoader.destroy()
-                materialProvider.destroyMaterials()
-                materialProvider.destroy()
                 resourceLoader.destroy()
 
                 engine.destroyEntity(light)
@@ -371,7 +344,7 @@ class ModelViewer(
                 resourceLoader.addResourceData(uri, buffer)
             }
             resourceLoader.asyncBeginLoad(asset)
-            animator = asset.getInstance().animator
+            animator = asset.animator
             asset.releaseSourceData()
         }
     }
@@ -380,8 +353,7 @@ class ModelViewer(
         val width = view.viewport.width
         val height = view.viewport.height
         val aspect = width.toDouble() / height.toDouble()
-        camera.setLensProjection(cameraFocalLength.toDouble(), aspect,
-            cameraNear.toDouble(), cameraFar.toDouble())
+        camera.setLensProjection(cameraFocalLength.toDouble(), aspect, kNearPlane, kFarPlane)
     }
 
     inner class SurfaceCallback : UiHelper.RendererCallback {
@@ -405,20 +377,10 @@ class ModelViewer(
             view.viewport = Viewport(0, 0, width, height)
             cameraManipulator.setViewport(width, height)
             updateCameraProjection()
-            synchronizePendingFrames(engine)
         }
     }
 
-    private fun synchronizePendingFrames(engine: Engine) {
-        // Wait for all pending frames to be processed before returning. This is to
-        // avoid a race between the surface being resized before pending frames are
-        // rendered into it.
-        val fence = engine.createFence()
-        fence.wait(Fence.Mode.FLUSH, Fence.WAIT_FOR_EVER)
-        engine.destroyFence(fence)
-    }
-
     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

@@ -1,508 +0,0 @@
-/*
- * 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("NOTHING_TO_INLINE", "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 = 1.0f) {
-
-    constructor(v: Float3, w: Float = 1.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 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.
-         */
-        fun fromEuler(d: Float3, order: RotationsOrder = RotationsOrder.ZYX): Quaternion {
-            val r = transform(d, ::radians)
-            return fromEuler(r[order.yaw], r[order.pitch], r[order.roll], order)
-        }
-
-        /**
-         * Construct a Quaternion 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.
-         */
-        fun fromEuler(
-            yaw: Float = 0.0f,
-            pitch: Float = 0.0f,
-            roll: Float = 0.0f,
-            order: RotationsOrder = RotationsOrder.ZYX
-        ): Quaternion {
-            val c1 = cos(yaw * 0.5f)
-            val s1 = sin(yaw * 0.5f)
-            val c2 = cos(pitch * 0.5f)
-            val s2 = sin(pitch * 0.5f)
-            val c3 = cos(roll * 0.5f)
-            val s3 = sin(roll * 0.5f)
-            return when (order) {
-                RotationsOrder.XZY -> Quaternion(
-                        s1 * c2 * c3 - c1 * s2 * s3,
-                        c1 * c2 * s3 - s1 * s2 * c3,
-                        s1 * c2 * s3 + c1 * s2 * c3,
-                        s1 * s2 * s3 + c1 * c2 * c3)
-                RotationsOrder.XYZ -> Quaternion(
-                        s1 * c2 * c3 + s2 * s3 * c1,
-                        s2 * c1 * c3 - s1 * s3 * c2,
-                        s1 * s2 * c3 + s3 * c1 * c2,
-                        c1 * c2 * c3 - s1 * s2 * s3
-                )
-                RotationsOrder.YXZ -> Quaternion(
-                        s1 * c2 * s3 + c1 * s2 * c3,
-                        s1 * c2 * c3 - c1 * s2 * s3,
-                        c1 * c2 * s3 - s1 * s2 * c3,
-                        s1 * s2 * s3 + c1 * c2 * c3
-                )
-                RotationsOrder.YZX -> Quaternion(
-                        s1 * s2 * c3 + c1 * c2 * s3,
-                        s1 * c2 * c3 + c1 * s2 * s3,
-                        c1 * s2 * c3 - s1 * c2 * s3,
-                        c1 * c2 * c3 - s1 * s2 * s3
-                )
-                RotationsOrder.ZYX -> Quaternion(
-                        c1 * c2 * s3 - s1 * s2 * c3,
-                        s1 * c2 * s3 + c1 * s2 * c3,
-                        s1 * c2 * c3 - c1 * s2 * s3,
-                        s1 * s2 * s3 + c1 * c2 * c3
-                )
-                RotationsOrder.ZXY -> Quaternion(
-                        c1 * s2 * c3 - s1 * c2 * s3,
-                        s1 * s2 * c3 + c1 * c2 * s3,
-                        s1 * c2 * c3 + c1 * s2 * s3,
-                        c1 * c2 * c3 - s1 * s2 * s3
-                )
-            }
-        }
-    }
-
-    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 fun compareTo(v: Float, delta: Float = 0.0f) = Float4(
-        x.compareTo(v, delta),
-        y.compareTo(v, delta),
-        z.compareTo(v, delta),
-        w.compareTo(v, delta)
-    )
-
-    inline fun equals(v: Float, delta: Float = 0.0f) = Bool4(
-        x.equals(v, delta),
-        y.equals(v, delta),
-        z.equals(v, delta),
-        w.equals(v, delta)
-    )
-
-    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 compareTo(v: Float4, delta: Float = 0.0f) = Float4(
-        x.compareTo(v.x, delta),
-        y.compareTo(v.y, delta),
-        z.compareTo(v.z, delta),
-        w.compareTo(v.w, delta)
-    )
-
-    inline fun equals(v: Float4, delta: Float = 0.0f) = Bool4(
-        x.equals(v.x, delta),
-        y.equals(v.y, delta),
-        z.equals(v.z, delta),
-        w.equals(v.w, delta)
-    )
-
-    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 lessThan(a: Quaternion, b: Float) = Bool4(
-    a.x < b,
-    a.y < b,
-    a.z < b,
-    a.w < b
-)
-
-inline fun lessThan(a: Quaternion, b: Quaternion) = Bool4(
-    a.x < b.x,
-    a.y < b.y,
-    a.z < b.z,
-    a.w < b.w
-)
-
-inline fun lessThanEqual(a: Quaternion, b: Float) = Bool4(
-    a.x <= b,
-    a.y <= b,
-    a.z <= b,
-    a.w <= b
-)
-
-inline fun lessThanEqual(a: Quaternion, b: Quaternion) = Bool4(
-    a.x <= b.x,
-    a.y <= b.y,
-    a.z <= b.z,
-    a.w <= b.w
-)
-
-inline fun greaterThan(a: Quaternion, b: Float) = Bool4(
-    a.x > b,
-    a.y > b,
-    a.z > b,
-    a.w > b
-)
-
-inline fun greaterThan(a: Quaternion, b: Quaternion) = Bool4(
-    a.x > b.y,
-    a.y > b.y,
-    a.z > b.z,
-    a.w > b.w
-)
-
-inline fun greaterThanEqual(a: Quaternion, b: Float) = Bool4(
-    a.x >= b,
-    a.y >= b,
-    a.z >= b,
-    a.w >= b
-)
-
-inline fun greaterThanEqual(a: Quaternion, b: Quaternion) = Bool4(
-    a.x >= b.x,
-    a.y >= b.y,
-    a.z >= b.z,
-    a.w >= b.w
-)
-
-inline fun equal(a: Quaternion, b: Float, delta: Float = 0.0f) = Bool4(
-    a.x.equals(b, delta),
-    a.y.equals(b, delta),
-    a.z.equals(b, delta),
-    a.w.equals(b, delta)
-)
-
-inline fun equal(a: Quaternion, b: Quaternion, delta: Float = 0.0f) = Bool4(
-    a.x.equals(b.x, delta),
-    a.y.equals(b.y, delta),
-    a.z.equals(b.z, delta),
-    a.w.equals(b.w, delta)
-)
-
-inline fun notEqual(a: Quaternion, b: Float, delta: Float = 0.0f) = Bool4(
-    !a.x.equals(b, delta),
-    !a.y.equals(b, delta),
-    !a.z.equals(b, delta),
-    !a.w.equals(b, delta)
-)
-
-inline fun notEqual(a: Quaternion, b: Quaternion, delta: Float = 0.0f) = Bool4(
-    !a.x.equals(b.x, delta),
-    !a.y.equals(b.y, delta),
-    !a.z.equals(b.z, delta),
-    !a.w.equals(b.w, delta)
-)
-
-inline infix fun Quaternion.lt(b: Float) = Bool4(x < b, y < b, z < b, w < b)
-inline infix fun Quaternion.lt(b: Float4) = Bool4(x < b.x, y < b.y, z < b.z, w < b.w)
-inline infix fun Quaternion.lte(b: Float) = Bool4(x <= b, y <= b, z <= b, w <= b)
-inline infix fun Quaternion.lte(b: Float4) = Bool4(x <= b.x, y <= b.y, z <= b.z, w <= b.w)
-inline infix fun Quaternion.gt(b: Float) = Bool4(x > b, y > b, z > b, w > b)
-inline infix fun Quaternion.gt(b: Float4) = Bool4(x > b.x, y > b.y, z > b.z, w > b.w)
-inline infix fun Quaternion.gte(b: Float) = Bool4(x >= b, y >= b, z >= b, w >= b)
-inline infix fun Quaternion.gte(b: Float4) = Bool4(x >= b.x, y >= b.y, z >= b.z, w >= b.w)
-inline infix fun Quaternion.eq(b: Float) = Bool4(x == b, y == b, z == b, w == b)
-inline infix fun Quaternion.eq(b: Float4) = Bool4(x == b.x, y == b.y, z == b.z, w == b.w)
-inline infix fun Quaternion.neq(b: Float) = Bool4(x != b, y != b, z != b, w != b)
-inline infix fun Quaternion.neq(b: Float4) = Bool4(x != b.x, y != b.y, z != b.z, w != b.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.x, -q.y, -q.z, q.w)
-
-fun inverse(q: Quaternion): Quaternion {
-    val d = 1.0f / dot(q, q)
-    return Quaternion(-q.x * d, -q.y * d, -q.z * 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)
-}
-
-fun angle(a: Quaternion, b: Quaternion): Float {
-    return 2.0f * acos(abs(clamp(dot(a, b), -1.0f, 1.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 dotThreshold If the quaternion dot product is greater than this value
- * (i.e. the quaternions are very close to each other), then the quaternions are
- * linearly interpolated instead of spherically interpolated.
- *
- * @return Interpolated value between the two floats
- */
-fun slerp(a: Quaternion, b: Quaternion, t: Float, dotThreshold: Float = 0.9995f): Quaternion {
-    // could also be computed as: pow(q * inverse(p), t) * p;
-    var dot = dot(a, b)
-    var b1 = b
-
-    // If the dot product is negative, then the interpolation won't follow the shortest angular path
-    // between the two quaterions. In this case, invert the end quaternion to produce an equivalent
-    // rotation that will give us the path we want.
-    if (dot < 0.0f) {
-        dot = -dot
-        b1 = -b
-    }
-
-    // Prevent blowing up when slerping between two quaternions that are very near each other.
-    return if (dot < dotThreshold) {
-        val angle = acos(dot)
-        val s = sin(angle)
-        a * sin((1.0f - t) * angle) / s + b1 * sin(t * angle) / s
-    } else {
-        // If the angle is too small, use linear interpolation
-        nlerp(a, b1, t)
-    }
-}
-
-fun lerp(a: Quaternion, b: Quaternion, t: Float): Quaternion {
-    return ((1.0f - 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
- *
- * @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.
- */
-fun eulerAngles(q: Quaternion, order: RotationsOrder = RotationsOrder.ZYX): Float3 {
-    return eulerAngles(rotation(q), order)
-}

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

@@ -18,8 +18,6 @@
 
 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
@@ -28,21 +26,12 @@ const val INV_PI      = 1.0f / FPI
 const val INV_TWO_PI  = INV_PI * 0.5f
 const val INV_FOUR_PI = INV_PI * 0.25f
 
-val HALF_ONE = Half(0x3c00.toUShort())
-val HALF_TWO = Half(0x4000.toUShort())
-
-inline fun clamp(x: Float, min: Float, max: Float) = if (x < min) min else (if (x > max) max else x)
-
-inline fun clamp(x: Half, min: Half, max: Half) = if (x < min) min else (if (x > max) max else x)
+inline fun clamp(x: Float, min: Float, max: Float)= if (x < min) min else (if (x > max) max else x)
 
 inline fun saturate(x: Float) = clamp(x, 0.0f, 1.0f)
 
-inline fun saturate(x: Half) = clamp(x, Half.POSITIVE_ZERO, HALF_ONE)
-
 inline fun mix(a: Float, b: Float, x: Float) = a * (1.0f - x) + b * x
 
-inline fun mix(a: Half, b: Half, x: Half) = a * (HALF_ONE - x) + b * x
-
 inline fun degrees(v: Float) = v * (180.0f * INV_PI)
 
 inline fun radians(v: Float) = v * (FPI / 180.0f)
@@ -51,6 +40,4 @@ inline fun fract(v: Float) = v % 1
 
 inline fun sqr(v: Float) = v * v
 
-inline fun sqr(v: Half) = v * v
-
-inline fun pow(x: Float, y: Float) = (x.toDouble().pow(y.toDouble())).toFloat()
+inline fun pow(x: Float, y: Float) = StrictMath.pow(x.toDouble(), y.toDouble()).toFloat()

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.filament.utils
+package com.google.android.filament.textured
 
 import android.content.res.Resources
 import android.graphics.Bitmap

android/gltfio-android/CMakeLists.txt

@@ -11,76 +11,51 @@ add_library(dracodec STATIC IMPORTED)
 set_target_properties(dracodec PROPERTIES IMPORTED_LOCATION
         ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libdracodec.a)
 
-add_library(meshoptimizer STATIC IMPORTED)
-set_target_properties(meshoptimizer PROPERTIES IMPORTED_LOCATION
-        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libmeshoptimizer.a)
-
-add_library(ktxreader STATIC IMPORTED)
-set_target_properties(ktxreader PROPERTIES IMPORTED_LOCATION
-        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libktxreader.a)
-
-add_library(stb STATIC IMPORTED)
-set_target_properties(stb PROPERTIES IMPORTED_LOCATION
-        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libstb.a)
-
-add_library(basis_transcoder STATIC IMPORTED)
-set_target_properties(basis_transcoder PROPERTIES IMPORTED_LOCATION
-        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libbasis_transcoder.a)
-
-add_library(zstd STATIC IMPORTED)
-set_target_properties(zstd PROPERTIES IMPORTED_LOCATION
-        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libzstd.a)
-
 add_library(utils STATIC IMPORTED)
 set_target_properties(utils PROPERTIES IMPORTED_LOCATION
         ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libutils.a)
 
-add_library(uberzlib STATIC IMPORTED)
-set_target_properties(uberzlib PROPERTIES IMPORTED_LOCATION
-        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libuberzlib.a)
+add_library(gltfio_resources STATIC IMPORTED)
+set_target_properties(gltfio_resources PROPERTIES IMPORTED_LOCATION
+        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libgltfio_resources.a)
 
-add_library(uberarchive STATIC IMPORTED)
-set_target_properties(uberarchive PROPERTIES IMPORTED_LOCATION
-        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libuberarchive.a)
+add_library(gltfio_resources_lite STATIC IMPORTED)
+set_target_properties(gltfio_resources_lite PROPERTIES IMPORTED_LOCATION
+        ${FILAMENT_DIR}/lib/${ANDROID_ABI}/libgltfio_resources_lite.a)
 
 set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libgltfio-jni.map")
 
 set(GLTFIO_SRCS
         ${GLTFIO_DIR}/include/gltfio/Animator.h
         ${GLTFIO_DIR}/include/gltfio/AssetLoader.h
+        ${GLTFIO_DIR}/include/gltfio/MaterialProvider.h
+        ${GLTFIO_DIR}/include/gltfio/ResourceLoader.h
         ${GLTFIO_DIR}/include/gltfio/FilamentAsset.h
         ${GLTFIO_DIR}/include/gltfio/FilamentInstance.h
-        ${GLTFIO_DIR}/include/gltfio/MaterialProvider.h
-        ${GLTFIO_DIR}/include/gltfio/NodeManager.h
-        ${GLTFIO_DIR}/include/gltfio/ResourceLoader.h
-        ${GLTFIO_DIR}/include/gltfio/TextureProvider.h
-        ${GLTFIO_DIR}/include/gltfio/math.h
 
-        ${GLTFIO_DIR}/src/ArchiveCache.cpp
-        ${GLTFIO_DIR}/src/ArchiveCache.h
         ${GLTFIO_DIR}/src/Animator.cpp
         ${GLTFIO_DIR}/src/AssetLoader.cpp
-        ${GLTFIO_DIR}/src/DependencyGraph.cpp
-        ${GLTFIO_DIR}/src/DependencyGraph.h
         ${GLTFIO_DIR}/src/DracoCache.cpp
         ${GLTFIO_DIR}/src/DracoCache.h
+        ${GLTFIO_DIR}/src/DependencyGraph.cpp
+        ${GLTFIO_DIR}/src/DependencyGraph.h
         ${GLTFIO_DIR}/src/FFilamentAsset.h
-        ${GLTFIO_DIR}/src/FFilamentInstance.h
         ${GLTFIO_DIR}/src/FilamentAsset.cpp
+        ${GLTFIO_DIR}/src/FFilamentInstance.h
         ${GLTFIO_DIR}/src/FilamentInstance.cpp
-        ${GLTFIO_DIR}/src/FNodeManager.h
         ${GLTFIO_DIR}/src/GltfEnums.h
-        ${GLTFIO_DIR}/src/Ktx2Provider.cpp
         ${GLTFIO_DIR}/src/MaterialProvider.cpp
-        ${GLTFIO_DIR}/src/NodeManager.cpp
+        ${GLTFIO_DIR}/src/MorphHelper.h
+        ${GLTFIO_DIR}/src/MorphHelper.cpp
         ${GLTFIO_DIR}/src/ResourceLoader.cpp
-        ${GLTFIO_DIR}/src/StbProvider.cpp
-        ${GLTFIO_DIR}/src/TangentsJob.cpp
         ${GLTFIO_DIR}/src/TangentsJob.h
-        ${GLTFIO_DIR}/src/UbershaderProvider.cpp
+        ${GLTFIO_DIR}/src/TangentsJob.cpp
+        ${GLTFIO_DIR}/src/UbershaderLoader.cpp
         ${GLTFIO_DIR}/src/Wireframe.cpp
         ${GLTFIO_DIR}/src/Wireframe.h
-        ${GLTFIO_DIR}/src/downcast.h
+        ${GLTFIO_DIR}/src/math.h
+        ${GLTFIO_DIR}/src/upcast.h
+        ${GLTFIO_DIR}/src/Image.cpp
 
         src/main/cpp/Animator.cpp
         src/main/cpp/AssetLoader.cpp
@@ -88,10 +63,11 @@ set(GLTFIO_SRCS
         src/main/cpp/FilamentInstance.cpp
         src/main/cpp/MaterialKey.cpp
         src/main/cpp/MaterialKey.h
-        src/main/cpp/UbershaderProvider.cpp
+        src/main/cpp/UbershaderLoader.cpp
         src/main/cpp/ResourceLoader.cpp
 
-        ${FILAMENT_DIR}/include/gltfio/materials/uberarchive.h
+        ${FILAMENT_DIR}/include/gltfio/resources/gltfresources_lite.h
+        ${FILAMENT_DIR}/include/gltfio/resources/gltfresources.h
 
         ../common/NioUtils.cpp
 )
@@ -99,24 +75,28 @@ set(GLTFIO_SRCS
 set(GLTFIO_INCLUDE_DIRS
         ..
         ${FILAMENT_DIR}/include
-        ../../filament/backend/include
-        ../../libs/gltfio/include
-        ../../third_party/basisu/zstd
+        ${FILAMENT_DIR}/include/gltfio/resources
         ../../third_party/cgltf
-        ../../third_party/meshoptimizer/src
         ../../third_party/robin-map
         ../../third_party/hat-trie
         ../../third_party/stb
         ../../libs/utils/include
-        ../../libs/ktxreader/include
 )
 
 add_library(gltfio-jni SHARED ${GLTFIO_SRCS})
 target_include_directories(gltfio-jni PRIVATE ${GLTFIO_INCLUDE_DIRS})
 set_target_properties(gltfio-jni PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libgltfio-jni.symbols)
 set_target_properties(gltfio-jni PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libgltfio-jni.map)
-target_link_libraries(gltfio-jni filament-jni utils uberzlib log stb ktxreader basis_transcoder zstd uberarchive)
-target_link_libraries(gltfio-jni dracodec meshoptimizer)
-target_compile_definitions(gltfio-jni PUBLIC GLTFIO_DRACO_SUPPORTED=1)
-target_include_directories(gltfio-jni PRIVATE ${DRACO_DIR}/src)
-target_include_directories(gltfio-jni PRIVATE ${DRACO_DIR}/tnt)
+
+if(GLTFIO_LITE)
+        target_compile_definitions(gltfio-jni PUBLIC GLTFIO_LITE=1)
+        target_link_libraries(gltfio-jni filament-jni utils log gltfio_resources_lite)
+else()
+        target_link_libraries(gltfio-jni filament-jni utils log gltfio_resources)
+
+        # Enable Draco in the non-lite variant of gltfio.
+        target_link_libraries(gltfio-jni dracodec)
+        target_compile_definitions(gltfio-jni PUBLIC GLTFIO_DRACO_SUPPORTED=1)
+        target_include_directories(gltfio-jni PRIVATE ${DRACO_DIR}/src)
+        target_include_directories(gltfio-jni PRIVATE ${DRACO_DIR}/tnt)
+endif()

android/gltfio-android/build.gradle

@@ -1,34 +1,33 @@
 android {
-    namespace 'com.google.android.filament.gltfio'
-
     flavorDimensions "functionality"
     productFlavors {
         full {
             dimension "functionality"
         }
-    }
-    packagingOptions {
-        // No need to package up the following shared libs, which arise as a side effect of our
-        // externalNativeBuild dependencies. When clients pick and choose from project-level gradle
-        // dependencies, these shared libs already get pulled in, so we need to avoid the error:
-        // "More than one file was found with OS independent path ..."
-        jniLibs {
-            excludes += ['lib/*/libfilament-jni.so']
+
+        lite {
+            dimension "functionality"
+
+            externalNativeBuild {
+                cmake {
+                    arguments.add("-DGLTFIO_LITE=ON")
+                }
+            }
         }
     }
 
-    publishing {
-        singleVariant("fullRelease") {
-            withSourcesJar()
-            withJavadocJar()
-        }
+    // No need to package up the following shared libs, which arise as a side effect of our
+    // externalNativeBuild dependencies. When clients pick and choose from project-level gradle
+    // dependencies, these shared libs already get pulled in, so we need to avoid the error:
+    // "More than one file was found with OS independent path ..."
+    packagingOptions {
+        exclude 'lib/*/libfilament-jni.so'
     }
 }
 
 dependencies {
     implementation deps.androidx.annotations
-
-    api project(':filament-android')
+    implementation project(':filament-android')
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
@@ -40,6 +39,11 @@ afterEvaluate { project ->
                 artifactId = POM_ARTIFACT_ID_FULL
                 from components.fullRelease
             }
+
+            liteRelease(MavenPublication) {
+                artifactId = POM_ARTIFACT_ID_LITE
+                from components.liteRelease
+            }
         }
     }
 }

android/gltfio-android/src/main/AndroidManifest.xml

@@ -14,4 +14,5 @@
   limitations under the License.
  -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.filament.gltfio" />

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

@@ -20,7 +20,7 @@
 
 using namespace filament;
 using namespace filament::math;
-using namespace filament::gltfio;
+using namespace gltfio;
 using namespace utils;
 
 extern "C" JNIEXPORT void JNICALL
@@ -36,19 +36,6 @@ Java_com_google_android_filament_gltfio_Animator_nUpdateBoneMatrices(JNIEnv*, jc
     animator->updateBoneMatrices();
 }
 
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_Animator_nApplyCrossFade(JNIEnv*, jclass, jlong nativeAnimator,
-        jint previousAnimIndex, jfloat previousAnimTime, jfloat alpha) {
-    Animator* animator = (Animator*) nativeAnimator;
-    animator->applyCrossFade(previousAnimIndex, previousAnimTime, alpha);
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_Animator_nResetBoneMatrices(JNIEnv*, jclass, jlong nativeAnimator) {
-    Animator* animator = (Animator*) nativeAnimator;
-    animator->resetBoneMatrices();
-}
-
 extern "C" JNIEXPORT jint JNICALL
 Java_com_google_android_filament_gltfio_Animator_nGetAnimationCount(JNIEnv*, jclass, jlong nativeAnimator) {
     Animator* animator = (Animator*) nativeAnimator;

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

@@ -30,7 +30,7 @@
 #include "MaterialKey.h"
 
 using namespace filament;
-using namespace filament::gltfio;
+using namespace gltfio;
 using namespace utils;
 
 class JavaMaterialProvider : public MaterialProvider {
@@ -42,7 +42,6 @@ class JavaMaterialProvider : public MaterialProvider {
 
     jmethodID mMaterialKeyConstructor;
     jmethodID mCreateMaterialInstance;
-    jmethodID mGetMaterial;
     jmethodID mGetMaterials;
     jmethodID mNeedsDummyData;
     jmethodID mDestroyMaterials;
@@ -70,13 +69,9 @@ public:
         jclass providerClass = env->GetObjectClass(provider);
 
         mCreateMaterialInstance = env->GetMethodID(providerClass, "createMaterialInstance",
-                "(L" JAVA_MATERIAL_KEY ";[ILjava/lang/String;Ljava/lang/String;)Lcom/google/android/filament/MaterialInstance;");
+                "(L" JAVA_MATERIAL_KEY ";[ILjava/lang/String;)Lcom/google/android/filament/MaterialInstance;");
         assert_invariant(mCreateMaterialInstance);
 
-        mGetMaterial = env->GetMethodID(providerClass, "getMaterial",
-                "(L" JAVA_MATERIAL_KEY ";[ILjava/lang/String;)Lcom/google/android/filament/Material;");
-        assert_invariant(mGetMaterial);
-
         mGetMaterials = env->GetMethodID(providerClass, "getMaterials",
                 "()[Lcom/google/android/filament/Material;");
         assert_invariant(mGetMaterials);
@@ -94,7 +89,7 @@ public:
         delete mPreviousMaterials;
     }
 
-    MaterialInstance* createMaterialInstance(MaterialKey* config, UvMap* uvmap, const char* label, const char* extras) override {
+    MaterialInstance* createMaterialInstance(MaterialKey* config, UvMap* uvmap, const char* label) override {
         // Create a Java object for the material key and copy the native fields into it.
         jobject javaKey = mEnv->NewObject(mMaterialKeyClass, mMaterialKeyConstructor);
 
@@ -104,61 +99,11 @@ 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(uvmap->size());
+        jintArray uvMapArray = mEnv->NewIntArray(8);
 
         // Call the Java-based material provider.
         jobject materialInstance = mEnv->CallObjectMethod(mJavaProvider, mCreateMaterialInstance,
-                javaKey, uvMapArray, stringLabel, stringExtras);
-
-        // Copy the UvMap results from the JVM array into the native array.
-        if (uvmap) {
-            jint* elements = mEnv->GetIntArrayElements(uvMapArray, nullptr);
-            for (size_t i = 0; i < uvmap->size(); i++) {
-                (*uvmap)[i] = (UvSet) elements[i];
-            }
-            mEnv->ReleaseIntArrayElements(uvMapArray, elements, JNI_ABORT);
-        }
-
-        // The config parameter is an in-out parameter so we need to copy the results from Java.
-        helper.copy(mEnv, *config, javaKey);
-
-        mEnv->DeleteLocalRef(javaKey);
-        mEnv->DeleteLocalRef(uvMapArray);
-
-        if (stringLabel) {
-            mEnv->DeleteLocalRef(stringLabel);
-        }
-
-        if (stringExtras) {
-            mEnv->DeleteLocalRef(stringExtras);
-        }
-
-        if (materialInstance == nullptr) {
-            return nullptr;
-        }
-
-        return (MaterialInstance*) mEnv->CallLongMethod(materialInstance, mMaterialInstanceGetNativeObject);
-    }
-
-    Material* getMaterial(MaterialKey* config, UvMap* uvmap, const char* label) override {
-        // Create a Java object for the material key and copy the native fields into it.
-        jobject javaKey = mEnv->NewObject(mMaterialKeyClass, mMaterialKeyConstructor);
-
-        auto& helper = MaterialKeyHelper::get();
-        helper.copy(mEnv, javaKey, *config);
-
-        // Convert the optional label into a Java string.
-        jstring stringLabel = label ? mEnv->NewStringUTF(label) : nullptr;
-
-        // Allocate space for the output argument.
-        jintArray uvMapArray = mEnv->NewIntArray(uvmap->size());
-
-        // Call the Java-based material provider.
-        jobject material = mEnv->CallObjectMethod(mJavaProvider, mGetMaterial,
                 javaKey, uvMapArray, stringLabel);
 
         // Copy the UvMap results from the JVM array into the native array.
@@ -180,11 +125,11 @@ public:
             mEnv->DeleteLocalRef(stringLabel);
         }
 
-        if (material == nullptr) {
+        if (materialInstance == nullptr) {
             return nullptr;
         }
 
-        return (Material*) mEnv->CallLongMethod(material, mMaterialGetNativeObject);
+        return (MaterialInstance*) mEnv->CallLongMethod(materialInstance, mMaterialInstanceGetNativeObject);
     }
 
     const Material* const* getMaterials() const noexcept override {
@@ -232,8 +177,6 @@ Java_com_google_android_filament_gltfio_AssetLoader_nCreateAssetLoader(JNIEnv* e
     jmethodID getNativeObject = env->GetMethodID(klass, "getNativeObject", "()J");
     if (getNativeObject) {
         materialProvider = (MaterialProvider*) env->CallLongMethod(provider, getNativeObject);
-    } else {
-        env->ExceptionClear();
     }
 
     if (materialProvider == nullptr) {
@@ -249,17 +192,27 @@ extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_gltfio_AssetLoader_nDestroyAssetLoader(JNIEnv*, jclass,
         jlong nativeLoader) {
     AssetLoader* loader = (AssetLoader*) nativeLoader;
+    delete loader->getMaterialProvider();
     NameComponentManager* names = loader->getNames();
     AssetLoader::destroy(&loader);
     delete names;
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_gltfio_AssetLoader_nCreateAsset(JNIEnv* env, jclass,
+Java_com_google_android_filament_gltfio_AssetLoader_nCreateAssetFromBinary(JNIEnv* env, jclass,
         jlong nativeLoader, jobject javaBuffer, jint remaining) {
     AssetLoader* loader = (AssetLoader*) nativeLoader;
     AutoBuffer buffer(env, javaBuffer, remaining);
-    return (jlong) loader->createAsset((const uint8_t *) buffer.getData(),
+    return (jlong) loader->createAssetFromBinary((const uint8_t *) buffer.getData(),
+            buffer.getSize());
+}
+
+extern "C" JNIEXPORT jlong JNICALL
+Java_com_google_android_filament_gltfio_AssetLoader_nCreateAssetFromJson(JNIEnv* env, jclass,
+        jlong nativeLoader, jobject javaBuffer, jint remaining) {
+    AssetLoader* loader = (AssetLoader*) nativeLoader;
+    AutoBuffer buffer(env, javaBuffer, remaining);
+    return (jlong) loader->createAssetFromJson((const uint8_t *) buffer.getData(),
             buffer.getSize());
 }
 
@@ -284,14 +237,6 @@ 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/FilamentAsset.cpp

@@ -20,7 +20,7 @@
 
 using namespace filament;
 using namespace filament::math;
-using namespace filament::gltfio;
+using namespace gltfio;
 using namespace utils;
 
 extern "C" JNIEXPORT jint JNICALL
@@ -120,34 +120,10 @@ extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_gltfio_FilamentAsset_nGetLightEntities(JNIEnv* env, jclass,
         jlong nativeAsset, jintArray result) {
     FilamentAsset* asset = (FilamentAsset*) nativeAsset;
-    const jsize available = env->GetArrayLength(result);
-    const size_t minCount = std::min(available, (jsize) asset->getLightEntityCount());
-    if (minCount == 0) {
-        return;
-    }
+    jsize available = env->GetArrayLength(result);
     Entity* entities = (Entity*) env->GetIntArrayElements(result, nullptr);
-    std::copy_n(asset->getLightEntities(), minCount, entities);
-    env->ReleaseIntArrayElements(result, (jint*) entities, 0);
-}
-
-extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_gltfio_FilamentAsset_nGetRenderableEntityCount(JNIEnv*, jclass,
-        jlong nativeAsset) {
-    FilamentAsset* asset = (FilamentAsset*) nativeAsset;
-    return asset->getRenderableEntityCount();
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_FilamentAsset_nGetRenderableEntities(JNIEnv* env, jclass,
-        jlong nativeAsset, jintArray result) {
-    FilamentAsset* asset = (FilamentAsset*) nativeAsset;
-    const jsize available = env->GetArrayLength(result);
-    const size_t minCount = std::min(available, (jsize) asset->getRenderableEntityCount());
-    if (minCount == 0) {
-        return;
-    }
-    Entity* entities = (Entity*) env->GetIntArrayElements(result, nullptr);
-    std::copy_n(asset->getRenderableEntities(), minCount, entities);
+    std::copy_n(asset->getLightEntities(),
+            std::min(available, (jsize) asset->getLightEntityCount()), entities);
     env->ReleaseIntArrayElements(result, (jint*) entities, 0);
 }
 
@@ -155,13 +131,10 @@ extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_gltfio_FilamentAsset_nGetCameraEntities(JNIEnv* env, jclass,
         jlong nativeAsset, jintArray result) {
     FilamentAsset* asset = (FilamentAsset*) nativeAsset;
-    const jsize available = env->GetArrayLength(result);
-    const size_t minCount = std::min(available, (jsize) asset->getCameraEntityCount());
-    if (minCount == 0) {
-        return;
-    }
+    jsize available = env->GetArrayLength(result);
     Entity* entities = (Entity*) env->GetIntArrayElements(result, nullptr);
-    std::copy_n(asset->getCameraEntities(), minCount, entities);
+    std::copy_n(asset->getCameraEntities(),
+            std::min(available, (jsize) asset->getCameraEntityCount()), entities);
     env->ReleaseIntArrayElements(result, (jint*) entities, 0);
 }
 
@@ -172,6 +145,27 @@ Java_com_google_android_filament_gltfio_FilamentAsset_nGetCameraEntityCount(JNIE
     return asset->getCameraEntityCount();
 }
 
+extern "C" JNIEXPORT jint JNICALL
+Java_com_google_android_filament_gltfio_FilamentAsset_nGetMaterialInstanceCount(JNIEnv*, jclass,
+        jlong nativeAsset) {
+    FilamentAsset* asset = (FilamentAsset*) nativeAsset;
+    return asset->getMaterialInstanceCount();
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_gltfio_FilamentAsset_nGetMaterialInstances(JNIEnv* env, jclass,
+        jlong nativeAsset, jlongArray result) {
+    FilamentAsset* asset = (FilamentAsset*) nativeAsset;
+    jsize available = env->GetArrayLength(result);
+    jsize count = std::min(available, (jsize) asset->getMaterialInstanceCount());
+    jlong* dst = env->GetLongArrayElements(result, nullptr);
+    const MaterialInstance * const* src = asset->getMaterialInstances();
+    for (jsize i = 0; i < count; i++) {
+        dst[i] = (jlong) src[i];
+    }
+    env->ReleaseLongArrayElements(result, dst, 0);
+}
+
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_gltfio_FilamentAsset_nGetBoundingBox(JNIEnv* env, jclass,
         jlong nativeAsset, jfloatArray result) {
@@ -208,10 +202,10 @@ Java_com_google_android_filament_gltfio_FilamentAsset_nGetExtras(JNIEnv* env, jc
 }
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_gltfio_FilamentAsset_nGetInstance(JNIEnv* , jclass,
+Java_com_google_android_filament_gltfio_FilamentAsset_nGetAnimator(JNIEnv* , jclass,
         jlong nativeAsset) {
     FilamentAsset* asset = (FilamentAsset*) nativeAsset;
-    return (jlong) asset->getInstance();
+    return (jlong) asset->getAnimator();
 }
 
 extern "C" JNIEXPORT jint JNICALL
@@ -232,25 +226,6 @@ Java_com_google_android_filament_gltfio_FilamentAsset_nGetResourceUris(JNIEnv* e
     }
 }
 
-extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_gltfio_FilamentAsset_nGetMorphTargetCount(JNIEnv*, jclass,
-        jlong nativeAsset, jint entityId) {
-    FilamentAsset* asset = (FilamentAsset*) nativeAsset;
-    Entity entity = Entity::import(entityId);
-    return (jint) asset->getMorphTargetCountAt(entity);
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_FilamentAsset_nGetMorphTargetNames(JNIEnv* env, jclass,
-        jlong nativeAsset, jint entityId, jobjectArray result) {
-    FilamentAsset* asset = (FilamentAsset*) nativeAsset;
-    Entity entity = Entity::import(entityId);
-    for (int i = 0, n = asset->getMorphTargetCountAt(entity); i < n; ++i) {
-        const char* name = asset->getMorphTargetNameAt(entity, i);
-        env->SetObjectArrayElement(result, (jsize) i, env->NewStringUTF(name));
-    }
-}
-
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_gltfio_FilamentAsset_nReleaseSourceData(JNIEnv* env, jclass,
         jlong nativeAsset) {