Merge glTF branch (#747)

* Added helper function for easy pipeline vertex input state create info structure setup from glTF model vertex class

* Split glTF loader into header and implementation

* Updated sample to use glTF

* Removed collada files

Replaced assets are now part of the asset pack

* Return value for glTF model vertex input state create info helper

* Removed unused assets

* Use glTF assets

* Added default material for glTF node's without materials

* Use glTF assets

* Apply pre-transforms to normals

* Use glTF assets

* Use glTF assets

* Use vertex input state from glTF model class

* Scene setup

* Use glTF assets

* Use glTF assets

* Display error message and exit if glTF file could not be loaded

* Use glTF assets

* Use glTF assets

* Use glTF assets

* Remove unused buffer binds

* Use glTF assets

* Remove no longer used model files

* Remove no longer used model files

* Added support for rendering glTF models with images

* glTF model normal pre-transform ignores translation

* Use glTF assets

* Use glTF assets

* Use glTF assets

* Use glTF assets

* Use glTF assets

* Only add combined image samplers to pool if actually used in the scene

* Use global descriptor set layouts

* Use global descriptor set layouts

* Use glTF assets

* Use glTF assets

* Use glTF assets

Code cleanup
Updated GLSL and HLSL shaders

* Use glTF assets

Code cleanup

* Use glTF assets

Code cleanup
Updated GLSL and HLSL shaders

* Remove no-longer used model

* Use glTF assets

Code cleanup
Updated GLSL and HLSL shaders

* Use glTF assets

Code cleanup
Updated GLSL and HLSL shaders
Removed no-longer used model

* Use glTF assets

Code cleanup
Use RGBA texture instead of different compressed formats
Removed no-longer used assets

* Adnrdoid build file

* Use glTF assets

Code cleanup and refactoring
Updated GLSL and HLSL shaders

* Added vertex count and way of passing additional memory property type flags to glTF loader

* Use glTF assets

Updated GLSL and HLSL shaders
Removed no-longer used assets

* Use glTF assets

Updated GLSL and HLSL shaders

* Remove unfinished sample

* Completely reworked push constants sample

Use glTF assets
Updated GLSL and HLSL shaders
Removed no-longer used assets

* Android CMake build files

* Removed un-used asset

* Explicit buffer binding function

* Use glTF assets

Code cleanup
Updated GLSL and HLSL shaders

* Use glTF assets

Code cleanup

* Use glTF assets

Code cleanup
Removed no-longer used assets

* Use glTF assets

Code cleanup
Updated GLSL and HLSL shaders
Removed no-longer used assets

* Remove no-longer used asset

* Use glTF assets

Code cleanup and refactoring
Performance optimizations
Updated GLSL and HLSL shaders
Removed no-longer used assets

* Use glTF assets

Code cleanup and refactoring
Updated GLSL and HLSL shaders
Removed no-longer used assets

* Use glTF assets

Code cleanup and refactoring
Updated GLSL and HLSL shaders
Removed no-longer used assets

* Use glTF assets

Code cleanup and refactoring
Removed no-longer used assets

* Use glTF assets

Code cleanup and refactoring
Removed no-longer used assets

* Use glTF assets

Code cleanup and refactoring

* Use glTF assets

Code cleanup and refactoring

* Use glTF assets

Code cleanup and refactoring
Removed no-longer used assets

* Pass vertex size and calculate multiplier in shaders instead of hard-coding

With this, changes to the glTF vertex structure won't break the ray tracing samples

* Load tangents (if present)

* Use glTF assets

Code cleanup and heavy refactoring
Reworked debug display code

* Android build

* Normal mapping fixes

Udpated HLSL shaders

* Use glTF assets

Code cleanup and heavy refactoring
Reworked debug display code
Updated GLSL and HLSL shaders

* Code cleanup, comments

* Use glTF assets

Code cleanup and heavy refactoring
Reworked debug display code
Updated GLSL and HLSL shaders

* Added sample count to framebuffer create info

* Removed no-longer used assets

* Android build

Removed no-longer used assets

* Code cleanup and heavy refactoring

Updated GLSL and HLSL shaders
Use tangents stored in GLSL instead of calculating them in the fragment shader

* Renamed textured PBR sample main cpp file

* Use glTF assets

Code cleanup and refactoring
Updated GLSL and HLSL shaders
Removed no-longer used assets

* Use glTF assets

Removed no-longer used assets

* Android build files

* Android build files

* Use glTF assets

Removed no-longer used assets

* Fixed HLSL shaders

* Android build files

* Use glTF assets

Updated GLSL and HLSL shaders
Removed no-longer used assets

* Use glTF assets

Updated GLSL and HLSL shaders
Removed no-longer used assets

* Added flag to disable glTF image loading

Useful for samples that use their own textures or don't use textures at all to speed up loading

* Use glTF assets

Code cleanup
Use Sponza scene instead of Sibenik to better highlight the effect
Updated GLSL and HLSL shaders

* Updated Android build files

* Removed left-over comment

* Use Sponza scene for the SSAO sample

* Removed unused code

* Removed ASSIMP

No longer required as all samples now use the glTF file format

* Added missing vertex shader stage

* Removed old ASSIMP-based model loader

* Added support for loading external glTF images from ktx

Android fixes for loading external buffer files

* Scene setup

* Added missing shader stages

* Removed ASSIMP from build files

* Fixed compiler warning

* Removed ASSIMP from readmes

* Android build files cleanup

* Replaced ktx submodule with only the files required for this repo

The ktx submodule was a tad too big and contained lots of files not required for this repo

* Moved ktx build files into base project

* Use glTF assets

* Use glTF assets

* Removed license files, will be moved to asset pack

* Use RGBA textures

* Use RGBA cubemp texture with face assignment based on original images

Refs #679

* Android build files

* Removed textures

All textures will be moved to the asset pack

* Ignore asset folders

* Removed font

Fonts will be moved to the asset pack

* Link to gltf asset pack

* Updated gitignore

* Android build file

.gitignore

@@ -211,7 +211,7 @@ android/layers/*/*.so
 android/**/jni/
 
 # Downloadable assets
-vulkan_asset_pack.*
+vulkan_asset_pack_gltf.*
 data/textures/hdr/*.*
 data/readme.txt
 data/models/cerberus/*.*
@@ -229,8 +229,8 @@ data/models/cerberus/*.*
 .DS_Store
 
 # Assets that are part of the asset pack and should not be stored in the repo
-data/models/**/*.gltf
-data/models/**/*.bin
-data/models/**/*.glb
-data/models/**/*.png
-data/models/**/*.jpg
+data/models/**
+data/textures/**
+data/README_asset_pack.md
+data/font*.*
+data/roboto*.*

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "external/glm"]
 	path = external/glm
 	url = https://github.com/g-truc/glm
-[submodule "external/ktx"]
-	path = external/ktx
-	url = https://github.com/KhronosGroup/KTX-Software

.travis.yml

@@ -25,7 +25,7 @@ compiler:
   - gcc
 before_script:
   - sudo apt-get -qq update
-  - sudo apt-get install -y libassimp-dev libx11-xcb-dev libxrandr-dev
+  - sudo apt-get install -y libx11-xcb-dev libxrandr-dev
 script:
   - cmake .
   - make

BUILD.md

@@ -17,8 +17,6 @@ cmake -G "Visual Studio 14 2015 Win64"
 
 Use the provided CMakeLists.txt with [CMake](https://cmake.org) to generate a build configuration for your favorite IDE or compiler.
 
-Note that you need [assimp](https://github.com/assimp/assimp) in order to compile the examples for Linux. Either compile and install from the repository, or install libassimp-dev. The examples require at least version 3.2.
-
 ##### [Window system integration](https://www.khronos.org/registry/vulkan/specs/1.0-wsi_extensions/html/vkspec.html#wsi)
 - **XCB**: Default WSI (if no cmake option is specified)
 - **Wayland**: Use cmake option ```USE_WAYLAND_WSI``` (```-DUSE_WAYLAND_WSI=ON```)

CMakeLists.txt

@@ -9,9 +9,10 @@ project(${NAME})
 include_directories(external)
 include_directories(external/glm)
 include_directories(external/gli)
-include_directories(external/assimp)
 include_directories(external/imgui)
 include_directories(external/tinygltf)
+include_directories(external/ktx/include)
+include_directories(external/ktx/other_include)
 include_directories(base)
 
 OPTION(USE_D2D_WSI "Build the project using Direct to Display swapchain" OFF)
@@ -33,7 +34,6 @@ IF(WIN32)
 			MESSAGE("Using bundled Vulkan library version")
 		ENDIF()
 	ENDIF()
-	find_library(ASSIMP_LIBRARIES NAMES assimp libassimp.dll.a PATHS ${CMAKE_SOURCE_DIR}/libs/assimp)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_USE_PLATFORM_WIN32_KHR")
 ELSE(WIN32)
 	IF (NOT Vulkan_FOUND)
@@ -43,7 +43,6 @@ ELSE(WIN32)
 			MESSAGE("Using bundled Vulkan library version")
 		ENDIF()
 	ENDIF()
-	find_package(ASSIMP REQUIRED)
 	find_package(Threads REQUIRED)
 IF(USE_D2D_WSI)
 	MESSAGE("Using direct to display extension...")
@@ -121,11 +120,10 @@ ENDIF(MSVC)
 IF(WIN32)
 	# Nothing here (yet)
 ELSE(WIN32)
-	link_libraries(${XCB_LIBRARIES} ${Vulkan_LIBRARY} ${Vulkan_LIBRARY} ${ASSIMP_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+	link_libraries(${XCB_LIBRARIES} ${Vulkan_LIBRARY} ${Vulkan_LIBRARY} ${WAYLAND_CLIENT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 ENDIF(WIN32)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/")
 
 add_subdirectory(base)
-add_subdirectory(examples)
-add_subdirectory(external)
+add_subdirectory(examples)

CREDITS.md

@@ -1,7 +1,6 @@
 ## Credits
 Thanks to the authors of these libraries :
 - [OpenGL Mathematics (GLM)](https://github.com/g-truc/glm)
-- [Open Asset Import Library](https://github.com/assimp/assimp)
 
 Thanks to Ben Clayton from Google LLC for contributing the [HLSL shaders](data/hlsl).
 
@@ -13,7 +12,6 @@ Please note that (some) models and textures use separate licenses. Please comply
 - Armored knight model used in deferred example by [Gabriel Piacenti](http://opengameart.org/users/piacenti)
 - Old deer model used in tessellation example by [Čestmír Dammer](http://opengameart.org/users/cdmir)
 - Hidden treasure scene used in pipeline and debug marker examples by [Laurynas Jurgila](http://www.blendswap.com/user/PigArt)
-- Sibenik Cathedral model by Marko Dabrovic, using updated version by [Kenzie Lamar and Morgan McGuire](http://graphics.cs.williams.edu/data/meshes.xml)
 - Textures used in some examples by [Hugues Muller](http://www.yughues-folio.com)
 - Cerberus gun model used in PBR sample by [Andrew Maximov](http://artisaverb.info/Cerberus.html)
 - Updated compute particle system shader by [Lukas Bergdoll](https://github.com/Voultapher)

android/examples/_template/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/base/CMakeLists.txt

@@ -2,14 +2,11 @@ file(GLOB BASE_SRC "../../../base/*.cpp" "../../../external/imgui/*.cpp")
 
 add_library(libbase SHARED ${BASE_SRC})
 
-add_library(libassimp STATIC IMPORTED)
-set_target_properties(libassimp PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/assimp/${ANDROID_ABI}/libassimp.a)
-
 include_directories(${BASE_DIR})
 include_directories(../../../external/glm)
 include_directories(../../../external/gli)
 include_directories(../../../external/imgui)
-include_directories(../../../external/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 set(KTX_DIR ../../../external/ktx)
@@ -37,6 +34,5 @@ target_link_libraries(
 	android
 	log
 	z
-	libassimp
 	libktx
 )

android/examples/bloom/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/bloom/build.gradle

@@ -57,19 +57,19 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'retroufo.dae'
+       include 'retroufo.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'retroufo_glow.dae'
+       include 'retroufo_glow.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'cube.obj'
+       include 'cube.gltf'
     }
 
     copy {

android/examples/computecloth/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/computecloth/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'geosphere.obj'
+       include 'sphere.gltf'
     }
 
     copy {

android/examples/computecullandlod/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/computecullandlod/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'suzanne_lods.dae'
+       include 'suzanne_lods.gltf'
     }
 
 

android/examples/computeheadless/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/computenbody/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/computeparticles/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/computeraytracing/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/computeshader/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/conservativeraster/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/debugmarker/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/debugmarker/build.gradle

@@ -57,13 +57,13 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'treasure_smooth.dae'
+       include 'treasure_smooth.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'treasure_glow.dae'
+       include 'treasure_glow.gltf'
     }
 
 

android/examples/deferred/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/deferred/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'plane.obj'
+       include 'deferred_floor.gltf'
     }
 
     copy {

android/examples/deferredmultisampling/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/deferredmultisampling/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'openbox.dae'
+       include 'deferred_box.gltf'
     }
 
     copy {

android/examples/deferredshadows/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/deferredshadows/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'openbox.dae'
+       include 'deferred_box.gltf'
     }
 
     copy {

android/examples/descriptorsets/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/descriptorsets/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'cube.dae'
+       include 'cube.gltf'
     }
 
     copy {

android/examples/displacement/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/displacement/build.gradle

@@ -57,13 +57,13 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'plane.obj'
+       include 'displacement_plane.obj'
     }
 
     copy {
        from '../../../data/textures'
        into 'assets/textures'
-       include 'stonefloor03_color*.ktx'
+       include 'stonefloor03_color_height_rgba.ktx'
     }
 
 

android/examples/distancefieldfonts/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/dynamicuniformbuffer/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/gears/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/geometryshader/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/geometryshader/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'suzanne.obj'
+       include 'suzanne.gltf'
     }
 
 

android/examples/gltfloading/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 

android/examples/gltfscenerendering/CMakeLists.txt

@@ -21,7 +21,6 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
 include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)

android/examples/gltfskinning/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 

android/examples/hdr/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/hdr/build.gradle

@@ -57,31 +57,31 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'cube.obj'
+       include 'cube.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'geosphere.obj'
+       include 'sphere.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'teapot.dae'
+       include 'teapot.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'torusknot.obj'
+       include 'torusknot.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'venus.fbx'
+       include 'venus.gltf'
     }
 
     copy {

android/examples/imgui/CMakeLists.txt

@@ -22,9 +22,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/imgui/build.gradle

@@ -57,19 +57,19 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'vulkanscenemodels.dae'
+       include 'vulkanscenemodels.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'vulkanscenebackground.dae'
+       include 'vulkanscenebackground.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'vulkanscenelogos.dae'
+       include 'vulkanscenelogos.gltf'
     }
 
 

android/examples/indirectdraw/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/indirectdraw/build.gradle

@@ -57,31 +57,31 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'plants.dae'
+       include 'plants.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'plane_circle.dae'
+       include 'plane_circle.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'skysphere.dae'
+       include 'sphere.gltf'
     }
 
     copy {
        from '../../../data/textures'
        into 'assets/textures'
-       include 'texturearray_plants*.ktx'
+       include 'texturearray_plants_rgba.ktx'
     }
 
     copy {
        from '../../../data/textures'
        into 'assets/textures'
-       include 'ground_dry*.ktx'
+       include 'ground_dry_rgba.ktx'
     }
 
 

android/examples/inlineuniformblocks/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/inlineuniformblocks/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'geosphere.obj'
+       include 'sphere.gltf'
     }
 
 }

android/examples/inputattachments/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/inputattachments/build.gradle

@@ -62,7 +62,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'treasure_smooth.dae'
+       include 'treasure_smooth.gltf'
     }
 
 }

android/examples/instancing/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/instancing/build.gradle

@@ -57,19 +57,13 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'rock01.dae'
+       include 'rock01.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'sphere.obj'
-    }
-
-    copy {
-       from '../../../data/models'
-       into 'assets/models'
-       include 'cube.obj'
+       include 'lavaplanet.gltf'
     }
 
     copy {

android/examples/multisampling/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/multisampling/build.gradle

@@ -50,14 +50,14 @@ task copyTask {
 
     copy {
        from '../../../data/shaders/glsl/multisampling'
-       into 'assets/shaders/glsl/mesh'
+       into 'assets/shaders/glsl/multisampling'
        include '*.*'
     }
 
     copy {
-       from '../../../data/models/voyager'
-       into 'assets/models/voyager'
-       include '*.*'
+       from '../../../data/models'
+       into 'assets/models'
+       include 'voyager.gltf'
     }
 
 

android/examples/multithreading/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/multithreading/build.gradle

@@ -57,13 +57,13 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'retroufo_red_lowpoly.dae'
+       include 'retroufo_red_lowpoly.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'sphere.obj'
+       include 'sphere.gltf'
     }
 
 

android/examples/multiview/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/multiview/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'sampleroom.dae'
+       include 'sampleroom.gltf'
     }
 
 }

android/examples/negativeviewportheight/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/occlusionquery/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/occlusionquery/build.gradle

@@ -57,19 +57,19 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'plane_z.3ds'
+       include 'plane_z.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'teapot.3ds'
+       include 'teapot.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'sphere.3ds'
+       include 'sphere.gltf'
     }
 
 

android/examples/offscreen/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/offscreen/build.gradle

@@ -57,22 +57,15 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'plane.obj'
+       include 'plane.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'chinesedragon.dae'
+       include 'chinesedragon.gltf'
     }
 
-    copy {
-       from '../../../data/textures'
-       into 'assets/textures'
-       include 'darkmetal_*.ktx'
-    }
-
-
 }
 
 preBuild.dependsOn copyTask

android/examples/parallaxmapping/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/parallaxmapping/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'plane_z.obj'
+       include 'planecd.gltf'
     }
 
     copy {

android/examples/particlefire/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/pbrbasic/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/pbrbasic/build.gradle

@@ -57,25 +57,25 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'geosphere.obj'
+       include 'sphere.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'teapot.dae'
+       include 'teapot.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'torusknot.obj'
+       include 'torusknot.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'venus.fbx'
+       include 'venus.gltf'
     }
 
 

android/examples/pbribl/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/pbribl/build.gradle

@@ -57,31 +57,31 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'cube.obj'
+       include 'cube.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'geosphere.obj'
+       include 'sphere.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'teapot.dae'
+       include 'teapot.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'torusknot.obj'
+       include 'torusknot.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'venus.fbx'
+       include 'venus.gltf'
     }
 
     copy {

android/examples/pbrtexture/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/pbrtexture/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'cube.obj'
+       include 'cube.gltf'
     }
 
     copy {

android/examples/pipelines/CMakeLists.txt

@@ -23,7 +23,7 @@ include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
 include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/pipelines/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'treasure_smooth.dae'
+       include 'treasure_smooth.gltf'
     }
 
 

android/examples/pipelinestatistics/CMakeLists.txt

@@ -23,7 +23,7 @@ include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
 include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/pipelinestatistics/build.gradle

@@ -57,31 +57,25 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'cube.obj'
+       include 'sphere.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'geosphere.obj'
+       include 'teapot.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'teapot.dae'
+       include 'torusknot.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'torusknot.obj'
-    }
-
-    copy {
-       from '../../../data/models'
-       into 'assets/models'
-       include 'venus.fbx'
+       include 'venus.gltf'
     }
 
 

android/examples/pushconstants/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/pushconstants/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'samplescene.dae'
+       include 'samplescene.gltf'
     }
 
 

android/examples/pushdescriptors/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/pushdescriptors/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'cube.dae'
+       include 'cube.gltf'
     }
 
     copy {

android/examples/radialblur/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/radialblur/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'glowsphere.dae'
+       include 'glowsphere.gltf'
     }
 
     copy {

android/examples/renderheadless/CMakeLists.txt

@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/screenshot/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/screenshot/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'chinesedragon.dae'
+       include 'chinesedragon.gltf'
     }
 
 

android/examples/shadowmapping/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/shadowmapping/build.gradle

@@ -57,13 +57,13 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'vulkanscene_shadow.dae'
+       include 'vulkanscene_shadow.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'samplescene.dae'
+       include 'samplescene.gltf'
     }
 
 }

android/examples/shadowmappingcascade/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/shadowmappingcascade/build.gradle

@@ -57,28 +57,15 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'terrain_simple.dae'
+       include 'terrain_gridlines.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'oak_*.dae'
+       include 'oaktree.gltf'
     }
 
-    copy {
-       from '../../../data/textures'
-       into 'assets/textures'
-       include 'gridlines.ktx'
-    }
-
-    copy {
-       from '../../../data/textures'
-       into 'assets/textures'
-       include 'oak*.ktx'
-    }
-
-
 }
 
 preBuild.dependsOn copyTask

android/examples/shadowmappingomni/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/shadowmappingomni/build.gradle

@@ -49,21 +49,21 @@ task copyTask {
     }
 
     copy {
-       from '../../../data/shaders/glsl/shadowmapomni'
-       into 'assets/shaders/glsl/shadowmapomni'
+       from '../../../data/shaders/glsl/shadowmappingomni'
+       into 'assets/shaders/glsl/shadowmappingomni'
        include '*.*'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'shadowscene_fire.dae'
+       include 'shadowscene_fire.gltf'
     }
 
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'cube.obj'
+       include 'cube.gltf'
     }
 
 

android/examples/specializationconstants/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/specializationconstants/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'color_teapot_spheres.dae'
+       include 'color_teapot_spheres.gltf'
     }
 
     copy {

android/examples/sphericalenvmapping/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/sphericalenvmapping/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'chinesedragon.dae'
+       include 'chinesedragon.gltf'
     }
 
     copy {

android/examples/ssao/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/ssao/build.gradle

@@ -55,12 +55,11 @@ task copyTask {
     }
 
     copy {
-       from '../../../data/models/sibenik'
-       into 'assets/models/sibenik'
+       from '../../../data/models/sponza'
+       into 'assets/models/sponza'
        include '*.*'
     }
-
-
+    
 }
 
 preBuild.dependsOn copyTask

android/examples/stencilbuffer/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(

android/examples/stencilbuffer/build.gradle

@@ -57,7 +57,7 @@ task copyTask {
     copy {
        from '../../../data/models'
        into 'assets/models'
-       include 'venus.fbx'
+       include 'venus.gltf'
     }
 
 

android/examples/subpasses/CMakeLists.txt

@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
 include_directories(${BASE_DIR})
 include_directories(${EXTERNAL_DIR})
 include_directories(${EXTERNAL_DIR}/glm)
-include_directories(${EXTERNAL_DIR}/gli)
 include_directories(${EXTERNAL_DIR}/imgui)
-include_directories(${EXTERNAL_DIR}/assimp)
+include_directories(${EXTERNAL_DIR}/tinygltf)
 include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
 
 target_link_libraries(