Merge glTF scene rendering sample (#744)
* Started reworking the scene rendering to sample Use glTF instead of ASSIMP, per-material pipelines, material loading, etc. * Visibility toggle for scene nodes * Fixed lighting, updated GLSL and HLSL shaders * Renamed sample * Code-Cleanup, comments, validation fixes * Android build * Started on tutorial for glTF scene rendering sample * Minor code cleanup * Adding new chapters to the tutorial for glTF scene rendering sample * Added info on normal map shader bindings, spelling * Added drawing chapter * Getter for texture descriptors Makes code a easier to read * Renamed glTF scene sample * Add markdown files to projects * Updated readme, separate chapter for glTF samples * Comments * Removed unused screenshot
This commit is contained in:
parent
889125c377
commit
e370e6d169
44 changed files with 1389 additions and 1044 deletions
|
|
@ -1,6 +1,6 @@
|
|||
cmake_minimum_required(VERSION 3.4.1 FATAL_ERROR)
|
||||
|
||||
set(NAME gltfscene)
|
||||
set(NAME gltfloading)
|
||||
|
||||
set(SRC_DIR ../../../examples/${NAME})
|
||||
set(BASE_DIR ../../../base)
|
||||
|
|
@ -49,8 +49,8 @@ task copyTask {
|
|||
}
|
||||
|
||||
copy {
|
||||
from '../../../data/shaders/glsl/gltfscene'
|
||||
into 'assets/shaders/glsl/gltfscene'
|
||||
from '../../../data/shaders/glsl/gltfloading'
|
||||
into 'assets/shaders/glsl/gltfloading'
|
||||
include '*.*'
|
||||
}
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
cmake_minimum_required(VERSION 3.4.1 FATAL_ERROR)
|
||||
|
||||
set(NAME scenerendering)
|
||||
set(NAME gltfscenerendering)
|
||||
|
||||
set(SRC_DIR ../../../examples/${NAME})
|
||||
set(BASE_DIR ../../../base)
|
||||
|
|
@ -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(
|
||||
|
|
@ -49,14 +49,14 @@ task copyTask {
|
|||
}
|
||||
|
||||
copy {
|
||||
from '../../../data/shaders/glsl/scenerendering'
|
||||
into 'assets/shaders/glsl/scenerendering'
|
||||
from '../../../data/shaders/glsl/gltfscenerendering'
|
||||
into 'assets/shaders/glsl/gltfscenerendering'
|
||||
include '*.*'
|
||||
}
|
||||
|
||||
copy {
|
||||
from '../../../data/models/sibenik'
|
||||
into 'assets/models/sibenik'
|
||||
from '../../../data/models/sponza'
|
||||
into 'assets/models/sponza'
|
||||
include '*.*'
|
||||
}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue