From f57d7222516d60e06384fff9be918e968a20c476 Mon Sep 17 00:00:00 2001 From: Anselme Date: Sun, 30 Jul 2017 14:19:12 +0200 Subject: [PATCH] created deploy folder, added resources with git lfs --- .gitignore | 8 +++---- CMakeLists.txt | 2 ++ data/consolas.png | Bin 19039 -> 0 bytes {data => deploy/data}/consolas.fnt | 0 deploy/data/consolas.png | 3 +++ deploy/data/leather.jpg | 3 +++ deploy/data/sponza.mtl | 3 +++ deploy/data/sponza.obj | 3 +++ deploy/data/sponza/background.jpg | 3 +++ deploy/data/sponza/background_ddn.jpg | 3 +++ deploy/data/sponza/chain_texture.jpg | 3 +++ deploy/data/sponza/chain_texture_ddn.jpg | 3 +++ deploy/data/sponza/chain_texture_mask.jpg | 3 +++ deploy/data/sponza/lion.jpg | 3 +++ deploy/data/sponza/lion_ddn.jpg | 3 +++ deploy/data/sponza/spnza_bricks_a_ddn.jpg | 3 +++ deploy/data/sponza/spnza_bricks_a_diff.jpg | 3 +++ deploy/data/sponza/spnza_bricks_a_spec.jpg | 3 +++ deploy/data/sponza/sponza_arch_ddn.jpg | 3 +++ deploy/data/sponza/sponza_arch_diff.jpg | 3 +++ deploy/data/sponza/sponza_arch_spec.jpg | 3 +++ deploy/data/sponza/sponza_ceiling_a_diff.jpg | 3 +++ deploy/data/sponza/sponza_ceiling_a_spec.jpg | 3 +++ deploy/data/sponza/sponza_column_a_ddn.jpg | 3 +++ deploy/data/sponza/sponza_column_a_diff.jpg | 3 +++ deploy/data/sponza/sponza_column_a_spec.jpg | 3 +++ deploy/data/sponza/sponza_column_b_ddn.jpg | 3 +++ deploy/data/sponza/sponza_column_b_diff.jpg | 3 +++ deploy/data/sponza/sponza_column_b_spec.jpg | 3 +++ deploy/data/sponza/sponza_column_c_ddn.jpg | 3 +++ deploy/data/sponza/sponza_column_c_diff.jpg | 3 +++ deploy/data/sponza/sponza_column_c_spec.jpg | 3 +++ .../data/sponza/sponza_curtain_blue_diff.jpg | 3 +++ deploy/data/sponza/sponza_curtain_diff.jpg | 3 +++ .../data/sponza/sponza_curtain_green_diff.jpg | 3 +++ deploy/data/sponza/sponza_details_diff.jpg | 3 +++ deploy/data/sponza/sponza_details_spec.jpg | 3 +++ .../data/sponza/sponza_fabric_blue_diff.jpg | 3 +++ deploy/data/sponza/sponza_fabric_diff.jpg | 3 +++ .../data/sponza/sponza_fabric_green_diff.jpg | 3 +++ deploy/data/sponza/sponza_fabric_spec.jpg | 3 +++ deploy/data/sponza/sponza_flagpole_diff.jpg | 3 +++ deploy/data/sponza/sponza_flagpole_spec.jpg | 3 +++ deploy/data/sponza/sponza_floor_a_ddn.jpg | 3 +++ deploy/data/sponza/sponza_floor_a_diff.jpg | 3 +++ deploy/data/sponza/sponza_floor_a_spec.jpg | 3 +++ deploy/data/sponza/sponza_roof_diff.jpg | 3 +++ deploy/data/sponza/sponza_thorn_ddn.jpg | 3 +++ deploy/data/sponza/sponza_thorn_diff.jpg | 3 +++ deploy/data/sponza/sponza_thorn_mask.jpg | 3 +++ deploy/data/sponza/vase_ddn.jpg | 3 +++ deploy/data/sponza/vase_dif.jpg | 3 +++ deploy/data/sponza/vase_hanging.jpg | 3 +++ deploy/data/sponza/vase_plant.jpg | 3 +++ deploy/data/sponza/vase_plant_mask.jpg | 3 +++ deploy/data/sponza/vase_round.jpg | 3 +++ deploy/data/sponza/vase_round_ddn.jpg | 3 +++ deploy/data/sponza/vase_round_spec.jpg | 3 +++ deploy/data/steel.jpg | 3 +++ deploy/data/sword.mtl | 3 +++ deploy/data/sword.obj | 3 +++ deploy/data/texture.png | 3 +++ deploy/data/woodbox.jpg | 3 +++ deploy/libstdc++-6.dll | 3 +++ deploy/openal32.dll | 3 +++ src/sparrowshell/sparrowshell.cpp | 2 +- src/test/main.cpp | 20 +++++++++--------- 67 files changed, 199 insertions(+), 16 deletions(-) delete mode 100644 data/consolas.png rename {data => deploy/data}/consolas.fnt (100%) create mode 100644 deploy/data/consolas.png create mode 100644 deploy/data/leather.jpg create mode 100644 deploy/data/sponza.mtl create mode 100644 deploy/data/sponza.obj create mode 100644 deploy/data/sponza/background.jpg create mode 100644 deploy/data/sponza/background_ddn.jpg create mode 100644 deploy/data/sponza/chain_texture.jpg create mode 100644 deploy/data/sponza/chain_texture_ddn.jpg create mode 100644 deploy/data/sponza/chain_texture_mask.jpg create mode 100644 deploy/data/sponza/lion.jpg create mode 100644 deploy/data/sponza/lion_ddn.jpg create mode 100644 deploy/data/sponza/spnza_bricks_a_ddn.jpg create mode 100644 deploy/data/sponza/spnza_bricks_a_diff.jpg create mode 100644 deploy/data/sponza/spnza_bricks_a_spec.jpg create mode 100644 deploy/data/sponza/sponza_arch_ddn.jpg create mode 100644 deploy/data/sponza/sponza_arch_diff.jpg create mode 100644 deploy/data/sponza/sponza_arch_spec.jpg create mode 100644 deploy/data/sponza/sponza_ceiling_a_diff.jpg create mode 100644 deploy/data/sponza/sponza_ceiling_a_spec.jpg create mode 100644 deploy/data/sponza/sponza_column_a_ddn.jpg create mode 100644 deploy/data/sponza/sponza_column_a_diff.jpg create mode 100644 deploy/data/sponza/sponza_column_a_spec.jpg create mode 100644 deploy/data/sponza/sponza_column_b_ddn.jpg create mode 100644 deploy/data/sponza/sponza_column_b_diff.jpg create mode 100644 deploy/data/sponza/sponza_column_b_spec.jpg create mode 100644 deploy/data/sponza/sponza_column_c_ddn.jpg create mode 100644 deploy/data/sponza/sponza_column_c_diff.jpg create mode 100644 deploy/data/sponza/sponza_column_c_spec.jpg create mode 100644 deploy/data/sponza/sponza_curtain_blue_diff.jpg create mode 100644 deploy/data/sponza/sponza_curtain_diff.jpg create mode 100644 deploy/data/sponza/sponza_curtain_green_diff.jpg create mode 100644 deploy/data/sponza/sponza_details_diff.jpg create mode 100644 deploy/data/sponza/sponza_details_spec.jpg create mode 100644 deploy/data/sponza/sponza_fabric_blue_diff.jpg create mode 100644 deploy/data/sponza/sponza_fabric_diff.jpg create mode 100644 deploy/data/sponza/sponza_fabric_green_diff.jpg create mode 100644 deploy/data/sponza/sponza_fabric_spec.jpg create mode 100644 deploy/data/sponza/sponza_flagpole_diff.jpg create mode 100644 deploy/data/sponza/sponza_flagpole_spec.jpg create mode 100644 deploy/data/sponza/sponza_floor_a_ddn.jpg create mode 100644 deploy/data/sponza/sponza_floor_a_diff.jpg create mode 100644 deploy/data/sponza/sponza_floor_a_spec.jpg create mode 100644 deploy/data/sponza/sponza_roof_diff.jpg create mode 100644 deploy/data/sponza/sponza_thorn_ddn.jpg create mode 100644 deploy/data/sponza/sponza_thorn_diff.jpg create mode 100644 deploy/data/sponza/sponza_thorn_mask.jpg create mode 100644 deploy/data/sponza/vase_ddn.jpg create mode 100644 deploy/data/sponza/vase_dif.jpg create mode 100644 deploy/data/sponza/vase_hanging.jpg create mode 100644 deploy/data/sponza/vase_plant.jpg create mode 100644 deploy/data/sponza/vase_plant_mask.jpg create mode 100644 deploy/data/sponza/vase_round.jpg create mode 100644 deploy/data/sponza/vase_round_ddn.jpg create mode 100644 deploy/data/sponza/vase_round_spec.jpg create mode 100644 deploy/data/steel.jpg create mode 100644 deploy/data/sword.mtl create mode 100644 deploy/data/sword.obj create mode 100644 deploy/data/texture.png create mode 100644 deploy/data/woodbox.jpg create mode 100644 deploy/libstdc++-6.dll create mode 100644 deploy/openal32.dll 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 3a54fe4e5b5764d76aa7da948a56e8d19626e62d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19039 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 ioH%jf#EFws<^Kb-f`2QL8uJqX0000getRootObject()->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"); */