Skip to content

Commit feb9390

Browse files
SaschaWillemsSaschaWillems
authored
Merge glTF branch (SaschaWillems#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 SaschaWillems#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
1 parent 8526c20 commit feb9390

File tree

726 files changed

+21944
-132760
lines changed

Some content is hidden

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

726 files changed

+21944
-132760
lines changed

‎.gitignore

+6-6
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ android/layers/*/*.so
211211
android/**/jni/
212212

213213
# Downloadable assets
214-
vulkan_asset_pack.*
214+
vulkan_asset_pack_gltf.*
215215
data/textures/hdr/*.*
216216
data/readme.txt
217217
data/models/cerberus/*.*
@@ -229,8 +229,8 @@ data/models/cerberus/*.*
229229
.DS_Store
230230

231231
# Assets that are part of the asset pack and should not be stored in the repo
232-
data/models/**/*.gltf
233-
data/models/**/*.bin
234-
data/models/**/*.glb
235-
data/models/**/*.png
236-
data/models/**/*.jpg
232+
data/models/**
233+
data/textures/**
234+
data/README_asset_pack.md
235+
data/font*.*
236+
data/roboto*.*

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "external/glm"]
22
path = external/glm
33
url = https://github.com/g-truc/glm
4-
[submodule "external/ktx"]
5-
path = external/ktx
6-
url = https://github.com/KhronosGroup/KTX-Software

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ compiler:
2525
- gcc
2626
before_script:
2727
- sudo apt-get -qq update
28-
- sudo apt-get install -y libassimp-dev libx11-xcb-dev libxrandr-dev
28+
- sudo apt-get install -y libx11-xcb-dev libxrandr-dev
2929
script:
3030
- cmake .
3131
- make

‎BUILD.md

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ cmake -G "Visual Studio 14 2015 Win64"
1717

1818
Use the provided CMakeLists.txt with [CMake](https://cmake.org) to generate a build configuration for your favorite IDE or compiler.
1919

20-
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.
21-
2220
##### [Window system integration](https://www.khronos.org/registry/vulkan/specs/1.0-wsi_extensions/html/vkspec.html#wsi)
2321
- **XCB**: Default WSI (if no cmake option is specified)
2422
- **Wayland**: Use cmake option ```USE_WAYLAND_WSI``` (```-DUSE_WAYLAND_WSI=ON```)

‎CMakeLists.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ project(${NAME})
99
include_directories(external)
1010
include_directories(external/glm)
1111
include_directories(external/gli)
12-
include_directories(external/assimp)
1312
include_directories(external/imgui)
1413
include_directories(external/tinygltf)
14+
include_directories(external/ktx/include)
15+
include_directories(external/ktx/other_include)
1516
include_directories(base)
1617

1718
OPTION(USE_D2D_WSI "Build the project using Direct to Display swapchain" OFF)
@@ -33,7 +34,6 @@ IF(WIN32)
3334
MESSAGE("Using bundled Vulkan library version")
3435
ENDIF()
3536
ENDIF()
36-
find_library(ASSIMP_LIBRARIES NAMES assimp libassimp.dll.a PATHS ${CMAKE_SOURCE_DIR}/libs/assimp)
3737
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_USE_PLATFORM_WIN32_KHR")
3838
ELSE(WIN32)
3939
IF (NOT Vulkan_FOUND)
@@ -43,7 +43,6 @@ ELSE(WIN32)
4343
MESSAGE("Using bundled Vulkan library version")
4444
ENDIF()
4545
ENDIF()
46-
find_package(ASSIMP REQUIRED)
4746
find_package(Threads REQUIRED)
4847
IF(USE_D2D_WSI)
4948
MESSAGE("Using direct to display extension...")
@@ -121,11 +120,10 @@ ENDIF(MSVC)
121120
IF(WIN32)
122121
# Nothing here (yet)
123122
ELSE(WIN32)
124-
link_libraries(${XCB_LIBRARIES} ${Vulkan_LIBRARY} ${Vulkan_LIBRARY} ${ASSIMP_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
123+
link_libraries(${XCB_LIBRARIES} ${Vulkan_LIBRARY} ${Vulkan_LIBRARY} ${WAYLAND_CLIENT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
125124
ENDIF(WIN32)
126125

127126
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/")
128127

129128
add_subdirectory(base)
130-
add_subdirectory(examples)
131-
add_subdirectory(external)
129+
add_subdirectory(examples)

‎CREDITS.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
## Credits
22
Thanks to the authors of these libraries :
33
- [OpenGL Mathematics (GLM)](https://github.com/g-truc/glm)
4-
- [Open Asset Import Library](https://github.com/assimp/assimp)
54

65
Thanks to Ben Clayton from Google LLC for contributing the [HLSL shaders](data/hlsl).
76

@@ -13,7 +12,6 @@ Please note that (some) models and textures use separate licenses. Please comply
1312
- Armored knight model used in deferred example by [Gabriel Piacenti](http://opengameart.org/users/piacenti)
1413
- Old deer model used in tessellation example by [Čestmír Dammer](http://opengameart.org/users/cdmir)
1514
- Hidden treasure scene used in pipeline and debug marker examples by [Laurynas Jurgila](http://www.blendswap.com/user/PigArt)
16-
- Sibenik Cathedral model by Marko Dabrovic, using updated version by [Kenzie Lamar and Morgan McGuire](http://graphics.cs.williams.edu/data/meshes.xml)
1715
- Textures used in some examples by [Hugues Muller](http://www.yughues-folio.com)
1816
- Cerberus gun model used in PBR sample by [Andrew Maximov](http://artisaverb.info/Cerberus.html)
1917
- Updated compute particle system shader by [Lukas Bergdoll](https://github.com/Voultapher)

‎android/examples/_template/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
2725
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2826

2927
target_link_libraries(

‎android/examples/base/CMakeLists.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@ file(GLOB BASE_SRC "../../../base/*.cpp" "../../../external/imgui/*.cpp")
22

33
add_library(libbase SHARED ${BASE_SRC})
44

5-
add_library(libassimp STATIC IMPORTED)
6-
set_target_properties(libassimp PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/assimp/${ANDROID_ABI}/libassimp.a)
7-
85
include_directories(${BASE_DIR})
96
include_directories(../../../external/glm)
107
include_directories(../../../external/gli)
118
include_directories(../../../external/imgui)
12-
include_directories(../../../external/assimp)
9+
include_directories(${EXTERNAL_DIR}/tinygltf)
1310
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
1411

1512
set(KTX_DIR ../../../external/ktx)
@@ -37,6 +34,5 @@ target_link_libraries(
3734
android
3835
log
3936
z
40-
libassimp
4137
libktx
4238
)

‎android/examples/bloom/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
25+
include_directories(${EXTERNAL_DIR}/tinygltf)
2726
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2827

2928
target_link_libraries(

‎android/examples/bloom/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,19 @@ task copyTask {
5757
copy {
5858
from '../../../data/models'
5959
into 'assets/models'
60-
include 'retroufo.dae'
60+
include 'retroufo.gltf'
6161
}
6262

6363
copy {
6464
from '../../../data/models'
6565
into 'assets/models'
66-
include 'retroufo_glow.dae'
66+
include 'retroufo_glow.gltf'
6767
}
6868

6969
copy {
7070
from '../../../data/models'
7171
into 'assets/models'
72-
include 'cube.obj'
72+
include 'cube.gltf'
7373
}
7474

7575
copy {

‎android/examples/computecloth/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
25+
include_directories(${EXTERNAL_DIR}/tinygltf)
2726
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2827

2928
target_link_libraries(

‎android/examples/computecloth/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ task copyTask {
5757
copy {
5858
from '../../../data/models'
5959
into 'assets/models'
60-
include 'geosphere.obj'
60+
include 'sphere.gltf'
6161
}
6262

6363
copy {

‎android/examples/computecullandlod/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
25+
include_directories(${EXTERNAL_DIR}/tinygltf)
2726
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2827

2928
target_link_libraries(

‎android/examples/computecullandlod/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ task copyTask {
5757
copy {
5858
from '../../../data/models'
5959
into 'assets/models'
60-
include 'suzanne_lods.dae'
60+
include 'suzanne_lods.gltf'
6161
}
6262

6363

‎android/examples/computeheadless/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
2725
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2826

2927
target_link_libraries(

‎android/examples/computenbody/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
2725
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2826

2927
target_link_libraries(

‎android/examples/computeparticles/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
2725
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2826

2927
target_link_libraries(

‎android/examples/computeraytracing/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
2725
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2826

2927
target_link_libraries(

‎android/examples/computeshader/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
2725
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2826

2927
target_link_libraries(

‎android/examples/conservativeraster/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
2725
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2826

2927
target_link_libraries(

‎android/examples/debugmarker/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
25+
include_directories(${EXTERNAL_DIR}/tinygltf)
2726
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2827

2928
target_link_libraries(

‎android/examples/debugmarker/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ task copyTask {
5757
copy {
5858
from '../../../data/models'
5959
into 'assets/models'
60-
include 'treasure_smooth.dae'
60+
include 'treasure_smooth.gltf'
6161
}
6262

6363
copy {
6464
from '../../../data/models'
6565
into 'assets/models'
66-
include 'treasure_glow.dae'
66+
include 'treasure_glow.gltf'
6767
}
6868

6969

‎android/examples/deferred/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
25+
include_directories(${EXTERNAL_DIR}/tinygltf)
2726
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2827

2928
target_link_libraries(

‎android/examples/deferred/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ task copyTask {
5757
copy {
5858
from '../../../data/models'
5959
into 'assets/models'
60-
include 'plane.obj'
60+
include 'deferred_floor.gltf'
6161
}
6262

6363
copy {

‎android/examples/deferredmultisampling/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
25+
include_directories(${EXTERNAL_DIR}/tinygltf)
2726
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2827

2928
target_link_libraries(

‎android/examples/deferredmultisampling/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ task copyTask {
5757
copy {
5858
from '../../../data/models'
5959
into 'assets/models'
60-
include 'openbox.dae'
60+
include 'deferred_box.gltf'
6161
}
6262

6363
copy {

‎android/examples/deferredshadows/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
25+
include_directories(${EXTERNAL_DIR}/tinygltf)
2726
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2827

2928
target_link_libraries(

‎android/examples/deferredshadows/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ task copyTask {
5757
copy {
5858
from '../../../data/models'
5959
into 'assets/models'
60-
include 'openbox.dae'
60+
include 'deferred_box.gltf'
6161
}
6262

6363
copy {

‎android/examples/descriptorsets/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
25+
include_directories(${EXTERNAL_DIR}/tinygltf)
2726
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2827

2928
target_link_libraries(

‎android/examples/descriptorsets/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ task copyTask {
5757
copy {
5858
from '../../../data/models'
5959
into 'assets/models'
60-
include 'cube.dae'
60+
include 'cube.gltf'
6161
}
6262

6363
copy {

‎android/examples/displacement/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_o
2121
include_directories(${BASE_DIR})
2222
include_directories(${EXTERNAL_DIR})
2323
include_directories(${EXTERNAL_DIR}/glm)
24-
include_directories(${EXTERNAL_DIR}/gli)
2524
include_directories(${EXTERNAL_DIR}/imgui)
26-
include_directories(${EXTERNAL_DIR}/assimp)
25+
include_directories(${EXTERNAL_DIR}/tinygltf)
2726
include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
2827

2928
target_link_libraries(

0 commit comments

Comments
 (0)