godzil/dorayme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A new scene and some optimisations.

Browse Source
This commit is contained in:
Godzil
2020-03-12 17:45:29 +00:00
parent 7a43a98816
commit c858b4dcde
11 changed files with 259 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/CMakeLists.txt
View File

@@ -128,7 +128,7 @@ file(DOWNLOAD
)
add_custom_command(
TARGET uvmap_skybox POST_BUILD
COMMAND unzip -o ${CMAKE_SOURCE_DIR}/external/LancellottiChapel.zip -d LancellottiChapel
COMMAND unzip -qq -o ${CMAKE_SOURCE_DIR}/external/LancellottiChapel.zip -d LancellottiChapel
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/external/
)
add_custom_command(
@@ -138,6 +138,26 @@ add_custom_command(
${CMAKE_CURRENT_BINARY_DIR}/
)
# Dragon scene
add_executable(dragon_scene)
target_sources(dragon_scene PRIVATE dragon_scene.cpp)
file(DOWNLOAD
http://raytracerchallenge.com/bonus/assets/dragon.zip
${CMAKE_SOURCE_DIR}/external/dragon.zip
EXPECTED_HASH MD5=308b0f2aca1d48d24e6fc4584dfdf345
)
add_custom_command(
TARGET dragon_scene POST_BUILD
COMMAND unzip -qq -o ${CMAKE_SOURCE_DIR}/external/dragon.zip
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/external/
)
add_custom_command(
TARGET dragon_scene POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/external/dragon.obj
${CMAKE_CURRENT_BINARY_DIR}/
)
add_test(NAME Chapter05_Test COMMAND $<TARGET_FILE:ch5_test>)
add_test(NAME Chapter06_Test COMMAND $<TARGET_FILE:ch6_test>)
add_test(NAME Chapter07_Test COMMAND $<TARGET_FILE:ch7_test>)
@@ -160,6 +180,7 @@ add_test(NAME UVMap_AlignCheckPlane COMMAND $<TARGET_FILE:uvmap_aligncheckplane>
add_test(NAME UVMap_CheckeredCube COMMAND $<TARGET_FILE:uvmap_checkeredcube>)
add_test(NAME UVMap_Earth COMMAND $<TARGET_FILE:uvmap_earth>)
add_test(NAME UVMap_Skybox COMMAND $<TARGET_FILE:uvmap_skybox>)
add_test(NAME Dragon_Sceme COMMAND $<TARGET_FILE:dragon_scene>)
add_test(NAME Test_Rendering COMMAND $<TARGET_FILE:test_render>)
add_test(NAME Triangle_RenderTest COMMAND $<TARGET_FILE:triangle_rendertest>)
add_test(NAME ChristmasBall_Rendering COMMAND $<TARGET_FILE:christmasball_render>)