From 4861761b9b944dbd1917dfbdbf8b23e35cc080e4 Mon Sep 17 00:00:00 2001 From: kj16609 Date: Mon, 17 Jun 2024 02:54:53 -0400 Subject: [PATCH] Changeup cmake to properly copy assets folder --- CMakeLists.txt | 23 ++++++++++++------ {models => assets}/PhysicsTest.glb | 0 {models => assets}/PhysicsTest1.glb | 0 {models => assets}/colored_cube.obj | 0 {models => assets}/cube.obj | 0 {models => assets}/file.png | 0 {models => assets}/flat_vase.obj | 0 {models => assets}/folder.png | 0 .../khronos-sponza/10381718147657362067.jpg | 0 .../khronos-sponza/10388182081421875623.jpg | 0 .../khronos-sponza/11474523244911310074.jpg | 0 .../khronos-sponza/11490520546946913238.jpg | 0 .../khronos-sponza/11872827283454512094.jpg | 0 .../khronos-sponza/11968150294050148237.jpg | 0 .../khronos-sponza/1219024358953944284.jpg | 0 .../khronos-sponza/12501374198249454378.jpg | 0 .../khronos-sponza/13196865903111448057.jpg | 0 .../khronos-sponza/13824894030729245199.jpg | 0 .../khronos-sponza/13982482287905699490.jpg | 0 .../khronos-sponza/14118779221266351425.jpg | 0 .../khronos-sponza/14170708867020035030.jpg | 0 .../khronos-sponza/14267839433702832875.jpg | 0 .../khronos-sponza/14650633544276105767.jpg | 0 .../khronos-sponza/15295713303328085182.jpg | 0 .../khronos-sponza/15722799267630235092.jpg | 0 .../khronos-sponza/16275776544635328252.png | 0 .../khronos-sponza/16299174074766089871.jpg | 0 .../khronos-sponza/16885566240357350108.jpg | 0 .../khronos-sponza/17556969131407844942.jpg | 0 .../khronos-sponza/17876391417123941155.jpg | 0 .../khronos-sponza/2051777328469649772.jpg | 0 .../khronos-sponza/2185409758123873465.jpg | 0 .../khronos-sponza/2299742237651021498.jpg | 0 .../khronos-sponza/2374361008830720677.jpg | 0 .../khronos-sponza/2411100444841994089.jpg | 0 .../khronos-sponza/2775690330959970771.jpg | 0 .../khronos-sponza/2969916736137545357.jpg | 0 .../khronos-sponza/332936164838540657.jpg | 0 .../khronos-sponza/3371964815757888145.jpg | 0 .../khronos-sponza/3455394979645218238.jpg | 0 .../khronos-sponza/3628158980083700836.jpg | 0 .../khronos-sponza/3827035219084910048.jpg | 0 .../khronos-sponza/4477655471536070370.jpg | 0 .../khronos-sponza/4601176305987539675.jpg | 0 .../khronos-sponza/466164707995436622.jpg | 0 .../khronos-sponza/4675343432951571524.jpg | 0 .../khronos-sponza/4871783166746854860.jpg | 0 .../khronos-sponza/4910669866631290573.jpg | 0 .../khronos-sponza/4975155472559461469.jpg | 0 .../khronos-sponza/5061699253647017043.png | 0 .../khronos-sponza/5792855332885324923.jpg | 0 .../khronos-sponza/5823059166183034438.jpg | 0 .../khronos-sponza/6047387724914829168.jpg | 0 .../khronos-sponza/6151467286084645207.jpg | 0 .../khronos-sponza/6593109234861095314.jpg | 0 .../khronos-sponza/6667038893015345571.jpg | 0 .../khronos-sponza/6772804448157695701.jpg | 0 .../khronos-sponza/7056944414013900257.jpg | 0 .../khronos-sponza/715093869573992647.jpg | 0 .../khronos-sponza/7268504077753552595.jpg | 0 .../khronos-sponza/7441062115984513793.jpg | 0 .../khronos-sponza/755318871556304029.jpg | 0 .../khronos-sponza/759203620573749278.jpg | 0 .../khronos-sponza/7645212358685992005.jpg | 0 .../khronos-sponza/7815564343179553343.jpg | 0 .../khronos-sponza/8006627369776289000.png | 0 .../khronos-sponza/8051790464816141987.jpg | 0 .../khronos-sponza/8114461559286000061.jpg | 0 .../khronos-sponza/8481240838833932244.jpg | 0 .../khronos-sponza/8503262930880235456.jpg | 0 .../khronos-sponza/8747919177698443163.jpg | 0 .../khronos-sponza/8750083169368950601.jpg | 0 .../khronos-sponza/8773302468495022225.jpg | 0 .../khronos-sponza/8783994986360286082.jpg | 0 .../khronos-sponza/9288698199695299068.jpg | 0 .../khronos-sponza/9916269861720640319.jpg | 0 {models => assets}/khronos-sponza/Sponza.bin | Bin {models => assets}/khronos-sponza/Sponza.gltf | 0 {models => assets}/khronos-sponza/white.png | 0 {models => assets}/quad.obj | 0 {models => assets}/smooth_vase.obj | 0 {models => assets}/textures/DebugTexture.png | 0 .../textures/TestingHeightmap.png | 0 assets/up.png | 3 +++ models/.gitattributes | 2 -- 85 files changed, 18 insertions(+), 10 deletions(-) rename {models => assets}/PhysicsTest.glb (100%) rename {models => assets}/PhysicsTest1.glb (100%) rename {models => assets}/colored_cube.obj (100%) rename {models => assets}/cube.obj (100%) rename {models => assets}/file.png (100%) rename {models => assets}/flat_vase.obj (100%) rename {models => assets}/folder.png (100%) rename {models => assets}/khronos-sponza/10381718147657362067.jpg (100%) rename {models => assets}/khronos-sponza/10388182081421875623.jpg (100%) rename {models => assets}/khronos-sponza/11474523244911310074.jpg (100%) rename {models => assets}/khronos-sponza/11490520546946913238.jpg (100%) rename {models => assets}/khronos-sponza/11872827283454512094.jpg (100%) rename {models => assets}/khronos-sponza/11968150294050148237.jpg (100%) rename {models => assets}/khronos-sponza/1219024358953944284.jpg (100%) rename {models => assets}/khronos-sponza/12501374198249454378.jpg (100%) rename {models => assets}/khronos-sponza/13196865903111448057.jpg (100%) rename {models => assets}/khronos-sponza/13824894030729245199.jpg (100%) rename {models => assets}/khronos-sponza/13982482287905699490.jpg (100%) rename {models => assets}/khronos-sponza/14118779221266351425.jpg (100%) rename {models => assets}/khronos-sponza/14170708867020035030.jpg (100%) rename {models => assets}/khronos-sponza/14267839433702832875.jpg (100%) rename {models => assets}/khronos-sponza/14650633544276105767.jpg (100%) rename {models => assets}/khronos-sponza/15295713303328085182.jpg (100%) rename {models => assets}/khronos-sponza/15722799267630235092.jpg (100%) rename {models => assets}/khronos-sponza/16275776544635328252.png (100%) rename {models => assets}/khronos-sponza/16299174074766089871.jpg (100%) rename {models => assets}/khronos-sponza/16885566240357350108.jpg (100%) rename {models => assets}/khronos-sponza/17556969131407844942.jpg (100%) rename {models => assets}/khronos-sponza/17876391417123941155.jpg (100%) rename {models => assets}/khronos-sponza/2051777328469649772.jpg (100%) rename {models => assets}/khronos-sponza/2185409758123873465.jpg (100%) rename {models => assets}/khronos-sponza/2299742237651021498.jpg (100%) rename {models => assets}/khronos-sponza/2374361008830720677.jpg (100%) rename {models => assets}/khronos-sponza/2411100444841994089.jpg (100%) rename {models => assets}/khronos-sponza/2775690330959970771.jpg (100%) rename {models => assets}/khronos-sponza/2969916736137545357.jpg (100%) rename {models => assets}/khronos-sponza/332936164838540657.jpg (100%) rename {models => assets}/khronos-sponza/3371964815757888145.jpg (100%) rename {models => assets}/khronos-sponza/3455394979645218238.jpg (100%) rename {models => assets}/khronos-sponza/3628158980083700836.jpg (100%) rename {models => assets}/khronos-sponza/3827035219084910048.jpg (100%) rename {models => assets}/khronos-sponza/4477655471536070370.jpg (100%) rename {models => assets}/khronos-sponza/4601176305987539675.jpg (100%) rename {models => assets}/khronos-sponza/466164707995436622.jpg (100%) rename {models => assets}/khronos-sponza/4675343432951571524.jpg (100%) rename {models => assets}/khronos-sponza/4871783166746854860.jpg (100%) rename {models => assets}/khronos-sponza/4910669866631290573.jpg (100%) rename {models => assets}/khronos-sponza/4975155472559461469.jpg (100%) rename {models => assets}/khronos-sponza/5061699253647017043.png (100%) rename {models => assets}/khronos-sponza/5792855332885324923.jpg (100%) rename {models => assets}/khronos-sponza/5823059166183034438.jpg (100%) rename {models => assets}/khronos-sponza/6047387724914829168.jpg (100%) rename {models => assets}/khronos-sponza/6151467286084645207.jpg (100%) rename {models => assets}/khronos-sponza/6593109234861095314.jpg (100%) rename {models => assets}/khronos-sponza/6667038893015345571.jpg (100%) rename {models => assets}/khronos-sponza/6772804448157695701.jpg (100%) rename {models => assets}/khronos-sponza/7056944414013900257.jpg (100%) rename {models => assets}/khronos-sponza/715093869573992647.jpg (100%) rename {models => assets}/khronos-sponza/7268504077753552595.jpg (100%) rename {models => assets}/khronos-sponza/7441062115984513793.jpg (100%) rename {models => assets}/khronos-sponza/755318871556304029.jpg (100%) rename {models => assets}/khronos-sponza/759203620573749278.jpg (100%) rename {models => assets}/khronos-sponza/7645212358685992005.jpg (100%) rename {models => assets}/khronos-sponza/7815564343179553343.jpg (100%) rename {models => assets}/khronos-sponza/8006627369776289000.png (100%) rename {models => assets}/khronos-sponza/8051790464816141987.jpg (100%) rename {models => assets}/khronos-sponza/8114461559286000061.jpg (100%) rename {models => assets}/khronos-sponza/8481240838833932244.jpg (100%) rename {models => assets}/khronos-sponza/8503262930880235456.jpg (100%) rename {models => assets}/khronos-sponza/8747919177698443163.jpg (100%) rename {models => assets}/khronos-sponza/8750083169368950601.jpg (100%) rename {models => assets}/khronos-sponza/8773302468495022225.jpg (100%) rename {models => assets}/khronos-sponza/8783994986360286082.jpg (100%) rename {models => assets}/khronos-sponza/9288698199695299068.jpg (100%) rename {models => assets}/khronos-sponza/9916269861720640319.jpg (100%) rename {models => assets}/khronos-sponza/Sponza.bin (100%) rename {models => assets}/khronos-sponza/Sponza.gltf (100%) rename {models => assets}/khronos-sponza/white.png (100%) rename {models => assets}/quad.obj (100%) rename {models => assets}/smooth_vase.obj (100%) rename {models => assets}/textures/DebugTexture.png (100%) rename {models => assets}/textures/TestingHeightmap.png (100%) create mode 100644 assets/up.png delete mode 100644 models/.gitattributes diff --git a/CMakeLists.txt b/CMakeLists.txt index 6213137..cf63d65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,9 +36,8 @@ include(dependencies/catch2) add_subdirectory(src) add_subdirectory(tests) - file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/bin/shaders") -file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/bin/models") +file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/bin/assets") string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_UPPER_BUILD_TYPE) @@ -48,14 +47,22 @@ else () set(SHADER_DEBUG_FLAGS "") endif () -file(GLOB_RECURSE ASSETS ${CMAKE_CURRENT_SOURCE_DIR}/models/*) +file(GLOB_RECURSE ASSETS ${CMAKE_CURRENT_SOURCE_DIR}/assets/*) foreach (ASSET IN LISTS ASSETS) get_filename_component(FILENAME ${ASSET} NAME) - add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/models/${FILENAME} - COMMAND ${CMAKE_COMMAND} -E copy ${ASSET} ${CMAKE_BINARY_DIR}/bin/models/${FILENAME} + get_filename_component(FILE_DIRECTORY ${ASSET} DIRECTORY) + file(RELATIVE_PATH REL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/assets ${FILE_DIRECTORY}) + + if (NOT REL_PATH STREQUAL "") + set(REL_PATH ${REL_PATH}/) + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/assets/${REL_PATH}) + endif () + + add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/assets/${FILENAME} + COMMAND ${CMAKE_COMMAND} -E copy ${ASSET} ${CMAKE_BINARY_DIR}/bin/assets/${FILENAME} COMMENT " Copying ${ASSET} ") - list(APPEND OUT_ASSETS ${CMAKE_BINARY_DIR}/bin/models/${FILENAME}) + list(APPEND OUT_ASSETS ${CMAKE_BINARY_DIR}/bin/assets/${FILENAME}) endforeach () file(GLOB_RECURSE SHADERS @@ -82,10 +89,10 @@ endforeach () add_custom_target(shaders ALL DEPENDS ${SPV_SHADERS}) -add_custom_target(models ALL DEPENDS ${OUT_ASSETS}) +add_custom_target(assets ALL DEPENDS ${OUT_ASSETS}) add_dependencies(${PROJECT_NAME} shaders) -add_dependencies(${PROJECT_NAME} models) +add_dependencies(${PROJECT_NAME} assets) add_custom_command( diff --git a/models/PhysicsTest.glb b/assets/PhysicsTest.glb similarity index 100% rename from models/PhysicsTest.glb rename to assets/PhysicsTest.glb diff --git a/models/PhysicsTest1.glb b/assets/PhysicsTest1.glb similarity index 100% rename from models/PhysicsTest1.glb rename to assets/PhysicsTest1.glb diff --git a/models/colored_cube.obj b/assets/colored_cube.obj similarity index 100% rename from models/colored_cube.obj rename to assets/colored_cube.obj diff --git a/models/cube.obj b/assets/cube.obj similarity index 100% rename from models/cube.obj rename to assets/cube.obj diff --git a/models/file.png b/assets/file.png similarity index 100% rename from models/file.png rename to assets/file.png diff --git a/models/flat_vase.obj b/assets/flat_vase.obj similarity index 100% rename from models/flat_vase.obj rename to assets/flat_vase.obj diff --git a/models/folder.png b/assets/folder.png similarity index 100% rename from models/folder.png rename to assets/folder.png diff --git a/models/khronos-sponza/10381718147657362067.jpg b/assets/khronos-sponza/10381718147657362067.jpg similarity index 100% rename from models/khronos-sponza/10381718147657362067.jpg rename to assets/khronos-sponza/10381718147657362067.jpg diff --git a/models/khronos-sponza/10388182081421875623.jpg b/assets/khronos-sponza/10388182081421875623.jpg similarity index 100% rename from models/khronos-sponza/10388182081421875623.jpg rename to assets/khronos-sponza/10388182081421875623.jpg diff --git a/models/khronos-sponza/11474523244911310074.jpg b/assets/khronos-sponza/11474523244911310074.jpg similarity index 100% rename from models/khronos-sponza/11474523244911310074.jpg rename to assets/khronos-sponza/11474523244911310074.jpg diff --git a/models/khronos-sponza/11490520546946913238.jpg b/assets/khronos-sponza/11490520546946913238.jpg similarity index 100% rename from models/khronos-sponza/11490520546946913238.jpg rename to assets/khronos-sponza/11490520546946913238.jpg diff --git a/models/khronos-sponza/11872827283454512094.jpg b/assets/khronos-sponza/11872827283454512094.jpg similarity index 100% rename from models/khronos-sponza/11872827283454512094.jpg rename to assets/khronos-sponza/11872827283454512094.jpg diff --git a/models/khronos-sponza/11968150294050148237.jpg b/assets/khronos-sponza/11968150294050148237.jpg similarity index 100% rename from models/khronos-sponza/11968150294050148237.jpg rename to assets/khronos-sponza/11968150294050148237.jpg diff --git a/models/khronos-sponza/1219024358953944284.jpg b/assets/khronos-sponza/1219024358953944284.jpg similarity index 100% rename from models/khronos-sponza/1219024358953944284.jpg rename to assets/khronos-sponza/1219024358953944284.jpg diff --git a/models/khronos-sponza/12501374198249454378.jpg b/assets/khronos-sponza/12501374198249454378.jpg similarity index 100% rename from models/khronos-sponza/12501374198249454378.jpg rename to assets/khronos-sponza/12501374198249454378.jpg diff --git a/models/khronos-sponza/13196865903111448057.jpg b/assets/khronos-sponza/13196865903111448057.jpg similarity index 100% rename from models/khronos-sponza/13196865903111448057.jpg rename to assets/khronos-sponza/13196865903111448057.jpg diff --git a/models/khronos-sponza/13824894030729245199.jpg b/assets/khronos-sponza/13824894030729245199.jpg similarity index 100% rename from models/khronos-sponza/13824894030729245199.jpg rename to assets/khronos-sponza/13824894030729245199.jpg diff --git a/models/khronos-sponza/13982482287905699490.jpg b/assets/khronos-sponza/13982482287905699490.jpg similarity index 100% rename from models/khronos-sponza/13982482287905699490.jpg rename to assets/khronos-sponza/13982482287905699490.jpg diff --git a/models/khronos-sponza/14118779221266351425.jpg b/assets/khronos-sponza/14118779221266351425.jpg similarity index 100% rename from models/khronos-sponza/14118779221266351425.jpg rename to assets/khronos-sponza/14118779221266351425.jpg diff --git a/models/khronos-sponza/14170708867020035030.jpg b/assets/khronos-sponza/14170708867020035030.jpg similarity index 100% rename from models/khronos-sponza/14170708867020035030.jpg rename to assets/khronos-sponza/14170708867020035030.jpg diff --git a/models/khronos-sponza/14267839433702832875.jpg b/assets/khronos-sponza/14267839433702832875.jpg similarity index 100% rename from models/khronos-sponza/14267839433702832875.jpg rename to assets/khronos-sponza/14267839433702832875.jpg diff --git a/models/khronos-sponza/14650633544276105767.jpg b/assets/khronos-sponza/14650633544276105767.jpg similarity index 100% rename from models/khronos-sponza/14650633544276105767.jpg rename to assets/khronos-sponza/14650633544276105767.jpg diff --git a/models/khronos-sponza/15295713303328085182.jpg b/assets/khronos-sponza/15295713303328085182.jpg similarity index 100% rename from models/khronos-sponza/15295713303328085182.jpg rename to assets/khronos-sponza/15295713303328085182.jpg diff --git a/models/khronos-sponza/15722799267630235092.jpg b/assets/khronos-sponza/15722799267630235092.jpg similarity index 100% rename from models/khronos-sponza/15722799267630235092.jpg rename to assets/khronos-sponza/15722799267630235092.jpg diff --git a/models/khronos-sponza/16275776544635328252.png b/assets/khronos-sponza/16275776544635328252.png similarity index 100% rename from models/khronos-sponza/16275776544635328252.png rename to assets/khronos-sponza/16275776544635328252.png diff --git a/models/khronos-sponza/16299174074766089871.jpg b/assets/khronos-sponza/16299174074766089871.jpg similarity index 100% rename from models/khronos-sponza/16299174074766089871.jpg rename to assets/khronos-sponza/16299174074766089871.jpg diff --git a/models/khronos-sponza/16885566240357350108.jpg b/assets/khronos-sponza/16885566240357350108.jpg similarity index 100% rename from models/khronos-sponza/16885566240357350108.jpg rename to assets/khronos-sponza/16885566240357350108.jpg diff --git a/models/khronos-sponza/17556969131407844942.jpg b/assets/khronos-sponza/17556969131407844942.jpg similarity index 100% rename from models/khronos-sponza/17556969131407844942.jpg rename to assets/khronos-sponza/17556969131407844942.jpg diff --git a/models/khronos-sponza/17876391417123941155.jpg b/assets/khronos-sponza/17876391417123941155.jpg similarity index 100% rename from models/khronos-sponza/17876391417123941155.jpg rename to assets/khronos-sponza/17876391417123941155.jpg diff --git a/models/khronos-sponza/2051777328469649772.jpg b/assets/khronos-sponza/2051777328469649772.jpg similarity index 100% rename from models/khronos-sponza/2051777328469649772.jpg rename to assets/khronos-sponza/2051777328469649772.jpg diff --git a/models/khronos-sponza/2185409758123873465.jpg b/assets/khronos-sponza/2185409758123873465.jpg similarity index 100% rename from models/khronos-sponza/2185409758123873465.jpg rename to assets/khronos-sponza/2185409758123873465.jpg diff --git a/models/khronos-sponza/2299742237651021498.jpg b/assets/khronos-sponza/2299742237651021498.jpg similarity index 100% rename from models/khronos-sponza/2299742237651021498.jpg rename to assets/khronos-sponza/2299742237651021498.jpg diff --git a/models/khronos-sponza/2374361008830720677.jpg b/assets/khronos-sponza/2374361008830720677.jpg similarity index 100% rename from models/khronos-sponza/2374361008830720677.jpg rename to assets/khronos-sponza/2374361008830720677.jpg diff --git a/models/khronos-sponza/2411100444841994089.jpg b/assets/khronos-sponza/2411100444841994089.jpg similarity index 100% rename from models/khronos-sponza/2411100444841994089.jpg rename to assets/khronos-sponza/2411100444841994089.jpg diff --git a/models/khronos-sponza/2775690330959970771.jpg b/assets/khronos-sponza/2775690330959970771.jpg similarity index 100% rename from models/khronos-sponza/2775690330959970771.jpg rename to assets/khronos-sponza/2775690330959970771.jpg diff --git a/models/khronos-sponza/2969916736137545357.jpg b/assets/khronos-sponza/2969916736137545357.jpg similarity index 100% rename from models/khronos-sponza/2969916736137545357.jpg rename to assets/khronos-sponza/2969916736137545357.jpg diff --git a/models/khronos-sponza/332936164838540657.jpg b/assets/khronos-sponza/332936164838540657.jpg similarity index 100% rename from models/khronos-sponza/332936164838540657.jpg rename to assets/khronos-sponza/332936164838540657.jpg diff --git a/models/khronos-sponza/3371964815757888145.jpg b/assets/khronos-sponza/3371964815757888145.jpg similarity index 100% rename from models/khronos-sponza/3371964815757888145.jpg rename to assets/khronos-sponza/3371964815757888145.jpg diff --git a/models/khronos-sponza/3455394979645218238.jpg b/assets/khronos-sponza/3455394979645218238.jpg similarity index 100% rename from models/khronos-sponza/3455394979645218238.jpg rename to assets/khronos-sponza/3455394979645218238.jpg diff --git a/models/khronos-sponza/3628158980083700836.jpg b/assets/khronos-sponza/3628158980083700836.jpg similarity index 100% rename from models/khronos-sponza/3628158980083700836.jpg rename to assets/khronos-sponza/3628158980083700836.jpg diff --git a/models/khronos-sponza/3827035219084910048.jpg b/assets/khronos-sponza/3827035219084910048.jpg similarity index 100% rename from models/khronos-sponza/3827035219084910048.jpg rename to assets/khronos-sponza/3827035219084910048.jpg diff --git a/models/khronos-sponza/4477655471536070370.jpg b/assets/khronos-sponza/4477655471536070370.jpg similarity index 100% rename from models/khronos-sponza/4477655471536070370.jpg rename to assets/khronos-sponza/4477655471536070370.jpg diff --git a/models/khronos-sponza/4601176305987539675.jpg b/assets/khronos-sponza/4601176305987539675.jpg similarity index 100% rename from models/khronos-sponza/4601176305987539675.jpg rename to assets/khronos-sponza/4601176305987539675.jpg diff --git a/models/khronos-sponza/466164707995436622.jpg b/assets/khronos-sponza/466164707995436622.jpg similarity index 100% rename from models/khronos-sponza/466164707995436622.jpg rename to assets/khronos-sponza/466164707995436622.jpg diff --git a/models/khronos-sponza/4675343432951571524.jpg b/assets/khronos-sponza/4675343432951571524.jpg similarity index 100% rename from models/khronos-sponza/4675343432951571524.jpg rename to assets/khronos-sponza/4675343432951571524.jpg diff --git a/models/khronos-sponza/4871783166746854860.jpg b/assets/khronos-sponza/4871783166746854860.jpg similarity index 100% rename from models/khronos-sponza/4871783166746854860.jpg rename to assets/khronos-sponza/4871783166746854860.jpg diff --git a/models/khronos-sponza/4910669866631290573.jpg b/assets/khronos-sponza/4910669866631290573.jpg similarity index 100% rename from models/khronos-sponza/4910669866631290573.jpg rename to assets/khronos-sponza/4910669866631290573.jpg diff --git a/models/khronos-sponza/4975155472559461469.jpg b/assets/khronos-sponza/4975155472559461469.jpg similarity index 100% rename from models/khronos-sponza/4975155472559461469.jpg rename to assets/khronos-sponza/4975155472559461469.jpg diff --git a/models/khronos-sponza/5061699253647017043.png b/assets/khronos-sponza/5061699253647017043.png similarity index 100% rename from models/khronos-sponza/5061699253647017043.png rename to assets/khronos-sponza/5061699253647017043.png diff --git a/models/khronos-sponza/5792855332885324923.jpg b/assets/khronos-sponza/5792855332885324923.jpg similarity index 100% rename from models/khronos-sponza/5792855332885324923.jpg rename to assets/khronos-sponza/5792855332885324923.jpg diff --git a/models/khronos-sponza/5823059166183034438.jpg b/assets/khronos-sponza/5823059166183034438.jpg similarity index 100% rename from models/khronos-sponza/5823059166183034438.jpg rename to assets/khronos-sponza/5823059166183034438.jpg diff --git a/models/khronos-sponza/6047387724914829168.jpg b/assets/khronos-sponza/6047387724914829168.jpg similarity index 100% rename from models/khronos-sponza/6047387724914829168.jpg rename to assets/khronos-sponza/6047387724914829168.jpg diff --git a/models/khronos-sponza/6151467286084645207.jpg b/assets/khronos-sponza/6151467286084645207.jpg similarity index 100% rename from models/khronos-sponza/6151467286084645207.jpg rename to assets/khronos-sponza/6151467286084645207.jpg diff --git a/models/khronos-sponza/6593109234861095314.jpg b/assets/khronos-sponza/6593109234861095314.jpg similarity index 100% rename from models/khronos-sponza/6593109234861095314.jpg rename to assets/khronos-sponza/6593109234861095314.jpg diff --git a/models/khronos-sponza/6667038893015345571.jpg b/assets/khronos-sponza/6667038893015345571.jpg similarity index 100% rename from models/khronos-sponza/6667038893015345571.jpg rename to assets/khronos-sponza/6667038893015345571.jpg diff --git a/models/khronos-sponza/6772804448157695701.jpg b/assets/khronos-sponza/6772804448157695701.jpg similarity index 100% rename from models/khronos-sponza/6772804448157695701.jpg rename to assets/khronos-sponza/6772804448157695701.jpg diff --git a/models/khronos-sponza/7056944414013900257.jpg b/assets/khronos-sponza/7056944414013900257.jpg similarity index 100% rename from models/khronos-sponza/7056944414013900257.jpg rename to assets/khronos-sponza/7056944414013900257.jpg diff --git a/models/khronos-sponza/715093869573992647.jpg b/assets/khronos-sponza/715093869573992647.jpg similarity index 100% rename from models/khronos-sponza/715093869573992647.jpg rename to assets/khronos-sponza/715093869573992647.jpg diff --git a/models/khronos-sponza/7268504077753552595.jpg b/assets/khronos-sponza/7268504077753552595.jpg similarity index 100% rename from models/khronos-sponza/7268504077753552595.jpg rename to assets/khronos-sponza/7268504077753552595.jpg diff --git a/models/khronos-sponza/7441062115984513793.jpg b/assets/khronos-sponza/7441062115984513793.jpg similarity index 100% rename from models/khronos-sponza/7441062115984513793.jpg rename to assets/khronos-sponza/7441062115984513793.jpg diff --git a/models/khronos-sponza/755318871556304029.jpg b/assets/khronos-sponza/755318871556304029.jpg similarity index 100% rename from models/khronos-sponza/755318871556304029.jpg rename to assets/khronos-sponza/755318871556304029.jpg diff --git a/models/khronos-sponza/759203620573749278.jpg b/assets/khronos-sponza/759203620573749278.jpg similarity index 100% rename from models/khronos-sponza/759203620573749278.jpg rename to assets/khronos-sponza/759203620573749278.jpg diff --git a/models/khronos-sponza/7645212358685992005.jpg b/assets/khronos-sponza/7645212358685992005.jpg similarity index 100% rename from models/khronos-sponza/7645212358685992005.jpg rename to assets/khronos-sponza/7645212358685992005.jpg diff --git a/models/khronos-sponza/7815564343179553343.jpg b/assets/khronos-sponza/7815564343179553343.jpg similarity index 100% rename from models/khronos-sponza/7815564343179553343.jpg rename to assets/khronos-sponza/7815564343179553343.jpg diff --git a/models/khronos-sponza/8006627369776289000.png b/assets/khronos-sponza/8006627369776289000.png similarity index 100% rename from models/khronos-sponza/8006627369776289000.png rename to assets/khronos-sponza/8006627369776289000.png diff --git a/models/khronos-sponza/8051790464816141987.jpg b/assets/khronos-sponza/8051790464816141987.jpg similarity index 100% rename from models/khronos-sponza/8051790464816141987.jpg rename to assets/khronos-sponza/8051790464816141987.jpg diff --git a/models/khronos-sponza/8114461559286000061.jpg b/assets/khronos-sponza/8114461559286000061.jpg similarity index 100% rename from models/khronos-sponza/8114461559286000061.jpg rename to assets/khronos-sponza/8114461559286000061.jpg diff --git a/models/khronos-sponza/8481240838833932244.jpg b/assets/khronos-sponza/8481240838833932244.jpg similarity index 100% rename from models/khronos-sponza/8481240838833932244.jpg rename to assets/khronos-sponza/8481240838833932244.jpg diff --git a/models/khronos-sponza/8503262930880235456.jpg b/assets/khronos-sponza/8503262930880235456.jpg similarity index 100% rename from models/khronos-sponza/8503262930880235456.jpg rename to assets/khronos-sponza/8503262930880235456.jpg diff --git a/models/khronos-sponza/8747919177698443163.jpg b/assets/khronos-sponza/8747919177698443163.jpg similarity index 100% rename from models/khronos-sponza/8747919177698443163.jpg rename to assets/khronos-sponza/8747919177698443163.jpg diff --git a/models/khronos-sponza/8750083169368950601.jpg b/assets/khronos-sponza/8750083169368950601.jpg similarity index 100% rename from models/khronos-sponza/8750083169368950601.jpg rename to assets/khronos-sponza/8750083169368950601.jpg diff --git a/models/khronos-sponza/8773302468495022225.jpg b/assets/khronos-sponza/8773302468495022225.jpg similarity index 100% rename from models/khronos-sponza/8773302468495022225.jpg rename to assets/khronos-sponza/8773302468495022225.jpg diff --git a/models/khronos-sponza/8783994986360286082.jpg b/assets/khronos-sponza/8783994986360286082.jpg similarity index 100% rename from models/khronos-sponza/8783994986360286082.jpg rename to assets/khronos-sponza/8783994986360286082.jpg diff --git a/models/khronos-sponza/9288698199695299068.jpg b/assets/khronos-sponza/9288698199695299068.jpg similarity index 100% rename from models/khronos-sponza/9288698199695299068.jpg rename to assets/khronos-sponza/9288698199695299068.jpg diff --git a/models/khronos-sponza/9916269861720640319.jpg b/assets/khronos-sponza/9916269861720640319.jpg similarity index 100% rename from models/khronos-sponza/9916269861720640319.jpg rename to assets/khronos-sponza/9916269861720640319.jpg diff --git a/models/khronos-sponza/Sponza.bin b/assets/khronos-sponza/Sponza.bin similarity index 100% rename from models/khronos-sponza/Sponza.bin rename to assets/khronos-sponza/Sponza.bin diff --git a/models/khronos-sponza/Sponza.gltf b/assets/khronos-sponza/Sponza.gltf similarity index 100% rename from models/khronos-sponza/Sponza.gltf rename to assets/khronos-sponza/Sponza.gltf diff --git a/models/khronos-sponza/white.png b/assets/khronos-sponza/white.png similarity index 100% rename from models/khronos-sponza/white.png rename to assets/khronos-sponza/white.png diff --git a/models/quad.obj b/assets/quad.obj similarity index 100% rename from models/quad.obj rename to assets/quad.obj diff --git a/models/smooth_vase.obj b/assets/smooth_vase.obj similarity index 100% rename from models/smooth_vase.obj rename to assets/smooth_vase.obj diff --git a/models/textures/DebugTexture.png b/assets/textures/DebugTexture.png similarity index 100% rename from models/textures/DebugTexture.png rename to assets/textures/DebugTexture.png diff --git a/models/textures/TestingHeightmap.png b/assets/textures/TestingHeightmap.png similarity index 100% rename from models/textures/TestingHeightmap.png rename to assets/textures/TestingHeightmap.png diff --git a/assets/up.png b/assets/up.png new file mode 100644 index 0000000..250991b --- /dev/null +++ b/assets/up.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:767a431ec5b5abd56d2cb59e50c515de375d5c89b20f5210a4f78880432c88f4 +size 4357 diff --git a/models/.gitattributes b/models/.gitattributes deleted file mode 100644 index 171d93b..0000000 --- a/models/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -*.obj filter=lfs diff=lfs merge=lfs -text -models/* filter=lfs diff=lfs merge=lfs -text