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
|
|
@ -27,11 +27,13 @@ function(buildExample EXAMPLE_NAME)
|
|||
file(GLOB SHADERS_HLSL "${SHADER_DIR_HLSL}/*.vert" "${SHADER_DIR_HLSL}/*.frag" "${SHADER_DIR_HLSL}/*.comp" "${SHADER_DIR_HLSL}/*.geom" "${SHADER_DIR_HLSL}/*.tesc" "${SHADER_DIR_HLSL}/*.tese" "${SHADER_DIR_HLSL}/*.mesh" "${SHADER_DIR_HLSL}/*.task" "${SHADER_DIR_HLSL}/*.rgen" "${SHADER_DIR_HLSL}/*.rchit" "${SHADER_DIR_HLSL}/*.rmiss")
|
||||
source_group("Shaders\\GLSL" FILES ${SHADERS_GLSL})
|
||||
source_group("Shaders\\HLSL" FILES ${SHADERS_HLSL})
|
||||
# Add optional readme / tutorial
|
||||
file(GLOB README_FILES "${EXAMPLE_FOLDER}/*.md")
|
||||
if(WIN32)
|
||||
add_executable(${EXAMPLE_NAME} WIN32 ${MAIN_CPP} ${SOURCE} ${MAIN_HEADER} ${SHADERS_GLSL} ${SHADERS_HLSL})
|
||||
add_executable(${EXAMPLE_NAME} WIN32 ${MAIN_CPP} ${SOURCE} ${MAIN_HEADER} ${SHADERS_GLSL} ${SHADERS_HLSL} ${README_FILES})
|
||||
target_link_libraries(${EXAMPLE_NAME} base ${Vulkan_LIBRARY} ${ASSIMP_LIBRARIES} ${WINLIBS})
|
||||
else(WIN32)
|
||||
add_executable(${EXAMPLE_NAME} ${MAIN_CPP} ${SOURCE} ${MAIN_HEADER} ${SHADERS_GLSL} ${SHADERS_HLSL})
|
||||
add_executable(${EXAMPLE_NAME} ${MAIN_CPP} ${SOURCE} ${MAIN_HEADER} ${SHADERS_GLSL} ${SHADERS_HLSL} ${README_FILES})
|
||||
target_link_libraries(${EXAMPLE_NAME} base )
|
||||
endif(WIN32)
|
||||
|
||||
|
|
@ -70,7 +72,8 @@ set(EXAMPLES
|
|||
dynamicuniformbuffer
|
||||
gears
|
||||
geometryshader
|
||||
gltfscene
|
||||
gltfloading
|
||||
gltfscenerendering
|
||||
gltfskinning
|
||||
hdr
|
||||
imgui
|
||||
|
|
@ -98,7 +101,6 @@ set(EXAMPLES
|
|||
pushdescriptors
|
||||
radialblur
|
||||
renderheadless
|
||||
scenerendering
|
||||
screenshot
|
||||
shadowmapping
|
||||
shadowmappingomni
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue