Correctly prepare color grading as subpass programs (#5384)

These asserts will come back in the next Filament release, which has
much cleaner layout tracking.

.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

@@ -33,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/release.yml

@@ -39,8 +39,8 @@ 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}
       - uses: actions/checkout@v2.0.0
         with:
           ref: ${{ steps.git_ref.outputs.ref }}
@@ -50,7 +50,8 @@ jobs:
           cd build/$WORKFLOW_OS && printf "y" | ./build.sh release
       - name: Upload release assets
         run: |
-          xargs -L 1 sudo pip3 install < build/common/requirements.txt
+          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;
           python3 build/common/upload-assets.py ${TAG} out/*.tgz
@@ -69,8 +70,8 @@ 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}
       - uses: actions/checkout@v2.0.0
         with:
           ref: ${{ steps.git_ref.outputs.ref }}
@@ -79,7 +80,8 @@ jobs:
           cd build/web && printf "y" | ./build.sh release
       - name: Upload release assets
         run: |
-          xargs -L 1 sudo pip3 install < build/common/requirements.txt
+          pip3 install setuptools
+          pip3 install PyGithub
           mv out/filament-release-web.tgz out/filament-${TAG}-web.tgz
           python3 build/common/upload-assets.py ${TAG} out/*.tgz
         env:
@@ -97,8 +99,8 @@ 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}
       - uses: actions/checkout@v2.0.0
         with:
           ref: ${{ steps.git_ref.outputs.ref }}
@@ -121,11 +123,13 @@ jobs:
           APK_KEYSTORE_PASS: ${{ secrets.APK_KEYSTORE_PASS }}
       - name: Upload release assets
         run: |
-          xargs -L 1 sudo pip3 install < build/common/requirements.txt
+          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
           python3 build/common/upload-assets.py ${TAG} out/*.aar out/*.apk
         env:
@@ -143,8 +147,8 @@ 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}
       - uses: actions/checkout@v2.0.0
         with:
           ref: ${{ steps.git_ref.outputs.ref }}
@@ -153,7 +157,8 @@ jobs:
           cd build/ios && printf "y" | ./build.sh release
       - name: Upload release assets
         run: |
-          xargs -L 1 sudo pip3 install < build/common/requirements.txt
+          pip3 install setuptools
+          pip3 install PyGithub
           mv out/filament-release-ios.tgz out/filament-${TAG}-ios.tgz
           python3 build/common/upload-assets.py ${TAG} out/*.tgz
         env:
@@ -171,8 +176,8 @@ 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@v2.0.0
         with:

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

@@ -1,26 +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 }}

BUILDING.md

@@ -15,7 +15,7 @@ To build Filament for Android you must also install the following:
 
 - Android Studio Arctic Fox or more recent
 - Android SDK
-- Android NDK 25.1 or higher
+- Android NDK "side-by-side" 23.1 or higher
 
 ### Environment variables
 
@@ -144,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:
 
 ```
@@ -352,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/refs/tags/3.1.5.zip > emsdk.zip
 unzip emsdk.zip ; mv emsdk-* emsdk ; cd emsdk
 python ./emsdk.py install latest
 python ./emsdk.py activate latest
@@ -368,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,8 +23,6 @@ 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)
@@ -35,16 +33,16 @@ 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
@@ -105,9 +103,6 @@ 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)
@@ -280,10 +275,6 @@ 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()
@@ -359,10 +350,6 @@ 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
 # ==================================================================================================
@@ -405,8 +392,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()
 
 # ==================================================================================================
@@ -459,13 +446,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)
@@ -604,6 +584,15 @@ 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)
+    if (APPLE OR FILAMENT_LINUX_IS_MOBILE)
+        find_library(Vulkan_LIBRARY NAMES vulkan HINTS "$ENV{VULKAN_SDK}/lib" "$ENV{VULKAN_SDK}/macOS/lib")
+        if (Vulkan_LIBRARY)
+            set(Vulkan_FOUND ON)
+            message(STATUS "Found Vulkan library in SDK: ${Vulkan_LIBRARY}.")
+            add_definitions(-DFILAMENT_VKLIBRARY_PATH=\"${Vulkan_LIBRARY}\")
+        endif()
+    endif()
 endif()
 
 # ==================================================================================================
@@ -658,22 +647,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}/meshoptimizer)
 add_subdirectory(${EXTERNAL}/cgltf/tnt)
 add_subdirectory(${EXTERNAL}/draco/tnt)
 add_subdirectory(${EXTERNAL}/jsmn/tnt)
@@ -692,10 +678,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)
@@ -703,6 +685,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)
@@ -714,13 +700,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)
@@ -739,10 +725,9 @@ if (IS_HOST_PLATFORM)
     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.
 

README.md

@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.28.0'
+    implementation 'com.google.android.filament:filament-android:1.21.0'
 }
 ```
 
@@ -51,7 +51,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.28.0'
+pod 'Filament', '~> 1.21.0'
 ```
 
 ### Snapshots
@@ -177,9 +177,7 @@ steps:
   - [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
@@ -313,7 +311,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

@@ -50,13 +50,13 @@ Do not push to origin yet.
 git cherry-pick rc/$RELEASE
 ```
 
-Update the headers. The "main branch" header becomes a header for $NEXT_RELEASE, and a new "main
-branch" header is added.
+Update the headers. The "Next release" header becomes a header for $NEXT_RELEASE, and a new "Next
+release" header is added.
 
 For example, this:
 
 ```
-## main branch
+## Next release (main branch)
 - foo
 - bar
 
@@ -68,7 +68,7 @@ For example, this:
 becomes:
 
 ```
-## main branch
+## Next release (main branch)
 
 ## v1.9.4
 - foo
@@ -138,34 +138,3 @@ git push origin main
 ```
 git push origin -u rc/$NEXT_RELEASE
 ```
-
-## 11. 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,211 +3,9 @@
 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.
 
-## main branch
+## v1.21.1 (currently main branch)
 
-- 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`.
+- engine: allow both screen-space refraction and screen-space reflections on the same object [⚠️ **Material breakage**].
 
 ## v1.21.0
 
@@ -642,7 +440,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/build.gradle

@@ -11,9 +11,6 @@
 // com.google.android.filament.exclude-vulkan
 //     When set, support for Vulkan will be excluded.
 //
-// com.google.android.filament.matdbg
-//     When set, enables matdbg, disables shader optimizations
-//
 // com.google.android.filament.skip-samples
 //     Exclude samples from the project. Useful to speed up compilation.
 //
@@ -29,12 +26,15 @@
 
 // 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
@@ -44,7 +44,7 @@
 buildscript {
     def path = providers
             .gradleProperty("com.google.android.filament.dist-dir")
-            .get()
+            .forUseAtConfigurationTime().get()
 
     def directory = objects.fileProperty().fileValue(new File(path)).getAsFile().get()
     def filamentPath = directory.absolutePath
@@ -56,15 +56,13 @@ buildscript {
     // 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")
+            .forUseAtConfigurationTime()
             .isPresent()
 
     def abis = ["arm64-v8a", "armeabi-v7a", "x86_64", "x86"]
     def newAbis = providers
             .gradleProperty("com.google.android.filament.abis")
+            .forUseAtConfigurationTime()
             .get()
             .split(',')
     if (!newAbis.contains("all")) {
@@ -73,20 +71,18 @@ buildscript {
 
     ext.versions = [
         'minSdk': 19,
-        'targetSdk': 33,
-        'compileSdk': 33,
-        'kotlin': '1.7.10',
-        'kotlin_coroutines': '1.6.1',
-        'buildTools': '33.0.0',
-        'ndk': '25.1.8937393',
-        'androidx_core': '1.9.0',
-        'androidx_annotations': '1.3.0'
+        'targetSdk': 31,
+        'compileSdk': 31,
+        'kotlin': '1.6.10',
+        'kotlin_coroutines': '1.6.0',
+        'buildTools': '32.0.0',
+        'ndk': '23.1.7779620'
     ]
 
     ext.deps = [
         'androidx': [
-            'annotations': "androidx.annotation:annotation:${versions.androidx_annotations}",
-            'core': "androidx.core:core:${versions.androidx_core}",
+            'annotations': "androidx.annotation:annotation:1.3.0",
+            'core': "androidx.core:core:1.7.0",
         ],
         'kotlin': "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}",
         'coroutines': [
@@ -97,23 +93,22 @@ buildscript {
 
     dependencies {
         // NOTE: See TODO in gradle.properties once we move to Gradle 7.4
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:7.1.1'
         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=${matdbg ? '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",
@@ -126,13 +121,8 @@ buildscript {
         "-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
@@ -144,18 +134,14 @@ buildscript {
 }
 
 plugins {
-    id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
+    id 'io.codearte.nexus-staging' version '0.30.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 {

android/buildSrc/build.gradle

@@ -1,3 +1,4 @@
+
 plugins {
     id 'groovy-gradle-plugin'
 }

android/filamat-android/build.gradle

@@ -1,6 +1,4 @@
 android {
-    namespace 'com.google.android.filament.filamat'
-
     flavorDimensions "functionality"
     productFlavors {
         full {

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);
 }
 

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 {

android/filament-android/build.gradle

@@ -1,7 +1,3 @@
-android {
-    namespace 'com.google.android.filament'
-}
-
 dependencies {
     implementation deps.androidx.annotations
 }

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;

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

@@ -316,36 +316,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/LightManager.cpp

@@ -76,10 +76,10 @@ extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_LightManager_nBuilderShadowOptions(JNIEnv* env, jclass,
         jlong nativeBuilder, jint mapSize, jint cascades, jfloatArray splitPositions,
         jfloat constantBias, jfloat normalBias, jfloat shadowFar, jfloat shadowNearHint,
-        jfloat shadowFarHint, jboolean stable, jboolean lispsm,
+        jfloat shadowFarHint, jboolean stable,
         jfloat polygonOffsetConstant, jfloat polygonOffsetSlope,
         jboolean screenSpaceContactShadows, jint stepCount,
-        jfloat maxShadowDistance, jint vsmMsaaSamples, jboolean elvsm, jfloat blurWidth, jfloat shadowBulbRadius) {
+        jfloat maxShadowDistance, jint vsmMsaaSamples, jfloat blurWidth, jfloat shadowBulbRadius) {
     LightManager::Builder *builder = (LightManager::Builder *) nativeBuilder;
     LightManager::ShadowOptions shadowOptions {
             .mapSize = (uint32_t)mapSize,
@@ -90,7 +90,6 @@ 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,
@@ -98,7 +97,6 @@ Java_com_google_android_filament_LightManager_nBuilderShadowOptions(JNIEnv* env,
             .maxShadowDistance = maxShadowDistance,
             .vsm = {
                     .msaaSamples = (uint8_t) vsmMsaaSamples,
-                    .elvsm = (bool)elvsm,
                     .blurWidth = blurWidth
             },
             .shadowBulbRadius = shadowBulbRadius

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,

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) {
@@ -430,6 +422,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) {
@@ -438,14 +439,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) {

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

@@ -156,9 +156,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 +183,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/Stream.cpp

@@ -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,41 @@ 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,
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, 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;

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

@@ -188,6 +188,69 @@ 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,
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
+
+    texture->setImage(*engine, (size_t) level, (uint32_t) xoffset, (uint32_t) yoffset,
+            (uint32_t) width, (uint32_t) height, std::move(desc));
+
+    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,
+            callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, callback);
+
+    texture->setImage(*engine, (size_t) level, (uint32_t) xoffset, (uint32_t) yoffset,
+            (uint32_t) width, (uint32_t) height, std::move(desc));
+
+    return 0;
+}
+
 extern "C" JNIEXPORT jint JNICALL
 Java_com_google_android_filament_Texture_nSetImage3D(JNIEnv* env, jclass, jlong nativeTexture,
         jlong nativeEngine, jint level,
@@ -290,10 +353,7 @@ Java_com_google_android_filament_Texture_nSetImageCubemap(JNIEnv *env, jclass,
             (uint32_t) stride,
             callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, 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;
 }
@@ -328,10 +388,7 @@ Java_com_google_android_filament_Texture_nSetImageCubemapCompressed(JNIEnv *env,
             (backend::CompressedPixelDataType) compressedFormat, (uint32_t) compressedSizeInBytes,
             callback->getHandler(), &JniBufferCallback::postToJavaAndDestroy, 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;
 }

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

@@ -110,26 +110,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,

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

@@ -149,13 +149,12 @@ 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 minVarianceScale,
         jfloat lightBleedReduction) {
     View* view = (View*) nativeView;
     View::VsmShadowOptions options;
     options.anisotropy = (uint8_t)anisotropy;
     options.mipmapping = (bool)mipmapping;
-    options.highPrecision = (bool)highPrecision;
     options.minVarianceScale = minVarianceScale;
     options.lightBleedReduction = lightBleedReduction;
     view->setVsmShadowOptions(options);
@@ -260,14 +259,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 };
@@ -462,26 +461,3 @@ Java_com_google_android_filament_View_nPick(JNIEnv* env, jclass,
         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 });
-}

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

@@ -400,7 +400,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.
@@ -412,29 +412,29 @@ public class Camera {
      *          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.
+     * 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.
      * <p>
      *
-     * @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) double[] modelMatrix) {
-        Asserts.assertMat4In(modelMatrix);
-        nSetModelMatrixFp64(getNativeObject(), modelMatrix);
+    public void setModelMatrix(@NonNull @Size(min = 16) double[] viewMatrix) {
+        Asserts.assertMat4In(viewMatrix);
+        nSetModelMatrixFp64(getNativeObject(), viewMatrix);
     }
 
     /**
-     * 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 +456,7 @@ public class Camera {
      * @return Distance to the near plane
      */
     public float getNear() {
-        return (float)nGetNear(getNativeObject());
+        return nGetNear(getNativeObject());
     }
 
     /**
@@ -464,7 +464,7 @@ public class Camera {
      * @return Distance to the far plane
      */
     public float getCullingFar() {
-        return (float)nGetCullingFar(getNativeObject());
+        return nGetCullingFar(getNativeObject());
     }
 
     /**
@@ -549,10 +549,10 @@ public class Camera {
     /**
      * 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) {
@@ -567,7 +567,7 @@ public class Camera {
      * @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.
+     * @return A 16-double array containing the camera's view as a column-major matrix.
      */
     @NonNull @Size(min = 16)
     public double[] getViewMatrix(@Nullable @Size(min = 16) double[] out) {
@@ -787,8 +787,8 @@ public class Camera {
     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);

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();
@@ -107,7 +107,6 @@ import com.google.android.filament.proguard.UsedByReflection;
  */
 public class Engine {
     private static final Backend[] sBackendValues = Backend.values();
-    private static final FeatureLevel[] sFeatureLevelValues = FeatureLevel.values();
 
     private long mNativeObject;
 
@@ -142,18 +141,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));
@@ -271,88 +258,6 @@ public class Engine {
         return sBackendValues[(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
 
     /**
@@ -688,11 +593,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.
@@ -815,9 +717,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

@@ -240,7 +240,7 @@ 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.
@@ -280,25 +280,9 @@ 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.
@@ -362,15 +346,6 @@ public class LightManager {
         @IntRange(from = 1)
         public int vsmMsaaSamples = 1;
 
-
-        /**
-         * 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.
-         */
-        public boolean elvsm = false;
-
         /**
          * Blur width for the VSM blur. Zero do disable.
          * The maximum value is 125.
@@ -495,6 +470,11 @@ public class LightManager {
         /**
          * 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.
@@ -516,11 +496,11 @@ public class LightManager {
             nBuilderShadowOptions(mNativeBuilder,
                     options.mapSize, options.shadowCascades, options.cascadeSplitPositions,
                     options.constantBias, options.normalBias, options.shadowFar, options.shadowNearHint,
-                    options.shadowFarHint, options.stable, options.lispsm,
+                    options.shadowFarHint, options.stable,
                     options.polygonOffsetConstant, options.polygonOffsetSlope,
                     options.screenSpaceContactShadows,
                     options.stepCount, options.maxShadowDistance, options.vsmMsaaSamples,
-                    options.elvsm, options.blurWidth, options.shadowBulbRadius);
+                    options.blurWidth, options.shadowBulbRadius);
             return this;
         }
 
@@ -1178,14 +1158,7 @@ public class LightManager {
     private static native void nDestroyBuilder(long nativeBuilder);
     private static native boolean nBuilderBuild(long nativeBuilder, long nativeEngine, int entity);
     private static native void nBuilderCastShadows(long nativeBuilder, boolean enable);
-    private static native void nBuilderShadowOptions(long nativeBuilder, int mapSize,
-            int cascades, float[] splitPositions,
-             float constantBias, float normalBias,
-             float shadowFar, float shadowNearHint, float shadowFarhint,
-             boolean stable, boolean lispsm,
-             float polygonOffsetConstant, float polygonOffsetSlope,
-             boolean screenSpaceContactShadows, int stepCount, float maxShadowDistance,
-             int vsmMsaaSamples, 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, float polygonOffsetConstant, float polygonOffsetSlope, boolean screenSpaceContactShadows, int stepCount, float maxShadowDistance, int vsmMsaaSamples, float blurWidth, float shadowBulbRadius);
     private static native void nBuilderCastLight(long nativeBuilder, boolean enabled);
     private static native void nBuilderPosition(long nativeBuilder, float x, float y, float z);
     private static native void nBuilderDirection(long nativeBuilder, float x, float y, float z);

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

@@ -36,7 +36,6 @@ 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() { }

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

@@ -20,9 +20,6 @@ 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 Material mMaterial;
     private String mName;
@@ -52,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);
@@ -402,40 +351,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());
     }
@@ -545,10 +473,6 @@ public class MaterialInstance {
         nSetDepthWrite(getNativeObject(), enable);
     }
 
-    public void setStencilWrite(boolean enable) {
-        nSetStencilWrite(getNativeObject(), enable);
-    }
-
     /**
      * Overrides the default depth testing state that was set on the material.
      *
@@ -560,208 +484,6 @@ public class MaterialInstance {
         nSetDepthCulling(getNativeObject(), enable);
     }
 
-    /**
-     * 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");
@@ -834,24 +556,8 @@ 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);
 

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

@@ -104,12 +104,12 @@ public class MorphTargetBuffer {
     }
 
     /**
-     * Updates float4 positions for the given morph target.
+     * Updates positions of morph target at the index.
      *
      * @param engine {@link Engine} instance
      * @param targetIndex The index of morph target to be updated
-     * @param positions An array with at least count*4 floats
-     * @param count Number of float4 vectors in positions to be consumed
+     * @param positions Pointer to at least count positions
+     * @param count Number of position elements in positions
      */
     public void setPositionsAt(@NonNull Engine engine,
             @IntRange(from = 0) int targetIndex,
@@ -122,15 +122,12 @@ public class MorphTargetBuffer {
     }
 
     /**
-     * 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.
+     * Updates tangents of morph target at the index.
      *
      * @param engine {@link Engine} instance
      * @param targetIndex The index of morph target to be updated
-     * @param tangents An array with at least "count*4" shorts
-     * @param count number of short4 quaternions in tangents
+     * @param tangents Pointer to at least count tangents
+     * @param count Number of tangent elements in tangents
      */
     public void setTangentsAt(@NonNull Engine engine,
             @IntRange(from = 0) int targetIndex,
@@ -143,14 +140,14 @@ public class MorphTargetBuffer {
     }
 
     /**
-     * @return number of vertices in this {@link MorphTargetBuffer}
+     * @return number of vertex count in this {@link MorphTargetBuffer}
      */
     public int getVertexCount() {
         return nGetVertexCount(mNativeObject);
     }
 
     /**
-     * @return number of morph targets in this {@link MorphTargetBuffer}
+     * @return number of target count in this {@link MorphTargetBuffer}
      */
     public int getCount() {
         return nGetCount(mNativeObject);

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

@@ -191,9 +191,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 +203,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.
          *
@@ -806,9 +792,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
      *
@@ -821,20 +816,6 @@ 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.
      */
@@ -872,7 +853,6 @@ 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);
@@ -911,7 +891,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;
     };
 
@@ -179,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);
     }
 
     /**
@@ -250,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
@@ -551,10 +531,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>
      *
@@ -684,7 +660,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);
@@ -706,7 +681,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/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.
@@ -96,6 +103,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 +121,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 +156,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,7 +235,7 @@ 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())];
@@ -222,7 +254,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 +276,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 +387,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/Texture.java

@@ -884,7 +884,7 @@ public class Texture {
     // 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
@@ -912,7 +912,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);
     }
 
 
@@ -947,15 +947,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()}.
@@ -1028,9 +1046,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) {
@@ -1242,6 +1258,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/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;
@@ -200,36 +199,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
@@ -391,8 +360,6 @@ import androidx.annotation.Size;
     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);

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-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)
@@ -68,6 +64,5 @@ target_link_libraries(filament-utils-jni
         camutils
         iblprefilter
         image
-        ktxreader
         viewer
 )

android/filament-utils-android/build.gradle

@@ -1,8 +1,6 @@
 apply plugin: 'kotlin-android'
 
 android {
-    namespace 'com.google.android.filament.utils'
-
     sourceSets {
         main {
             kotlin.srcDirs += "src/main/java"
@@ -12,14 +10,14 @@ 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'
     }
 }
 

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);
@@ -172,7 +169,6 @@ Java_com_google_android_filament_utils_AutomationEngine_nGetViewerOptions(JNIEnv
     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);
@@ -183,7 +179,6 @@ Java_com_google_android_filament_utils_AutomationEngine_nGetViewerOptions(JNIEnv
     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.
@@ -103,7 +103,6 @@ public class AutomationEngine {
         public float cameraFocalLength = 28.0f;
         public float cameraFocusDistance = 0.0f;
         public boolean autoScaleEnabled = true;
-        public boolean autoInstancingEnabled = false;
     }
 
     /**
@@ -156,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");
         }
@@ -173,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);
     }
 
     /**
@@ -185,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");
         }
@@ -209,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);
     }
@@ -271,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/KTXLoader.kt

@@ -24,12 +24,12 @@ import com.google.android.filament.Texture
 import java.nio.Buffer
 
 /**
- * Utilities for consuming KTX1 files and producing Filament textures, IBLs, and sky boxes.
+ * 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 KTX1Loader {
+object KTXLoader {
     class Options {
         var srgb = false
     }

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

@@ -73,6 +73,8 @@ class ModelViewer(
         get() = resourceLoader.asyncGetLoadProgress()
 
     var normalizeSkinningWeights = true
+    var recomputeBoundingBoxes = false
+    var ignoreBindTransform = false
 
     var cameraFocalLength = 28f
         set(value) {
@@ -112,9 +114,9 @@ class ModelViewer(
         view.scene = scene
         view.camera = camera
 
-        materialProvider = UbershaderProvider(engine)
+        materialProvider = UbershaderLoader(engine)
         assetLoader = AssetLoader(engine, materialProvider, EntityManager.get())
-        resourceLoader = ResourceLoader(engine, normalizeSkinningWeights)
+        resourceLoader = ResourceLoader(engine, normalizeSkinningWeights, recomputeBoundingBoxes, ignoreBindTransform)
 
         // Always add a direct light source since it is required for shadowing.
         // We highly recommend adding an indirect light as well.
@@ -176,10 +178,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()
         }
     }
@@ -191,7 +193,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)
@@ -202,7 +204,7 @@ class ModelViewer(
                 resourceLoader.addResourceData(uri, resourceBuffer)
             }
             resourceLoader.asyncBeginLoad(asset)
-            animator = asset.getInstance().animator
+            animator = asset.animator
             asset.releaseSourceData()
         }
     }
@@ -214,7 +216,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)
         }
@@ -310,8 +312,8 @@ 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()
@@ -359,7 +361,7 @@ class ModelViewer(
                 resourceLoader.addResourceData(uri, buffer)
             }
             resourceLoader.asyncBeginLoad(asset)
-            animator = asset.getInstance().animator
+            animator = asset.animator
             asset.releaseSourceData()
         }
     }

android/gltfio-android/CMakeLists.txt

@@ -11,76 +11,49 @@ 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/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/upcast.h
+        ${GLTFIO_DIR}/src/Image.cpp
 
         src/main/cpp/Animator.cpp
         src/main/cpp/AssetLoader.cpp
@@ -88,10 +61,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 +73,30 @@ set(GLTFIO_SRCS
 set(GLTFIO_INCLUDE_DIRS
         ..
         ${FILAMENT_DIR}/include
+        ${FILAMENT_DIR}/include/gltfio/resources
         ../../filament/backend/include
         ../../libs/gltfio/include
-        ../../third_party/basisu/zstd
         ../../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,21 +1,28 @@
 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")
+                }
+            }
         }
     }
+
+    // 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 {
@@ -33,6 +40,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;
@@ -73,10 +72,6 @@ public:
                 "(L" JAVA_MATERIAL_KEY ";[ILjava/lang/String;Ljava/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);
@@ -108,7 +103,7 @@ public:
         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,
@@ -144,49 +139,6 @@ public:
         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.
-        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 (material == nullptr) {
-            return nullptr;
-        }
-
-        return (Material*) mEnv->CallLongMethod(material, mMaterialGetNativeObject);
-    }
-
     const Material* const* getMaterials() const noexcept override {
         jobjectArray javaMaterials = (jobjectArray) mEnv->CallObjectMethod(mJavaProvider, mGetMaterials);
 
@@ -255,11 +207,20 @@ Java_com_google_android_filament_gltfio_AssetLoader_nDestroyAssetLoader(JNIEnv*,
 }
 
 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());
 }
 

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
@@ -251,6 +245,30 @@ Java_com_google_android_filament_gltfio_FilamentAsset_nGetMorphTargetNames(JNIEn
     }
 }
 
+extern "C" JNIEXPORT jint JNICALL
+Java_com_google_android_filament_gltfio_FilamentAsset_nGetMaterialVariantCount(JNIEnv*, jclass,
+        jlong nativeAsset) {
+    FilamentAsset* asset = (FilamentAsset*) nativeAsset;
+    return (jint) asset->getMaterialVariantCount();
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_gltfio_FilamentAsset_nGetMaterialVariantNames(JNIEnv* env, jclass,
+        jlong nativeAsset, jobjectArray result) {
+    FilamentAsset* asset = (FilamentAsset*) nativeAsset;
+    for (int i = 0; i < asset->getMaterialVariantCount(); ++i) {
+        const char* name = asset->getMaterialVariantName(i);
+        env->SetObjectArrayElement(result, (jsize) i, env->NewStringUTF(name));
+    }
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_com_google_android_filament_gltfio_FilamentAsset_nApplyMaterialVariant(JNIEnv* env, jclass,
+        jlong nativeAsset, jint variantIndex) {
+    FilamentAsset* asset = (FilamentAsset*) nativeAsset;
+    asset->applyMaterialVariant(variantIndex);
+}
+
 extern "C" JNIEXPORT void JNICALL
 Java_com_google_android_filament_gltfio_FilamentAsset_nReleaseSourceData(JNIEnv* env, jclass,
         jlong nativeAsset) {

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

@@ -20,8 +20,7 @@
 
 #include <algorithm>
 
-using namespace filament;
-using namespace filament::gltfio;
+using namespace gltfio;
 using namespace utils;
 
 extern "C" JNIEXPORT jint JNICALL
@@ -62,95 +61,3 @@ Java_com_google_android_filament_gltfio_FilamentInstance_nApplyMaterialVariant(J
     FilamentInstance* instance = (FilamentInstance*) nativeInstance;
     instance->applyMaterialVariant(variantIndex);
 }
-
-extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_gltfio_FilamentInstance_nGetMaterialVariantCount(JNIEnv*, jclass,
-        jlong nativeInstance) {
-    FilamentInstance* instance = (FilamentInstance*) nativeInstance;
-    return (jint) instance->getMaterialVariantCount();
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_FilamentInstance_nGetMaterialVariantNames(JNIEnv* env, jclass,
-        jlong nativeInstance, jobjectArray result) {
-    FilamentInstance* instance = (FilamentInstance*) nativeInstance;
-    for (int i = 0; i < instance->getMaterialVariantCount(); ++i) {
-        const char* name = instance->getMaterialVariantName(i);
-        env->SetObjectArrayElement(result, (jsize) i, env->NewStringUTF(name));
-    }
-}
-
-extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_gltfio_FilamentInstance_nGetMaterialInstanceCount(JNIEnv*, jclass,
-        jlong nativeInstance) {
-    FilamentInstance* instance = (FilamentInstance*) nativeInstance;
-    return instance->getMaterialInstanceCount();
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_FilamentInstance_nGetMaterialInstances(JNIEnv* env, jclass,
-        jlong nativeInstance, jlongArray result) {
-    FilamentInstance* instance = (FilamentInstance*) nativeInstance;
-    jsize available = env->GetArrayLength(result);
-    jsize count = std::min(available, (jsize) instance->getMaterialInstanceCount());
-    jlong* dst = env->GetLongArrayElements(result, nullptr);
-    const MaterialInstance * const* src = instance->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_FilamentInstance_nAttachSkin(JNIEnv* env, jclass,
-        jlong nativeInstance, jint skinIndex, jint targetEntity) {
-    FilamentInstance* instance = (FilamentInstance*) nativeInstance;
-    Entity target = Entity::import(targetEntity);
-    instance->attachSkin(skinIndex, target);
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_FilamentInstance_nDetachSkin(JNIEnv* env, jclass,
-        jlong nativeInstance, jint skinIndex, jint targetEntity) {
-    FilamentInstance* instance = (FilamentInstance*) nativeInstance;
-    Entity target = Entity::import(targetEntity);
-    instance->detachSkin(skinIndex, target);
-}
-
-extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_gltfio_FilamentInstance_nGetSkinCount(JNIEnv* , jclass,
-        jlong nativeInstance) {
-    FilamentInstance* instance = (FilamentInstance*) nativeInstance;
-    return (jint) instance->getSkinCount();
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_FilamentInstance_nGetSkinNames(JNIEnv* env, jclass,
-        jlong nativeInstance, jobjectArray result) {
-    FilamentInstance* instance = (FilamentInstance*) nativeInstance;
-    jsize available = env->GetArrayLength(result);
-    for (int i = 0; i < available; ++i) {
-        const char* name = instance->getSkinNameAt(i);
-        if (name) {
-            env->SetObjectArrayElement(result, (jsize) i, env->NewStringUTF(name));
-        }
-    }
-}
-
-extern "C" JNIEXPORT jint JNICALL
-Java_com_google_android_filament_gltfio_FilamentInstance_nGetJointCountAt(JNIEnv* , jclass,
-        jlong nativeInstance, jint skinIndex) {
-    FilamentInstance* instance = (FilamentInstance*) nativeInstance;
-    return (jint) instance->getJointCountAt(skinIndex);
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_FilamentInstance_nGetJointsAt(JNIEnv* env, jclass,
-        jlong nativeInstance, jint skinIndex, jintArray result) {
-    FilamentInstance* instance = (FilamentInstance*) nativeInstance;
-    jsize available = env->GetArrayLength(result);
-    Entity* entities = (Entity*) env->GetIntArrayElements(result, nullptr);
-    std::copy_n(instance->getJointsAt(skinIndex),
-        std::min(available, (jsize) instance->getJointCountAt(skinIndex)), entities);
-    env->ReleaseIntArrayElements(result, (jint*) entities, 0);
-}

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

@@ -20,7 +20,7 @@
 
 #include "MaterialKey.h"
 
-using namespace filament::gltfio;
+using namespace gltfio;
 
 MaterialKeyHelper& MaterialKeyHelper::get() {
     static MaterialKeyHelper helper;

android/gltfio-android/src/main/cpp/MaterialKey.h

@@ -22,12 +22,10 @@
 
 class MaterialKeyHelper {
 public:
-    using MaterialKey = filament::gltfio::MaterialKey;
-
     static MaterialKeyHelper& get();
 
-    void copy(JNIEnv* env, MaterialKey& dst, jobject src);
-    void copy(JNIEnv* env, jobject dst, const MaterialKey& src);
+    void copy(JNIEnv* env, gltfio::MaterialKey& dst, jobject src);
+    void copy(JNIEnv* env, jobject dst, const gltfio::MaterialKey& src);
 
     void init(JNIEnv* env); // called only from the Java static class constructor
 

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

@@ -19,14 +19,13 @@
 #include <filament/Engine.h>
 
 #include <gltfio/ResourceLoader.h>
-#include <gltfio/TextureProvider.h>
 
 #include <utils/Log.h>
 
 #include "common/NioUtils.h"
 
 using namespace filament;
-using namespace filament::gltfio;
+using namespace gltfio;
 using namespace utils;
 
 static void destroy(void*, size_t, void *userData) {
@@ -36,9 +35,11 @@ static void destroy(void*, size_t, void *userData) {
 
 extern "C" JNIEXPORT jlong JNICALL
 Java_com_google_android_filament_gltfio_ResourceLoader_nCreateResourceLoader(JNIEnv*, jclass,
-        jlong nativeEngine, jboolean normalizeSkinningWeights) {
+        jlong nativeEngine, jboolean normalizeSkinningWeights, jboolean recomputeBoundingBoxes,
+        jboolean ignoreBindTransform) {
     Engine* engine = (Engine*) nativeEngine;
-    return (jlong) new ResourceLoader({ engine, {}, (bool) normalizeSkinningWeights});
+    return (jlong) new ResourceLoader({ engine, {}, (bool) normalizeSkinningWeights,
+            (bool) recomputeBoundingBoxes, (bool) ignoreBindTransform});
 }
 
 extern "C" JNIEXPORT void JNICALL
@@ -113,34 +114,3 @@ Java_com_google_android_filament_gltfio_ResourceLoader_nAsyncCancelLoad(JNIEnv*,
     ResourceLoader* loader = (ResourceLoader*) nativeLoader;
     loader->asyncCancelLoad();
 }
-
-extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_gltfio_ResourceLoader_nCreateStbProvider(JNIEnv*, jclass,
-        jlong nativeEngine) {
-    Engine* engine = (Engine*) nativeEngine;
-    return (jlong) createStbProvider(engine);
-}
-
-extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_gltfio_ResourceLoader_nCreateKtx2Provider(JNIEnv*, jclass,
-        jlong nativeEngine) {
-    Engine* engine = (Engine*) nativeEngine;
-    return (jlong) createKtx2Provider(engine);
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_ResourceLoader_nDestroyTextureProvider(JNIEnv*, jclass,
-        jlong nativeProvider) {
-    TextureProvider* provider = (TextureProvider*) nativeProvider;
-    delete provider;
-}
-
-extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_ResourceLoader_nAddTextureProvider(JNIEnv* env, jclass,
-        jlong nativeLoader, jstring url, jlong nativeProvider) {
-    ResourceLoader* loader = (ResourceLoader*) nativeLoader;
-    TextureProvider* provider = (TextureProvider*) nativeProvider;
-    const char* cstring = env->GetStringUTFChars(url, nullptr);
-    loader->addTextureProvider(cstring, provider);
-    env->ReleaseStringUTFChars(url, cstring);
-}

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

@@ -17,78 +17,37 @@
 #include <jni.h>
 
 #include <gltfio/MaterialProvider.h>
-#include <gltfio/materials/uberarchive.h>
 
 #include <utils/debug.h>
 
 #include "MaterialKey.h"
 
 using namespace filament;
-using namespace filament::gltfio;
+using namespace gltfio;
 
 extern "C" JNIEXPORT jlong JNICALL
-Java_com_google_android_filament_gltfio_UbershaderProvider_nCreateUbershaderProvider(JNIEnv*, jclass,
+Java_com_google_android_filament_gltfio_UbershaderLoader_nCreateUbershaderLoader(JNIEnv*, jclass,
         jlong nativeEngine) {
     Engine* engine = (Engine*) nativeEngine;
-    return (jlong) createUbershaderProvider(engine, UBERARCHIVE_DEFAULT_DATA, UBERARCHIVE_DEFAULT_SIZE);
+    return (jlong) createUbershaderLoader(engine);
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_UbershaderProvider_nDestroyUbershaderProvider(JNIEnv*, jclass,
+Java_com_google_android_filament_gltfio_UbershaderLoader_nDestroyUbershaderLoader(JNIEnv*, jclass,
         jlong nativeProvider) {
     auto provider = (MaterialProvider*) nativeProvider;
     delete provider;
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_UbershaderProvider_nDestroyMaterials(JNIEnv*, jclass,
+Java_com_google_android_filament_gltfio_UbershaderLoader_nDestroyMaterials(JNIEnv*, jclass,
         jlong nativeProvider) {
     auto provider = (MaterialProvider*) nativeProvider;
     provider->destroyMaterials();
 }
 
 extern "C" JNIEXPORT long JNICALL
-Java_com_google_android_filament_gltfio_UbershaderProvider_nCreateMaterialInstance(JNIEnv* env, jclass,
-        jlong nativeProvider, jobject materialKey, jintArray uvmap, jstring label, jstring extras) {
-    MaterialKey nativeKey = {};
-
-    auto& helper = MaterialKeyHelper::get();
-    helper.copy(env, nativeKey, materialKey);
-
-    const char* nativeLabel = label ? env->GetStringUTFChars(label, nullptr) : nullptr;
-    const char* nativeExtras = extras ? env->GetStringUTFChars(extras, nullptr) : nullptr;
-
-    UvMap nativeUvMap = {};
-    auto provider = (MaterialProvider*) nativeProvider;
-    MaterialInstance* instance = provider->createMaterialInstance(&nativeKey, &nativeUvMap,
-            nativeLabel, nativeExtras);
-
-    // Copy the UvMap results from the native array into the JVM array.
-    jint* elements = env->GetIntArrayElements(uvmap, nullptr);
-    if (elements) {
-        const size_t javaSize = env->GetArrayLength(uvmap);
-        for (int i = 0, n = std::min(javaSize, nativeUvMap.size()); i < n; ++i) {
-            elements[i] = nativeUvMap[i];
-        }
-        env->ReleaseIntArrayElements(uvmap, elements, 0);
-    }
-
-    // The config parameter is an in-out parameter so we need to copy the results back to Java.
-    helper.copy(env, materialKey, nativeKey);
-
-    if (label) {
-        env->ReleaseStringUTFChars(label, nativeLabel);
-    }
-
-    if (extras) {
-        env->ReleaseStringUTFChars(extras, nativeExtras);
-    }
-
-    return (long) instance;
-}
-
-extern "C" JNIEXPORT long JNICALL
-Java_com_google_android_filament_gltfio_UbershaderProvider_nGetMaterial(JNIEnv* env, jclass,
+Java_com_google_android_filament_gltfio_UbershaderLoader_nCreateMaterialInstance(JNIEnv* env, jclass,
         jlong nativeProvider, jobject materialKey, jintArray uvmap, jstring label) {
     MaterialKey nativeKey = {};
 
@@ -96,10 +55,9 @@ Java_com_google_android_filament_gltfio_UbershaderProvider_nGetMaterial(JNIEnv*
     helper.copy(env, nativeKey, materialKey);
 
     const char* nativeLabel = label ? env->GetStringUTFChars(label, nullptr) : nullptr;
-
     UvMap nativeUvMap = {};
     auto provider = (MaterialProvider*) nativeProvider;
-    Material* material = provider->getMaterial(&nativeKey, &nativeUvMap, nativeLabel);
+    MaterialInstance* instance = provider->createMaterialInstance(&nativeKey, &nativeUvMap, nativeLabel);
 
     // Copy the UvMap results from the native array into the JVM array.
     jint* elements = env->GetIntArrayElements(uvmap, nullptr);
@@ -118,18 +76,18 @@ Java_com_google_android_filament_gltfio_UbershaderProvider_nGetMaterial(JNIEnv*
         env->ReleaseStringUTFChars(label, nativeLabel);
     }
 
-    return (long) material;
+    return (long) instance;
 }
 
 extern "C" JNIEXPORT int JNICALL
-Java_com_google_android_filament_gltfio_UbershaderProvider_nGetMaterialCount(JNIEnv*, jclass,
+Java_com_google_android_filament_gltfio_UbershaderLoader_nGetMaterialCount(JNIEnv*, jclass,
         jlong nativeProvider) {
     auto provider = (MaterialProvider*) nativeProvider;
     return provider->getMaterialsCount();
 }
 
 extern "C" JNIEXPORT void JNICALL
-Java_com_google_android_filament_gltfio_UbershaderProvider_nGetMaterials(JNIEnv* env, jclass,
+Java_com_google_android_filament_gltfio_UbershaderLoader_nGetMaterials(JNIEnv* env, jclass,
         jlong nativeProvider, jlongArray result) {
     auto provider = (MaterialProvider *) nativeProvider;
     auto materials = provider->getMaterials();

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

@@ -66,36 +66,6 @@ public class Animator {
         nUpdateBoneMatrices(getNativeObject());
     }
 
-    /**
-     * Applies a blended transform to the union of nodes affected by two animations.
-     * Used for cross-fading from a previous skinning-based animation or rigid body animation.
-     *
-     * First, this stashes the current transform hierarchy into a transient memory buffer.
-     *
-     * Next, this applies previousAnimIndex / previousAnimTime to the actual asset by internally
-     * calling applyAnimation().
-     *
-     * Finally, the stashed local transforms are lerped (via the scale / translation / rotation
-     * components) with their live counterparts, and the results are pushed to the asset.
-     *
-     * To achieve a cross fade effect with skinned models, clients will typically call animator
-     * methods in this order: (1) applyAnimation (2) applyCrossFade (3) updateBoneMatrices. The
-     * animation that clients pass to applyAnimation is the "current" animation corresponding to
-     * alpha=1, while the "previous" animation passed to applyCrossFade corresponds to alpha=0.
-     */
-    public void applyCrossFade(int previousAnimIndex, float previousAnimTime, float alpha) {
-        nApplyCrossFade(getNativeObject(), previousAnimIndex, previousAnimTime, alpha);
-    }
-
-    /**
-     * Pass the identity matrix into all bone nodes, useful for returning to the T pose.
-     *
-     * <p>NOTE: this operation is independent of <code>animation</code>.</p>
-     */
-    public void resetBoneMatrices() {
-        nResetBoneMatrices(getNativeObject());
-    }
-
     /**
      * Returns the number of <code>animation</code> definitions in the glTF asset.
      */
@@ -139,8 +109,6 @@ public class Animator {
 
     private static native void nApplyAnimation(long nativeAnimator, int index, float time);
     private static native void nUpdateBoneMatrices(long nativeAnimator);
-    private static native void nApplyCrossFade(long nativeAnimator, int animIndex, float animTime, float alpha);
-    private static native void nResetBoneMatrices(long nativeAnimator);
     private static native int nGetAnimationCount(long nativeAnimator);
     private static native float nGetAnimationDuration(long nativeAnimator, int index);
     private static native String nGetAnimationName(long nativeAnimator, int index);

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

@@ -26,8 +26,8 @@ import java.nio.Buffer;
 
 /**
  * Consumes a blob of glTF 2.0 content (either JSON or GLB) and produces a {@link FilamentAsset}
- * object, which is a bundle of Filament textures, vertex buffers, index buffers, etc. An asset is
- * composed of 1 or more FilamentInstance objects which contain entities and components.
+ * object, which is a bundle of Filament entities, material instances, textures, vertex buffers,
+ * and index buffers.
  *
  * <p>AssetLoader does not fetch external buffer data or create textures on its own. Clients can use
  * the provided {@link ResourceLoader} class for this, which obtains the URI list from the asset.
@@ -45,13 +45,13 @@ import java.nio.Buffer;
  *
  *     ...
  *
- *     materialProvider = UbershaderProvider(engine)
+ *     materialProvider = UbershaderLoader(engine)
  *     assetLoader = AssetLoader(engine, materialProvider, EntityManager.get())
  *
  *     filamentAsset = assets.open("models/lucy.gltf").use { input -&gt;
  *         val bytes = ByteArray(input.available())
  *         input.read(bytes)
- *         assetLoader.createAsset(ByteBuffer.wrap(bytes))!!
+ *         assetLoader.createAssetFromJson(ByteBuffer.wrap(bytes))!!
  *     }
  *
  *     val resourceLoader = ResourceLoader(engine)
@@ -115,11 +115,20 @@ public class AssetLoader {
     }
 
     /**
-     * Creates a {@link FilamentAsset} from the contents of a GLB or GLTF file.
+     * Creates a {@link FilamentAsset} from the contents of a GLB file.
      */
     @Nullable
-    public FilamentAsset createAsset(@NonNull Buffer buffer) {
-        long nativeAsset = nCreateAsset(mNativeObject, buffer, buffer.remaining());
+    public FilamentAsset createAssetFromBinary(@NonNull Buffer buffer) {
+        long nativeAsset = nCreateAssetFromBinary(mNativeObject, buffer, buffer.remaining());
+        return nativeAsset != 0 ? new FilamentAsset(mEngine, nativeAsset) : null;
+    }
+
+    /**
+     * Creates a {@link FilamentAsset} from the contents of a GLTF file.
+     */
+    @Nullable
+    public FilamentAsset createAssetFromJson(@NonNull Buffer buffer) {
+        long nativeAsset = nCreateAssetFromJson(mNativeObject, buffer, buffer.remaining());
         return nativeAsset != 0 ? new FilamentAsset(mEngine, nativeAsset) : null;
     }
 
@@ -149,7 +158,7 @@ public class AssetLoader {
     }
 
     /**
-     * Adds a new instance to the asset.
+     * Adds a new instance to an instanced asset.
      *
      * Use this with caution. It is more efficient to pre-allocate a max number of instances, and
      * gradually add them to the scene as needed. Instances can also be "recycled" by removing and
@@ -160,6 +169,8 @@ public class AssetLoader {
      * create/destroy churn, as noted above.
      *
      * This cannot be called after FilamentAsset#releaseSourceData().
+     * This cannot be called on a non-instanced asset.
+     * Animation is not supported in new instances.
      * See also AssetLoader#createInstancedAsset().
      */
     @Nullable
@@ -191,7 +202,8 @@ public class AssetLoader {
     private static native long nCreateAssetLoader(long nativeEngine, Object provider,
             long nativeEntities);
     private static native void nDestroyAssetLoader(long nativeLoader);
-    private static native long nCreateAsset(long nativeLoader, Buffer buffer, int remaining);
+    private static native long nCreateAssetFromBinary(long nativeLoader, Buffer buffer, int remaining);
+    private static native long nCreateAssetFromJson(long nativeLoader, Buffer buffer, int remaining);
     private static native long nCreateInstancedAsset(long nativeLoader, Buffer buffer, int remaining,
             long[] nativeInstances);
     private static native long nCreateInstance(long nativeLoader, long nativeAsset);

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

@@ -23,43 +23,37 @@ import androidx.annotation.Nullable;
 import com.google.android.filament.Box;
 import com.google.android.filament.Engine;
 import com.google.android.filament.Entity;
+import com.google.android.filament.MaterialInstance;
 
 /**
  * Owns a bundle of Filament objects that have been created by <code>AssetLoader</code>.
  *
  * <p>For usage instructions, see the documentation for {@link AssetLoader}.</p>
  *
- * <p>This class owns a hierarchy of entities that have been loaded from a glTF asset. Every entity
- * has a <code>TransformManager</code> component, and some entities also have compnents managed by
- * <code>NameComponentManager</code>, <code>RenderableManager</code>, and others.</p>
+ * <p>This class owns a hierarchy of entities that have been loaded from a glTF asset. Every entity has
+ * a <code>TransformManager</code> component, and some entities also have
+ * <code>NameComponentManager</code> and/or <code>RenderableManager</code> components.</p>
  *
  * <p>In addition to the aforementioned entities, an asset has strong ownership over a list of
- * <code>VertexBuffer</code>, <code>IndexBuffer</code>, and <code>Texture</code>.</p>
+ * <code>VertexBuffer</code>, <code>IndexBuffer</code>, <code>MaterialInstance</code>, and
+ * <code>Texture</code>.</p>
  *
  * <p>Clients can use {@link ResourceLoader} to create textures, compute tangent quaternions, and
  * upload data into vertex buffers and index buffers.</p>
  *
  * @see ResourceLoader
- * @see FilamentInstance
+ * @see Animator
  * @see AssetLoader
  */
 public class FilamentAsset {
     private long mNativeObject;
-    private FilamentInstance mPrimaryInstance;
+    private Animator mAnimator;
     private Engine mEngine;
 
     FilamentAsset(Engine engine, long nativeObject) {
         mEngine = engine;
         mNativeObject = nativeObject;
-    }
-
-    public FilamentInstance getInstance() {
-        if (mPrimaryInstance != null) {
-            return mPrimaryInstance;
-        }
-        long nativeInstance = nGetInstance(getNativeObject());
-        mPrimaryInstance = new FilamentInstance(this, nativeInstance);
-        return mPrimaryInstance;
+        mAnimator = null;
     }
 
     long getNativeObject() {
@@ -119,15 +113,6 @@ public class FilamentAsset {
         return result;
     }
 
-    /**
-     * Gets only the entities that have renderable components.
-     */
-    public @NonNull @Entity int[] getRenderableEntities() {
-        int[] result = new int[nGetRenderableEntityCount(mNativeObject)];
-        nGetRenderableEntities(mNativeObject, result);
-        return result;
-    }
-
     /**
      * Gets only the entities that have camera components.
      *
@@ -175,11 +160,19 @@ public class FilamentAsset {
         return result;
     }
 
+    public @NonNull MaterialInstance[] getMaterialInstances() {
+        final int count = nGetMaterialInstanceCount(mNativeObject);
+        MaterialInstance[] result = new MaterialInstance[count];
+        long[] natives = new long[count];
+        nGetMaterialInstances(mNativeObject, natives);
+        for (int i = 0; i < count; i++) {
+            result[i] = new MaterialInstance(mEngine, natives[i]);
+        }
+        return result;
+    }
+
     /**
      * Gets the bounding box computed from the supplied min / max values in glTF accessors.
-     *
-     * This does not return a bounding box over all FilamentInstance, it's just a straightforward
-     * AAAB that can be determined at load time from the asset data.
      */
     public @NonNull Box getBoundingBox() {
         float[] box = new float[6];
@@ -204,6 +197,25 @@ public class FilamentAsset {
         return nGetExtras(mNativeObject, entity);
     }
 
+    /**
+     * Retrieves the <code>Animator</code> interface for this asset.
+     *
+     * <p>When calling this for the first time, this must be called after
+     * {@link ResourceLoader#loadResources} or {@link ResourceLoader#asyncBeginLoad}. When the asset
+     * is destroyed, its animator becomes invalid.</p>
+     */
+    public @NonNull Animator getAnimator() {
+        if (mAnimator != null) {
+            return mAnimator;
+        }
+        long nativeAnimator = nGetAnimator(getNativeObject());
+        if (nativeAnimator == 0) {
+            throw new IllegalStateException("Unable to create animator");
+        }
+        mAnimator = new Animator(nativeAnimator);
+        return mAnimator;
+    }
+
     /**
      * Gets the names of all morph targets in the given entity.
      */
@@ -222,6 +234,31 @@ public class FilamentAsset {
         return uris;
     }
 
+    /**
+     * Returns the names of all material variants.
+     */
+    public @NonNull String[] getMaterialVariantNames() {
+        String[] names = new String[nGetMaterialVariantCount(mNativeObject)];
+        nGetMaterialVariantNames(mNativeObject, names);
+        return names;
+    }
+
+    /**
+     * Applies the given material variant to all primitives that it affects.
+     *
+     * This is efficient because it merely swaps around persistent MaterialInstances. If you change
+     * a material parameter while a certain variant is active, the updated value will be remembered
+     * after you re-apply that variant.
+     *
+     * If the asset is instanced, this affects all instances in the same way.
+     * To set the variant on an individual instance, use FilamentInstance#applyMaterialVariant.
+     *
+     * Ignored if variantIndex is out of bounds.
+     */
+    public void applyMaterialVariant(@IntRange(from = 0) int variantIndex) {
+        nApplyMaterialVariant(getNativeObject(), variantIndex);
+    }
+
     /**
      * Reclaims CPU-side memory for URI strings, binding lists, and raw animation data.
      *
@@ -233,10 +270,8 @@ public class FilamentAsset {
         nReleaseSourceData(mNativeObject);
     }
 
-    public Engine getEngine() { return mEngine; }
-
     void clearNativeObject() {
-        mPrimaryInstance = null;
+        if (mAnimator != null) mAnimator.clearNativeObject();
         mNativeObject = 0;
     }
 
@@ -254,23 +289,24 @@ public class FilamentAsset {
     private static native int nGetLightEntityCount(long nativeAsset);
     private static native void nGetLightEntities(long nativeAsset, int[] result);
 
-    private static native int nGetRenderableEntityCount(long nativeAsset);
-    private static native void nGetRenderableEntities(long nativeAsset, int[] result);
-
     private static native int nGetCameraEntityCount(long nativeAsset);
     private static native void nGetCameraEntities(long nativeAsset, int[] result);
 
+    private static native int nGetMaterialInstanceCount(long nativeAsset);
+    private static native void nGetMaterialInstances(long nativeAsset, long[] nativeResults);
+
+    private static native int nGetMaterialVariantCount(long nativeAsset);
+    private static native void nGetMaterialVariantNames(long nativeAsset, String[] result);
+
     private static native int nGetMorphTargetCount(long nativeAsset, int entity);
     private static native void nGetMorphTargetNames(long nativeAsset, int entity, String[] result);
 
     private static native void nGetBoundingBox(long nativeAsset, float[] box);
     private static native String nGetName(long nativeAsset, int entity);
     private static native String nGetExtras(long nativeAsset, int entity);
-
-    private static native long nGetInstance(long nativeAsset);
-
+    private static native long nGetAnimator(long nativeAsset);
+    private static native void nApplyMaterialVariant(long nativeAsset, int variantIndex);
     private static native int nGetResourceUriCount(long nativeAsset);
     private static native void nGetResourceUris(long nativeAsset, String[] result);
-
     private static native void nReleaseSourceData(long nativeAsset);
 }

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

@@ -19,9 +19,7 @@ package com.google.android.filament.gltfio;
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 
-import com.google.android.filament.Engine;
 import com.google.android.filament.Entity;
-import com.google.android.filament.MaterialInstance;
 
 /**
  * Provides access to a hierarchy of entities that have been instanced from a glTF asset.
@@ -87,58 +85,6 @@ public class FilamentInstance {
         return mAnimator;
     }
 
-    /**
-     * Gets the skin count of this instance.
-     */
-    public int getSkinCount() {
-        return nGetSkinCount(getNativeObject());
-    }
-
-    /**
-     * Gets the skin name at skin index in this instance.
-     */
-    public @NonNull String[] getSkinNames() {
-        String[] result = new String[getSkinCount()];
-        nGetSkinNames(getNativeObject(), result);
-        return result;
-    }
-
-    /**
-     * Attaches the given skin to the given node, which must have an associated mesh with
-     * BONE_INDICES and BONE_WEIGHTS attributes.
-     *
-     * This is a no-op if the given skin index or target is invalid.
-     */
-    public void attachSkin(@IntRange(from = 0) int skinIndex, @Entity int target) {
-        nAttachSkin(getNativeObject(), skinIndex, target);
-    }
-
-    /**
-     * Attaches the given skin to the given node, which must have an associated mesh with
-     * BONE_INDICES and BONE_WEIGHTS attributes.
-     *
-     * This is a no-op if the given skin index or target is invalid.
-     */
-    public void detachSkin(@IntRange(from = 0) int skinIndex, @Entity int target) {
-        nDetachSkin(getNativeObject(), skinIndex, target);
-    }
-
-    /**
-     * Gets the joint count at skin index in this instance.
-     */
-    public int getJointCountAt(@IntRange(from = 0) int skinIndex) {
-        return nGetJointCountAt(getNativeObject(), skinIndex);
-    }
-
-    /**
-     * Gets joints at skin index in this instance.
-     */
-    public @NonNull @Entity int[] getJointsAt(@IntRange(from = 0) int skinIndex) {
-        int[] result = new int[getJointCountAt(skinIndex)];
-        nGetJointsAt(getNativeObject(), skinIndex, result);
-        return result;
-    }
-
     /**
      * Applies the given material variant to all primitives in this instance.
      *
@@ -148,43 +94,9 @@ public class FilamentInstance {
         nApplyMaterialVariant(mNativeObject, variantIndex);
     }
 
-    public @NonNull MaterialInstance[] getMaterialInstances() {
-        final int count = nGetMaterialInstanceCount(mNativeObject);
-        MaterialInstance[] result = new MaterialInstance[count];
-        long[] natives = new long[count];
-        nGetMaterialInstances(mNativeObject, natives);
-        Engine engine = mAsset.getEngine();
-        for (int i = 0; i < count; i++) {
-            result[i] = new MaterialInstance(engine, natives[i]);
-        }
-        return result;
-    }
-
-    /**
-     * Returns the names of all material variants.
-     */
-    public @NonNull String[] getMaterialVariantNames() {
-        String[] names = new String[nGetMaterialVariantCount(mNativeObject)];
-        nGetMaterialVariantNames(mNativeObject, names);
-        return names;
-    }
-
-    private static native int nGetRoot(long nativeInstance);
-    private static native int nGetEntityCount(long nativeInstance);
-    private static native void nGetEntities(long nativeInstance, int[] result);
-    private static native long nGetAnimator(long nativeInstance);
-
-    private static native int nGetMaterialInstanceCount(long nativeAsset);
-    private static native void nGetMaterialInstances(long nativeAsset, long[] nativeResults);
-
-    private static native void nApplyMaterialVariant(long nativeInstance, int variantIndex);
-    private static native int nGetMaterialVariantCount(long nativeAsset);
-    private static native void nGetMaterialVariantNames(long nativeAsset, String[] result);
-
-    private static native void nGetJointsAt(long nativeInstance, int skinIndex, int[] result);
-    private static native int nGetSkinCount(long nativeInstance);
-    private static native void nGetSkinNames(long nativeInstance, String[] result);
-    private static native int nGetJointCountAt(long nativeInstance, int skinIndex);
-    private static native void nAttachSkin(long nativeInstance, int skinIndex, int entity);
-    private static native void nDetachSkin(long nativeInstance, int skinIndex, int entity);
+    private static native int nGetRoot(long nativeAsset);
+    private static native int nGetEntityCount(long nativeAsset);
+    private static native void nGetEntities(long nativeAsset, int[] result);
+    private static native long nGetAnimator(long nativeAsset);
+    private static native void nApplyMaterialVariant(long nativeAsset, int variantIndex);
 }

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

@@ -24,16 +24,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.Size;
 
-import com.google.android.filament.proguard.UsedByNative;
-
-@UsedByNative("AssetLoader.cpp")
 public interface MaterialProvider {
 
     /**
      * MaterialKey specifies the requirements for a requested glTF material.
      * The provider creates Filament materials that fulfill these requirements.
      */
-    @UsedByNative("MaterialKey.cpp")
     public static class MaterialKey {
         public boolean doubleSided;
         public boolean unlit;
@@ -108,12 +104,6 @@ public interface MaterialProvider {
     public @Nullable MaterialInstance createMaterialInstance(MaterialKey config,
             @NonNull @Size(min = 8) int[] uvmap, @Nullable String label, @Nullable String extras);
 
-    /**
-     * Creates or fetches a compiled Filament material corresponding to the given config.
-     */
-    public @Nullable Material getMaterial(MaterialKey config, @NonNull @Size(min = 8) int[] uvmap,
-            @Nullable String label);
-
     /**
      * Creates and returns an array containing all cached materials.
      */

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

@@ -35,8 +35,6 @@ import java.nio.Buffer;
  */
 public class ResourceLoader {
     private final long mNativeObject;
-    private final long mNativeStbProvider;
-    private final long mNativeKtx2Provider;
 
     /**
      * Constructs a resource loader tied to the given Filament engine.
@@ -47,12 +45,7 @@ public class ResourceLoader {
      */
     public ResourceLoader(@NonNull Engine engine) {
         long nativeEngine = engine.getNativeObject();
-        mNativeObject = nCreateResourceLoader(nativeEngine, false);
-        mNativeStbProvider = nCreateStbProvider(nativeEngine);
-        mNativeKtx2Provider = nCreateKtx2Provider(nativeEngine);
-        nAddTextureProvider(mNativeObject, "image/jpeg", mNativeStbProvider);
-        nAddTextureProvider(mNativeObject, "image/png", mNativeStbProvider);
-        nAddTextureProvider(mNativeObject, "image/ktx2", mNativeKtx2Provider);
+        mNativeObject = nCreateResourceLoader(nativeEngine, false, false, false);
     }
 
     /**
@@ -60,17 +53,16 @@ public class ResourceLoader {
      *
      * @param engine the engine that gets passed to all builder methods
      * @param normalizeSkinningWeights scale non-conformant skinning weights so they sum to 1
+     * @param recomputeBoundingBoxes use computed bounding boxes rather than the ones in the asset
+     * @param ignoreBindTransform ignore skinned primitives bind transform when compute bounding boxes
      * @throws IllegalAccessException
      * @throws InvocationTargetException
      */
-    public ResourceLoader(@NonNull Engine engine, boolean normalizeSkinningWeights) {
+    public ResourceLoader(@NonNull Engine engine, boolean normalizeSkinningWeights,
+            boolean recomputeBoundingBoxes, boolean ignoreBindTransform) {
         long nativeEngine = engine.getNativeObject();
-        mNativeObject = nCreateResourceLoader(nativeEngine, normalizeSkinningWeights);
-        mNativeStbProvider = nCreateStbProvider(nativeEngine);
-        mNativeKtx2Provider = nCreateKtx2Provider(nativeEngine);
-        nAddTextureProvider(mNativeObject, "image/jpeg", mNativeStbProvider);
-        nAddTextureProvider(mNativeObject, "image/png", mNativeStbProvider);
-        nAddTextureProvider(mNativeObject, "image/ktx2", mNativeKtx2Provider);
+        mNativeObject = nCreateResourceLoader(nativeEngine, normalizeSkinningWeights,
+                recomputeBoundingBoxes, ignoreBindTransform);
     }
 
     /**
@@ -78,8 +70,6 @@ public class ResourceLoader {
      */
     public void destroy() {
         nDestroyResourceLoader(mNativeObject);
-        nDestroyTextureProvider(mNativeStbProvider);
-        nDestroyTextureProvider(mNativeKtx2Provider);
     }
 
     /**
@@ -177,7 +167,7 @@ public class ResourceLoader {
     }
 
     private static native long nCreateResourceLoader(long nativeEngine,
-            boolean normalizeSkinningWeights);
+            boolean normalizeSkinningWeights, boolean recomputeBoundingBoxes, boolean ignoreBindTransform);
     private static native void nDestroyResourceLoader(long nativeLoader);
     private static native void nAddResourceData(long nativeLoader, String url, Buffer buffer,
             int remaining);
@@ -188,9 +178,4 @@ public class ResourceLoader {
     private static native float nAsyncGetLoadProgress(long nativeLoader);
     private static native void nAsyncUpdateLoad(long nativeLoader);
     private static native void nAsyncCancelLoad(long nativeLoader);
-
-    private static native long nCreateStbProvider(long nativeEngine);
-    private static native long nCreateKtx2Provider(long nativeEngine);
-    private static native void nAddTextureProvider(long nativeLoader, String url, long nativeProvider);
-    private static native void nDestroyTextureProvider(long nativeProvider);
 }

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

@@ -31,7 +31,7 @@ import androidx.annotation.Size;
  * <p>This class is used by {@link AssetLoader} to create Filament materials.
  * Client applications do not need to call methods on it.</p>
  */
-public class UbershaderProvider implements MaterialProvider {
+public class UbershaderLoader implements MaterialProvider {
     private static final VertexBuffer.VertexAttribute[] sVertexAttributesValues =
             VertexBuffer.VertexAttribute.values();
 
@@ -42,31 +42,25 @@ public class UbershaderProvider implements MaterialProvider {
      *
      * @param engine the engine used to create materials
      */
-    public UbershaderProvider(Engine engine) {
+    public UbershaderLoader(Engine engine) {
         long nativeEngine = engine.getNativeObject();
-        mNativeObject = nCreateUbershaderProvider(nativeEngine);
+        mNativeObject = nCreateUbershaderLoader(nativeEngine);
     }
 
     /**
      * Frees memory associated with the native material provider.
      * */
     public void destroy() {
-        nDestroyUbershaderProvider(mNativeObject);
+        nDestroyUbershaderLoader(mNativeObject);
         mNativeObject = 0;
     }
 
     public @Nullable MaterialInstance createMaterialInstance(MaterialKey config,
             @NonNull @Size(min = 8) int[] uvmap, @Nullable String label, @Nullable String extras) {
-        long nativeMaterialInstance = nCreateMaterialInstance(mNativeObject, config, uvmap, label, extras);
+        long nativeMaterialInstance = nCreateMaterialInstance(mNativeObject, config, uvmap, label);
         return nativeMaterialInstance == 0 ? null : new MaterialInstance(null, nativeMaterialInstance);
     }
 
-    public @Nullable Material getMaterial(MaterialKey config, @NonNull @Size(min = 8) int[] uvmap,
-            @Nullable String label) {
-        long nativeMaterial = nGetMaterial(mNativeObject, config, uvmap, label);
-        return nativeMaterial == 0 ? null : new Material(nativeMaterial);
-    }
-
     public @NonNull Material[] getMaterials() {
         final int count = nGetMaterialCount(mNativeObject);
         Material[] result = new Material[count];
@@ -98,12 +92,10 @@ public class UbershaderProvider implements MaterialProvider {
         return mNativeObject;
     }
 
-    private static native long nCreateUbershaderProvider(long nativeEngine);
-    private static native void nDestroyUbershaderProvider(long nativeProvider);
+    private static native long nCreateUbershaderLoader(long nativeEngine);
+    private static native void nDestroyUbershaderLoader(long nativeProvider);
     private static native void nDestroyMaterials(long nativeProvider);
     private static native long nCreateMaterialInstance(long nativeProvider,
-            MaterialKey config, int[] uvmap, String label, String extras);
-    private static native long nGetMaterial(long nativeProvider,
             MaterialKey config, int[] uvmap, String label);
     private static native int nGetMaterialCount(long nativeProvider);
     private static native void nGetMaterials(long nativeProvider, long[] result);

android/gradle.properties

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

android/gradle/wrapper/gradle-wrapper.properties

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

android/proguard-rules.pro

@@ -14,17 +14,3 @@
 -keepclassmembers class * {
   @com.google.android.filament.proguard.UsedBy* *;
 }
-
-# These classes is loaded via env->FindClass() from Utils.cpp
-# They are in the utils namespace and therefore not covered by previous rules.
--keep class com.google.android.filament.utils.KTX1Loader
--keep class com.google.android.filament.utils.HDRLoader
-
-# These native JNI methods are loaded via env->RegisterNatives() from Utils.cpp
--keepclassmembers class com.google.android.filament.utils.KTX1Loader {
-   native <methods>;
-}
--keepclassmembers class com.google.android.filament.utils.HDRLoader {
-   native <methods>;
-}
-

android/samples/README.md

@@ -112,9 +112,9 @@ the Android SDK.
 
 ## Android Studio
 
-You must use the latest stable release of Android Studio. To open the project, point Studio to the
-`android` folder. After opening the project and syncing to gradle, select the sample of your choice
-using the drop-down widget in the toolbar.
+You must use Android Studio 3.6 RC 1 or higher. To open the project, point Studio to the `android`
+folder. After opening the project and syncing to gradle, select the sample of your choice using the
+drop-down widget in the toolbar.
 
 ## Compiling
 

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

@@ -25,8 +25,6 @@ clean.doFirst {
 }
 
 android {
-    namespace 'com.google.android.filament.gltf'
-
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.gltf"
@@ -34,7 +32,6 @@ android {
         targetSdkVersion versions.targetSdk
         missingDimensionStrategy 'functionality', 'full'
     }
-
     // NOTE: This is a workaround required because the AGP task collectReleaseDependencies
     //       is not configuration-cache friendly yet; this is only useful for Play publication
     dependenciesInfo {

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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.gltf">
 
   <uses-permission android:name="android.permission.INTERNET" />
 

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

@@ -150,12 +150,12 @@ class MainActivity : Activity() {
         val scene = modelViewer.scene
         val ibl = "default_env"
         readCompressedAsset("envs/$ibl/${ibl}_ibl.ktx").let {
-            scene.indirectLight = KTX1Loader.createIndirectLight(engine, it)
+            scene.indirectLight = KTXLoader.createIndirectLight(engine, it)
             scene.indirectLight!!.intensity = 30_000.0f
             viewerContent.indirectLight = modelViewer.scene.indirectLight
         }
         readCompressedAsset("envs/$ibl/${ibl}_skybox.ktx").let {
-            scene.skybox = KTX1Loader.createSkybox(engine, it)
+            scene.skybox = KTXLoader.createSkybox(engine, it)
         }
     }
 
@@ -297,10 +297,9 @@ class MainActivity : Activity() {
 
         val gltfBuffer = pathToBufferMapping[gltfPath]!!
 
-        // In a zip file, the gltf file might be in the same folder as resources, or in a different
-        // folder. It is crucial to test against both of these cases. In any case, the resource
-        // paths are all specified relative to the location of the gltf file.
-        var prefix = URI(gltfPath!!).resolve(".")
+        // The gltf is often not at the root level (e.g. if a folder is zipped) so
+        // we need to extract its path in order to resolve the embedded uri strings.
+        var prefix = URI(gltfPath!!).resolve("..")
 
         withContext(Dispatchers.Main) {
             if (gltfPath!!.endsWith(".glb")) {
@@ -309,7 +308,7 @@ class MainActivity : Activity() {
                 modelViewer.loadModelGltf(gltfBuffer) { uri ->
                     val path = prefix.resolve(uri).toString()
                     if (!pathToBufferMapping.contains(path)) {
-                        Log.e(TAG, "Could not find '$uri' in zip using prefix '$prefix' and base path '${gltfPath!!}'")
+                        Log.e(TAG, "Could not find '$uri' in zip using prefix '$prefix'")
                         setStatusText("Zip is missing $path")
                     }
                     pathToBufferMapping[path]
@@ -353,7 +352,7 @@ class MainActivity : Activity() {
     fun loadSettings(message: RemoteServer.ReceivedMessage) {
         val json = StandardCharsets.UTF_8.decode(message.buffer).toString()
         viewerContent.assetLights = modelViewer.asset?.lightEntities
-        automation.applySettings(modelViewer.engine, json, viewerContent)
+        automation.applySettings(json, viewerContent)
         modelViewer.view.colorGrading = automation.getColorGrading(modelViewer.engine)
         modelViewer.cameraFocalLength = automation.viewerOptions.cameraFocalLength
         updateRootTransform()
@@ -417,7 +416,7 @@ class MainActivity : Activity() {
 
     // Just for testing purposes, this releases the current model and reloads the default model.
     inner class DoubleTapListener : GestureDetector.SimpleOnGestureListener() {
-        override fun onDoubleTap(e: MotionEvent): Boolean {
+        override fun onDoubleTap(e: MotionEvent?): Boolean {
             modelViewer.destroyModel()
             createDefaultRenderables()
             return super.onDoubleTap(e)

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

@@ -16,8 +16,6 @@ clean.doFirst {
 }
 
 android {
-    namespace 'com.google.android.filament.hellocam'
-
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.hellocamera"

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

@@ -16,7 +16,8 @@
   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.hellocam">
 
   <uses-permission android:name="android.permission.CAMERA" />
 

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

@@ -16,8 +16,6 @@ clean.doFirst {
 }
 
 android {
-    namespace 'com.google.android.filament.hellotriangle'
-
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.hellotriangle"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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.hellotriangle">
 
   <application
       android:allowBackup="true"

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

@@ -22,8 +22,6 @@ clean.doFirst {
 }
 
 android {
-    namespace 'com.google.android.filament.ibl'
-
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.ibl"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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.ibl">
 
   <uses-permission android:name="android.permission.INTERNET" />
 

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

@@ -15,8 +15,6 @@ clean.doFirst {
     delete "src/main/assets"
 }
 android {
-    namespace 'com.google.android.filament.litcube'
-
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.litcube"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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.litcube">
 
   <application
       android:allowBackup="true"

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

@@ -4,8 +4,6 @@ apply plugin: 'kotlin-android'
 project.ext.isSample = true
 
 android {
-    namespace 'com.google.android.filament.livewallpaper'
-
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.livewallpaper"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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.livewallpaper">
 
   <uses-feature android:name="android.software.live_wallpaper" />
 

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

@@ -19,8 +19,6 @@ clean.doFirst {
 }
 
 android {
-    namespace 'com.google.android.filament.material_builder'
-
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.material_builder"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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.material_builder">
 
   <application
       android:allowBackup="true"

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

@@ -15,8 +15,6 @@ clean.doFirst {
     delete "src/main/assets"
 }
 android {
-    namespace 'com.google.android.filament.multiview'
-
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.multiview"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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.multiview">
 
   <application
       android:allowBackup="true"

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

@@ -18,8 +18,6 @@ clean.doFirst {
 }
 
 android {
-    namespace 'com.google.android.filament.pagecurl'
-
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.pagecurl"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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.pagecurl">
 
   <application
       android:allowBackup="true"

android/samples/sample-page-curl/src/main/materials/curl.mat

@@ -59,7 +59,7 @@ vertex {
         vec3 p1 = deformPoint(theta, apex, uv.s + e, uv.t);
         vec3 p2 = deformPoint(theta, apex, uv.s, uv.t + e);
         vec3 normal = normalize(cross(p1 - p, p2 - p));
-        material.worldNormal = getWorldFromModelNormalMatrix() * normal;
+        material.worldNormal = objectUniforms.worldFromModelNormalMatrix * normal;
         mat4 transform = getWorldFromModelMatrix();
         material.worldPosition = mulMat4x4Float3(transform, p);
     }

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

@@ -16,8 +16,6 @@ clean.doFirst {
 }
 
 android {
-    namespace 'com.google.android.filament.streamtest'
-
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.streamtest"

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

@@ -16,7 +16,8 @@
   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.streamtest">
 
   <application
       android:allowBackup="true"

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

@@ -79,6 +79,8 @@ class MainActivity : Activity(), ActivityCompat.OnRequestPermissionsResultCallba
     // Performs the rendering and schedules new frames
     private val frameScheduler = FrameCallback()
 
+    private var externalTextureID: Int = 0
+
     @RequiresApi(30)
     class Api30Impl {
         companion object {
@@ -101,6 +103,8 @@ class MainActivity : Activity(), ActivityCompat.OnRequestPermissionsResultCallba
         setupView()
         setupScene()
 
+        externalTextureID = createExternalTexture()
+
         @Suppress("deprecation")
         val display = if (Build.VERSION.SDK_INT >= 30) {
             Api30Impl.getDisplay(this)
@@ -108,7 +112,7 @@ class MainActivity : Activity(), ActivityCompat.OnRequestPermissionsResultCallba
             windowManager.defaultDisplay!!
         }
 
-        streamHelper = StreamHelper(engine, materialInstance, display)
+        streamHelper = StreamHelper(engine, materialInstance, display, externalTextureID)
         this.title = streamHelper.getTestName()
     }
 
@@ -441,4 +445,31 @@ class MainActivity : Activity(), ActivityCompat.OnRequestPermissionsResultCallba
         check(EGL14.eglMakeCurrent(display, surface, surface, context)) { "Error making GL context." }
         return context
     }
+
+    private  fun createExternalTexture(): Int {
+        val textures = IntArray(1)
+        GLES30.glGenTextures(1, textures, 0)
+        val result = textures[0]
+
+        val textureTarget = GLES11Ext.GL_TEXTURE_EXTERNAL_OES
+        GLES30.glBindTexture(textureTarget, result)
+        GLES30.glTexParameteri(textureTarget, GLES30.GL_TEXTURE_WRAP_S, GLES30.GL_CLAMP_TO_EDGE)
+        GLES30.glTexParameteri(textureTarget, GLES30.GL_TEXTURE_WRAP_T, GLES30.GL_CLAMP_TO_EDGE)
+        GLES30.glTexParameteri(textureTarget, GLES30.GL_TEXTURE_MIN_FILTER, GLES30.GL_NEAREST)
+        GLES30.glTexParameteri(textureTarget, GLES30.GL_TEXTURE_MAG_FILTER, GLES30.GL_NEAREST)
+
+        if (!GLES30.glIsTexture(result)) {
+            throw RuntimeException("OpenGL error: $result is an invalid texture.")
+        }
+
+        val error = GLES30.glGetError()
+        if (error != GLES30.GL_NO_ERROR) {
+            val errorString = GLU.gluErrorString(error)
+            throw RuntimeException("OpenGL error: $errorString!")
+        }
+
+        return result
+    }
+
+
 }

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

@@ -37,6 +37,7 @@ class StreamHelper(
     private val filamentEngine: Engine,
     private val filamentMaterial: MaterialInstance,
     private val display: Display,
+    private val externalTextureId: Int
 ) {
     /**
      * The StreamSource configures the source data for the texture.
@@ -50,6 +51,7 @@ class StreamHelper(
      */
     enum class StreamSource {
         CANVAS_STREAM_NATIVE,     // copy-free but does not guarantee synchronization
+        CANVAS_STREAM_TEXID,      // synchronized but incurs a copy
         CANVAS_STREAM_ACQUIRED,   // synchronized and copy-free
     }
 
@@ -125,6 +127,10 @@ class StreamHelper(
 
             surface.unlockCanvasAndPost(canvas)
 
+            if (streamSource == StreamSource.CANVAS_STREAM_TEXID) {
+                surfaceTexture!!.updateTexImage()
+            }
+
             if (streamSource == StreamSource.CANVAS_STREAM_ACQUIRED) {
                 val image = imageReader!!.acquireLatestImage()
                 filamentStream!!.setAcquiredImage(
@@ -140,7 +146,7 @@ class StreamHelper(
 
     fun nextTest() {
         stopTest()
-        streamSource = StreamSource.values()[(streamSource.ordinal + 1) % StreamSource.values().size]
+        streamSource = StreamSource.values()[(streamSource.ordinal + 1) % 3]
         startTest()
     }
 
@@ -207,6 +213,23 @@ class StreamHelper(
             filamentTexture.setExternalStream(filamentEngine, filamentStream!!)
         }
 
+        if (streamSource == StreamSource.CANVAS_STREAM_TEXID) {
+
+            // Create the Android surface that will hold the canvas image.
+            surfaceTexture = SurfaceTexture(externalTextureId)
+            surfaceTexture!!.setDefaultBufferSize(resolution.width, resolution.height)
+            canvasSurface = Surface(surfaceTexture)
+
+            // Create the Filament Stream object that gets bound to the Texture.
+            filamentStream = Stream.Builder()
+                    .stream(externalTextureId.toLong())
+                    .width(resolution.width)
+                    .height(resolution.height)
+                    .build(filamentEngine)
+
+            filamentTexture.setExternalStream(filamentEngine, filamentStream!!)
+        }
+
         if (streamSource == StreamSource.CANVAS_STREAM_ACQUIRED) {
             filamentStream = Stream.Builder()
                     .width(resolution.width)

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

@@ -16,8 +16,6 @@ clean.doFirst {
 }
 
 android {
-    namespace 'com.google.android.filament.textureview'
-
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.textureview"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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.textureview">
 
   <application
       android:allowBackup="true"

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

@@ -22,8 +22,6 @@ clean.doFirst {
 }
 
 android {
-    namespace 'com.google.android.filament.textured'
-
     compileSdkVersion versions.compileSdk
     defaultConfig {
         applicationId "com.google.android.filament.textured"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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.textured">
 
   <application
       android:allowBackup="true"