diff --git a/.gitignore b/.gitignore index 9ce16ba..25d1c42 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ build* *.user -data/* -data/*.jpg -data/*.mtl -data/*.obj -config.ini \ No newline at end of file +deploy/config.ini +deploy/imgui.ini +deploy/*.exe \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 375e8b8..a6bba13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,4 +25,6 @@ set(SFML_MODULES audio graphics) set(CMAKE_TEMPLATE_PATH "../CMakeTemplate") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/deploy) + include(${CMAKE_TEMPLATE_PATH}/template.cmake) diff --git a/data/consolas.png b/data/consolas.png deleted file mode 100644 index 3a54fe4..0000000 Binary files a/data/consolas.png and /dev/null differ diff --git a/data/consolas.fnt b/deploy/data/consolas.fnt similarity index 100% rename from data/consolas.fnt rename to deploy/data/consolas.fnt diff --git a/deploy/data/consolas.png b/deploy/data/consolas.png new file mode 100644 index 0000000..bf9244e --- /dev/null +++ b/deploy/data/consolas.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:806d86997b3a4d54945cde75c19469cc82f566beeecdb5260f15acbe7786dbec +size 19039 diff --git a/deploy/data/leather.jpg b/deploy/data/leather.jpg new file mode 100644 index 0000000..929af90 --- /dev/null +++ b/deploy/data/leather.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdfb67810a152660d7ddaa702e1bf8ead86cefe3f44cef45f97b34f2f8d8e00b +size 9673 diff --git a/deploy/data/sponza.mtl b/deploy/data/sponza.mtl new file mode 100644 index 0000000..3f182bd --- /dev/null +++ b/deploy/data/sponza.mtl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd740556a0e8e853532bb3df7642fc9f5f0f2a409f6a0831148db304ad445b1c +size 5295 diff --git a/deploy/data/sponza.obj b/deploy/data/sponza.obj new file mode 100644 index 0000000..9cc7633 --- /dev/null +++ b/deploy/data/sponza.obj @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b5e8fe1f9b3f26241cd50659b32863f0f388c0c53f5fcc85cc37ee354d41d84 +size 26426188 diff --git a/deploy/data/sponza/background.jpg b/deploy/data/sponza/background.jpg new file mode 100644 index 0000000..4654d33 --- /dev/null +++ b/deploy/data/sponza/background.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71c21508d528da03a08390f6788df085b5ee214bdc537eb28c926bc6f80b4bed +size 221460 diff --git a/deploy/data/sponza/background_ddn.jpg b/deploy/data/sponza/background_ddn.jpg new file mode 100644 index 0000000..f7eb677 --- /dev/null +++ b/deploy/data/sponza/background_ddn.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a144a818ee28358575c39958c5c49338c5fa24d3a60c0653cd93a96c6488a73 +size 181441 diff --git a/deploy/data/sponza/chain_texture.jpg b/deploy/data/sponza/chain_texture.jpg new file mode 100644 index 0000000..c704e82 --- /dev/null +++ b/deploy/data/sponza/chain_texture.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84bc3ae33b309adda45942f04933e5d8ffc31711217afb613dbf3cee4d47b4bb +size 60520 diff --git a/deploy/data/sponza/chain_texture_ddn.jpg b/deploy/data/sponza/chain_texture_ddn.jpg new file mode 100644 index 0000000..4068d66 --- /dev/null +++ b/deploy/data/sponza/chain_texture_ddn.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d795ffbf233015c010b723095a687a7ba1b8477ee85c384b90ad34ee3838cfbb +size 32648 diff --git a/deploy/data/sponza/chain_texture_mask.jpg b/deploy/data/sponza/chain_texture_mask.jpg new file mode 100644 index 0000000..51f7fc9 --- /dev/null +++ b/deploy/data/sponza/chain_texture_mask.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f07247d9c12242fe38695e64ec3ad551dfd8013f1ec95e419c3223301139807d +size 24210 diff --git a/deploy/data/sponza/lion.jpg b/deploy/data/sponza/lion.jpg new file mode 100644 index 0000000..a8d621c --- /dev/null +++ b/deploy/data/sponza/lion.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a02775b85f91bb4066845e6a72d6b898ba08f53a7bff467fe605c59d0469363e +size 373716 diff --git a/deploy/data/sponza/lion_ddn.jpg b/deploy/data/sponza/lion_ddn.jpg new file mode 100644 index 0000000..60395ea --- /dev/null +++ b/deploy/data/sponza/lion_ddn.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ee30e192ba5ee60a93f1d0c1d68f1c5bca32f503a6d1be4b80515f997da448d +size 252023 diff --git a/deploy/data/sponza/spnza_bricks_a_ddn.jpg b/deploy/data/sponza/spnza_bricks_a_ddn.jpg new file mode 100644 index 0000000..be901cf --- /dev/null +++ b/deploy/data/sponza/spnza_bricks_a_ddn.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede75922579030cc5d89e1ef0920137bb7ef75147e511e95c91d5593da6c4a87 +size 159314 diff --git a/deploy/data/sponza/spnza_bricks_a_diff.jpg b/deploy/data/sponza/spnza_bricks_a_diff.jpg new file mode 100644 index 0000000..52f6b81 --- /dev/null +++ b/deploy/data/sponza/spnza_bricks_a_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e4317d554e56a4a368da51eb4735a4afa5b5ab944cd4fac3cff1ea2ec920c6a +size 366857 diff --git a/deploy/data/sponza/spnza_bricks_a_spec.jpg b/deploy/data/sponza/spnza_bricks_a_spec.jpg new file mode 100644 index 0000000..2f8a15e --- /dev/null +++ b/deploy/data/sponza/spnza_bricks_a_spec.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8218f69bb29cdbb0fb0eb2befb58fc4e0619fec18a5bd00a0f62e8dcbf221fb4 +size 296434 diff --git a/deploy/data/sponza/sponza_arch_ddn.jpg b/deploy/data/sponza/sponza_arch_ddn.jpg new file mode 100644 index 0000000..b53be67 --- /dev/null +++ b/deploy/data/sponza/sponza_arch_ddn.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9924b75178787cbaec0be13fc214f9913102604c775e182ceb15754387ba3b5 +size 98854 diff --git a/deploy/data/sponza/sponza_arch_diff.jpg b/deploy/data/sponza/sponza_arch_diff.jpg new file mode 100644 index 0000000..ee3e504 --- /dev/null +++ b/deploy/data/sponza/sponza_arch_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:165a93ac306ec005028d5e981535b185e96920e5647cf146a4b3b186da4dba7a +size 338608 diff --git a/deploy/data/sponza/sponza_arch_spec.jpg b/deploy/data/sponza/sponza_arch_spec.jpg new file mode 100644 index 0000000..6e0ae78 --- /dev/null +++ b/deploy/data/sponza/sponza_arch_spec.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4378cfeda2d5065bbf68367eb570608c7ac852d4130a164cafec76a7c4c9fbfa +size 288147 diff --git a/deploy/data/sponza/sponza_ceiling_a_diff.jpg b/deploy/data/sponza/sponza_ceiling_a_diff.jpg new file mode 100644 index 0000000..c49ea76 --- /dev/null +++ b/deploy/data/sponza/sponza_ceiling_a_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c0837816e645b4b68c5ffb2781fcabef759142e6413f147d72b3d4f75d29150 +size 305420 diff --git a/deploy/data/sponza/sponza_ceiling_a_spec.jpg b/deploy/data/sponza/sponza_ceiling_a_spec.jpg new file mode 100644 index 0000000..dc74e26 --- /dev/null +++ b/deploy/data/sponza/sponza_ceiling_a_spec.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d73c686345e17bd24bba7a426ccf9670c69c3c0204bdc55012aa06c0a6ffca8 +size 303721 diff --git a/deploy/data/sponza/sponza_column_a_ddn.jpg b/deploy/data/sponza/sponza_column_a_ddn.jpg new file mode 100644 index 0000000..813e0fe --- /dev/null +++ b/deploy/data/sponza/sponza_column_a_ddn.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe102abf9b3528cf865467509ec84f410adf49ddd94a7aad798146ae72024c82 +size 252886 diff --git a/deploy/data/sponza/sponza_column_a_diff.jpg b/deploy/data/sponza/sponza_column_a_diff.jpg new file mode 100644 index 0000000..96cbcf5 --- /dev/null +++ b/deploy/data/sponza/sponza_column_a_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28d85264f4af85047ea2a0502ab19b1639c0983ec6d0415fc20b6badb4387ab5 +size 336229 diff --git a/deploy/data/sponza/sponza_column_a_spec.jpg b/deploy/data/sponza/sponza_column_a_spec.jpg new file mode 100644 index 0000000..39a2108 --- /dev/null +++ b/deploy/data/sponza/sponza_column_a_spec.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d9293b8c006a4bff56f2f931b3f455cbb7dc2afc7ff7185c28c75f6713fd8fb +size 317628 diff --git a/deploy/data/sponza/sponza_column_b_ddn.jpg b/deploy/data/sponza/sponza_column_b_ddn.jpg new file mode 100644 index 0000000..11cab3b --- /dev/null +++ b/deploy/data/sponza/sponza_column_b_ddn.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26deb98e9355c876a6954340c7f6a1152b96e82f7cbff648f6e805e7482445a1 +size 299910 diff --git a/deploy/data/sponza/sponza_column_b_diff.jpg b/deploy/data/sponza/sponza_column_b_diff.jpg new file mode 100644 index 0000000..ea33f1b --- /dev/null +++ b/deploy/data/sponza/sponza_column_b_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fada637fa1690c6b7ee7418cc8a32dafb99eee0e0322c935fbb4803753199307 +size 416387 diff --git a/deploy/data/sponza/sponza_column_b_spec.jpg b/deploy/data/sponza/sponza_column_b_spec.jpg new file mode 100644 index 0000000..54182d4 --- /dev/null +++ b/deploy/data/sponza/sponza_column_b_spec.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca3d5b741f7597c447abbaa4e1a4133661f83484855a03f99ea2053505e09cfb +size 317559 diff --git a/deploy/data/sponza/sponza_column_c_ddn.jpg b/deploy/data/sponza/sponza_column_c_ddn.jpg new file mode 100644 index 0000000..b6a21eb --- /dev/null +++ b/deploy/data/sponza/sponza_column_c_ddn.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e39b23216a8f796f572e3237a43fc33fa1b9f3c2d43dd293e4bc904a52b7fed +size 321554 diff --git a/deploy/data/sponza/sponza_column_c_diff.jpg b/deploy/data/sponza/sponza_column_c_diff.jpg new file mode 100644 index 0000000..dae7f45 --- /dev/null +++ b/deploy/data/sponza/sponza_column_c_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f179f0279f6904de4bf74e5438426995621bf6e1178ea14b747ad8ebe1f4de8d +size 441261 diff --git a/deploy/data/sponza/sponza_column_c_spec.jpg b/deploy/data/sponza/sponza_column_c_spec.jpg new file mode 100644 index 0000000..0117623 --- /dev/null +++ b/deploy/data/sponza/sponza_column_c_spec.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27794665e72f3ac577d95bc47d51d27d7d51d6a668c761b891013918d8504f7a +size 364839 diff --git a/deploy/data/sponza/sponza_curtain_blue_diff.jpg b/deploy/data/sponza/sponza_curtain_blue_diff.jpg new file mode 100644 index 0000000..bba5e07 --- /dev/null +++ b/deploy/data/sponza/sponza_curtain_blue_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1b6094ca8aa88d824a01c1115c029138d612b5b046ffafc7a998c2f732151ac +size 2131808 diff --git a/deploy/data/sponza/sponza_curtain_diff.jpg b/deploy/data/sponza/sponza_curtain_diff.jpg new file mode 100644 index 0000000..51db9bf --- /dev/null +++ b/deploy/data/sponza/sponza_curtain_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:239e87923d98e7d722c08290f567633f817b1868eaa4c2eb0fe229c3192b19b1 +size 2047994 diff --git a/deploy/data/sponza/sponza_curtain_green_diff.jpg b/deploy/data/sponza/sponza_curtain_green_diff.jpg new file mode 100644 index 0000000..fcea1c7 --- /dev/null +++ b/deploy/data/sponza/sponza_curtain_green_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2df9ab155f39ff901d41bdcab0e2ef5a8c591ab7cf936021964f51fb5fdcdffd +size 1982011 diff --git a/deploy/data/sponza/sponza_details_diff.jpg b/deploy/data/sponza/sponza_details_diff.jpg new file mode 100644 index 0000000..bccaf42 --- /dev/null +++ b/deploy/data/sponza/sponza_details_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bbb9625e7b64669827272575d7ec3a144c419edaa7ec621478457538a23be79 +size 201736 diff --git a/deploy/data/sponza/sponza_details_spec.jpg b/deploy/data/sponza/sponza_details_spec.jpg new file mode 100644 index 0000000..7f4f39d --- /dev/null +++ b/deploy/data/sponza/sponza_details_spec.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03db4c5213f000078ec35f9ca404e99e026a9016d8b403eed66b47cbeb40f81d +size 301578 diff --git a/deploy/data/sponza/sponza_fabric_blue_diff.jpg b/deploy/data/sponza/sponza_fabric_blue_diff.jpg new file mode 100644 index 0000000..00a12c4 --- /dev/null +++ b/deploy/data/sponza/sponza_fabric_blue_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d923b7e955cf16b910ef4d5df33f312597ec9d6dd94866a5863ea3a9454dfd52 +size 430283 diff --git a/deploy/data/sponza/sponza_fabric_diff.jpg b/deploy/data/sponza/sponza_fabric_diff.jpg new file mode 100644 index 0000000..2f7091b --- /dev/null +++ b/deploy/data/sponza/sponza_fabric_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0a448878d89ddb8035242ab5452af1ffc8d6979b4f10b343551c9389b2c6097 +size 466634 diff --git a/deploy/data/sponza/sponza_fabric_green_diff.jpg b/deploy/data/sponza/sponza_fabric_green_diff.jpg new file mode 100644 index 0000000..ab67231 --- /dev/null +++ b/deploy/data/sponza/sponza_fabric_green_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c41642a8e47950d92abaafc6de5f8b8374d16f3868a27549082cf1fe9724735b +size 435794 diff --git a/deploy/data/sponza/sponza_fabric_spec.jpg b/deploy/data/sponza/sponza_fabric_spec.jpg new file mode 100644 index 0000000..90b1c4a --- /dev/null +++ b/deploy/data/sponza/sponza_fabric_spec.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ee375ff556647ab24725b210eed05f99caaa1218a36f3a18efc6fa94f570176 +size 418902 diff --git a/deploy/data/sponza/sponza_flagpole_diff.jpg b/deploy/data/sponza/sponza_flagpole_diff.jpg new file mode 100644 index 0000000..67c9c15 --- /dev/null +++ b/deploy/data/sponza/sponza_flagpole_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e17023ab9879ecde5b216cf34c1ef399d20c58cc57a5a254d7fa9eb2e4e04785 +size 248780 diff --git a/deploy/data/sponza/sponza_flagpole_spec.jpg b/deploy/data/sponza/sponza_flagpole_spec.jpg new file mode 100644 index 0000000..1f1e7ad --- /dev/null +++ b/deploy/data/sponza/sponza_flagpole_spec.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b36b4e13e770fe9e4920b091918a3e5c6e62e40dda9b595321806124fa0df49 +size 360542 diff --git a/deploy/data/sponza/sponza_floor_a_ddn.jpg b/deploy/data/sponza/sponza_floor_a_ddn.jpg new file mode 100644 index 0000000..ee33e8f --- /dev/null +++ b/deploy/data/sponza/sponza_floor_a_ddn.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:915b62499d589d04b4146ff39d47f1b8e154bcc98dd798ddb7c23809683500bb +size 102390 diff --git a/deploy/data/sponza/sponza_floor_a_diff.jpg b/deploy/data/sponza/sponza_floor_a_diff.jpg new file mode 100644 index 0000000..ef5f60e --- /dev/null +++ b/deploy/data/sponza/sponza_floor_a_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1ebc760034fe7be2f92f3a1c5ab25d20a182c83f442c4f7f8501b5181b99b6e +size 344863 diff --git a/deploy/data/sponza/sponza_floor_a_spec.jpg b/deploy/data/sponza/sponza_floor_a_spec.jpg new file mode 100644 index 0000000..76429e4 --- /dev/null +++ b/deploy/data/sponza/sponza_floor_a_spec.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:087c3f6399daf515500268db4cb2bdd9bb5f999c5a476175b67dc8aff892fa36 +size 224829 diff --git a/deploy/data/sponza/sponza_roof_diff.jpg b/deploy/data/sponza/sponza_roof_diff.jpg new file mode 100644 index 0000000..e8f6a74 --- /dev/null +++ b/deploy/data/sponza/sponza_roof_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8c53ef97c23706f62df7088d01b56b2ae608f33eba44898a32761092ef2b4e0 +size 552593 diff --git a/deploy/data/sponza/sponza_thorn_ddn.jpg b/deploy/data/sponza/sponza_thorn_ddn.jpg new file mode 100644 index 0000000..8e1a7c3 --- /dev/null +++ b/deploy/data/sponza/sponza_thorn_ddn.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14b7dcb2728c3c19f6e7fd60005ff89f32fafbf294c6a0c484faf7c10c23dd4e +size 41072 diff --git a/deploy/data/sponza/sponza_thorn_diff.jpg b/deploy/data/sponza/sponza_thorn_diff.jpg new file mode 100644 index 0000000..6df969d --- /dev/null +++ b/deploy/data/sponza/sponza_thorn_diff.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d9bafc41554f6caae32909049a12b0ace082cba46402314ab5cbd9ba682406c +size 82425 diff --git a/deploy/data/sponza/sponza_thorn_mask.jpg b/deploy/data/sponza/sponza_thorn_mask.jpg new file mode 100644 index 0000000..66be189 --- /dev/null +++ b/deploy/data/sponza/sponza_thorn_mask.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55d77849652745d17d6b663222493f5390c199659a9f0f0ff2b93123906b7e1a +size 113218 diff --git a/deploy/data/sponza/vase_ddn.jpg b/deploy/data/sponza/vase_ddn.jpg new file mode 100644 index 0000000..70bedf1 --- /dev/null +++ b/deploy/data/sponza/vase_ddn.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30d24dd383b45ca98d26ea8a3c273b59108cf8e7423d4fc2ac93a7b5c19575d6 +size 418483 diff --git a/deploy/data/sponza/vase_dif.jpg b/deploy/data/sponza/vase_dif.jpg new file mode 100644 index 0000000..27c3ff1 --- /dev/null +++ b/deploy/data/sponza/vase_dif.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90453a5d13cce6abe874181c78b12f1d189f63564957c9b55f240e5e483c3d25 +size 341785 diff --git a/deploy/data/sponza/vase_hanging.jpg b/deploy/data/sponza/vase_hanging.jpg new file mode 100644 index 0000000..1b76c28 --- /dev/null +++ b/deploy/data/sponza/vase_hanging.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55df8c4b921dd60ec9a164c28b01480def625989e8badb33f195663c44d29320 +size 191476 diff --git a/deploy/data/sponza/vase_plant.jpg b/deploy/data/sponza/vase_plant.jpg new file mode 100644 index 0000000..2ac4b13 --- /dev/null +++ b/deploy/data/sponza/vase_plant.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6618e5e4c1f5768cdf8eec7e3180cbc81b2fb8ec00cd734696db65ed9885ea24 +size 182011 diff --git a/deploy/data/sponza/vase_plant_mask.jpg b/deploy/data/sponza/vase_plant_mask.jpg new file mode 100644 index 0000000..c56379a --- /dev/null +++ b/deploy/data/sponza/vase_plant_mask.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfe8646f47d00f3c8aed89d11af4714226cacdc5d8d1a348ec09a384535cf67d +size 105475 diff --git a/deploy/data/sponza/vase_round.jpg b/deploy/data/sponza/vase_round.jpg new file mode 100644 index 0000000..5c9f7b4 --- /dev/null +++ b/deploy/data/sponza/vase_round.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e03fb62b74f59e98b1e9d1a62cabfd385fa36a91c38ce6976bedc7e7bc5ff027 +size 367075 diff --git a/deploy/data/sponza/vase_round_ddn.jpg b/deploy/data/sponza/vase_round_ddn.jpg new file mode 100644 index 0000000..50195a4 --- /dev/null +++ b/deploy/data/sponza/vase_round_ddn.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c27f89c31930664d8b3d8a9dfa0804eb08a6fb3f18b75b9014f11b653b67b946 +size 108210 diff --git a/deploy/data/sponza/vase_round_spec.jpg b/deploy/data/sponza/vase_round_spec.jpg new file mode 100644 index 0000000..873f140 --- /dev/null +++ b/deploy/data/sponza/vase_round_spec.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86599ab6e0d1fa21bc6ab25e21ea913328ff7ce6eb8450cebf9194c93aec6fe3 +size 271638 diff --git a/deploy/data/steel.jpg b/deploy/data/steel.jpg new file mode 100644 index 0000000..d57cafc --- /dev/null +++ b/deploy/data/steel.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40ba8f1ef59a9cfda99149b0aca367e9211f130da99a9fdfc547cedfa1a4bcb4 +size 6474 diff --git a/deploy/data/sword.mtl b/deploy/data/sword.mtl new file mode 100644 index 0000000..c5cf077 --- /dev/null +++ b/deploy/data/sword.mtl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4a6427eb082c3e19637ebdc5fb49699cdbc6a9f7e5a0b0a814036794779bc10 +size 100 diff --git a/deploy/data/sword.obj b/deploy/data/sword.obj new file mode 100644 index 0000000..8c6e836 --- /dev/null +++ b/deploy/data/sword.obj @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d042e9624b5a1ca7e401cb7a87a1c2b225afba1929e3cb6f5de8d2668c53966 +size 63378 diff --git a/deploy/data/texture.png b/deploy/data/texture.png new file mode 100644 index 0000000..2f15494 --- /dev/null +++ b/deploy/data/texture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02149b5fcd46995d3563e3c2c9c1c55f1b3427cef2017c7dc1f06de168242039 +size 1759 diff --git a/deploy/data/woodbox.jpg b/deploy/data/woodbox.jpg new file mode 100644 index 0000000..3564171 --- /dev/null +++ b/deploy/data/woodbox.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae7a152959a26719133063e09ea578786d2265c3bcd29ab9743ff6efb3277f2f +size 9286 diff --git a/deploy/libstdc++-6.dll b/deploy/libstdc++-6.dll new file mode 100644 index 0000000..6d3d90e --- /dev/null +++ b/deploy/libstdc++-6.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:544d488fcfd76749c5ef2cd6bf9f73cc9fe59a86a819d369d710cca6e43cf4b1 +size 1540622 diff --git a/deploy/openal32.dll b/deploy/openal32.dll new file mode 100644 index 0000000..0170f9a --- /dev/null +++ b/deploy/openal32.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:866e65bcdba3161c5f1d0300d4ae1a0b663511ba88993d442c5f93f570258d11 +size 423936 diff --git a/src/sparrowshell/sparrowshell.cpp b/src/sparrowshell/sparrowshell.cpp index 91976d7..758c4bf 100644 --- a/src/sparrowshell/sparrowshell.cpp +++ b/src/sparrowshell/sparrowshell.cpp @@ -33,7 +33,7 @@ SparrowShell::SparrowShell(sf::Window* window): setPosition(glm::vec2(0)); setVisible(false); - Font* fonte_des_neiges = Loader::loadFont("../data/consolas.fnt","../data/consolas.png"); + Font* fonte_des_neiges = Loader::loadFont("data/consolas.fnt","consolas.png"); RESOURCE_ADD(fonte_des_neiges,Font,"shellfont"); //Create mesh for background diff --git a/src/test/main.cpp b/src/test/main.cpp index f75ff2a..4a59b10 100644 --- a/src/test/main.cpp +++ b/src/test/main.cpp @@ -118,9 +118,9 @@ void generateSponza(SceneTree *scene, btDiscreteDynamicsWorld *world) { GraphicalContainerNode* sponzaContainer = new GraphicalContainerNode(); scene->getRootObject()->addChild(sponzaContainer); - Loader::setTexDirectory("../data/sponza/"); + Loader::setTexDirectory("data/sponza/"); std::vector meshes = Loader::loadMesh("sponza.obj"); - Loader::setTexDirectory("../data/"); + Loader::setTexDirectory("data/"); for(Mesh* m : meshes) { if(m->getName().find("fabric") != std::string::npos) @@ -157,7 +157,7 @@ struct Config : public Serializable static Config* load() { std::fstream configFile; - configFile.open("../config.ini", std::ios_base::in); + configFile.open("config.ini", std::ios_base::in); Config *conf; if(configFile.is_open()) { @@ -174,7 +174,7 @@ struct Config : public Serializable conf = new Config(); ObjectSaver saver; saver.addObject(conf); - configFile.open("../config.ini", std::ios_base::out); + configFile.open("config.ini", std::ios_base::out); saver.saveAscii(configFile); configFile.close(); return conf; @@ -290,9 +290,9 @@ int main(){ Config* config = Config::load(); Engine engine; - Loader::setObjDirectory("../data/"); - Loader::setMtlDirectory("../data/"); - Loader::setTexDirectory("../data/"); + Loader::setObjDirectory("data/"); + Loader::setMtlDirectory("data/"); + Loader::setTexDirectory("data/"); // this creates the opengl context // the opengl context must exist before any opengl class is used (texture, pipeline, etc..) @@ -423,9 +423,9 @@ int main(){ } // loaders tests - Loader::setObjDirectory("../data/"); - Loader::setMtlDirectory("../data/"); - Loader::setTexDirectory("../data/"); + Loader::setObjDirectory("data/"); + Loader::setMtlDirectory("data/"); + Loader::setTexDirectory("data/"); std::vector meshes = Loader::loadMesh("sword.obj"); */