From feb4238165ead81d9a37f5cabeb0b2019df16fa7 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Thu, 18 May 2023 21:51:22 -0700 Subject: [PATCH] XML structured much better --- src/dawnliminal/CMakeLists.txt | 12 ++++++------ src/dawntools/prefabtool/PrefabTool.cpp | 2 +- src/dawntools/scenetool/SceneTool.cpp | 2 +- src/dawntools/vnscenetool/VNSceneTool.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/dawnliminal/CMakeLists.txt b/src/dawnliminal/CMakeLists.txt index 8647f1d9..5fe93e20 100644 --- a/src/dawnliminal/CMakeLists.txt +++ b/src/dawnliminal/CMakeLists.txt @@ -18,13 +18,13 @@ add_subdirectory(save) # Assets set(LIMINAL_ASSETS_DIR ${DAWN_ASSETS_DIR}/games/liminal) -tool_scene(${LIMINAL_ASSETS_DIR}/scenes/scene-base.xml) -tool_scene(${LIMINAL_ASSETS_DIR}/scenes/scene-extend.xml) -tool_vnscene(${LIMINAL_ASSETS_DIR}/test.xml) -tool_prefab(${LIMINAL_ASSETS_DIR}/VNTextbox.xml) tool_truetype(font_main ${DAWN_ASSETS_DIR}/ark-pixel.ttf) +tool_texture(texture_eth ${LIMINAL_ASSETS_DIR}/textures/eth.png) +tool_texture(texture_border ${LIMINAL_ASSETS_DIR}/textures/texture_test.png) + +tool_scene(${LIMINAL_ASSETS_DIR}/scenes/SceneBase.xml) +tool_vnscene(${LIMINAL_ASSETS_DIR}/scenes/VNSceneTest.xml) tool_prefab(${LIMINAL_ASSETS_DIR}/prefabs/EthPrefab.xml) -tool_texture(texture_eth ${LIMINAL_ASSETS_DIR}/textures/eth.png) -tool_texture(texture_border ${LIMINAL_ASSETS_DIR}/textures/texture_test.png) \ No newline at end of file +tool_prefab(${LIMINAL_ASSETS_DIR}/prefabs/VNTextbox.xml) \ No newline at end of file diff --git a/src/dawntools/prefabtool/PrefabTool.cpp b/src/dawntools/prefabtool/PrefabTool.cpp index 0bc9ad7c..decf7219 100644 --- a/src/dawntools/prefabtool/PrefabTool.cpp +++ b/src/dawntools/prefabtool/PrefabTool.cpp @@ -18,7 +18,7 @@ std::map PrefabTool::getOptionalFlags() { int32_t PrefabTool::start() { File input = File(flags["input"]); if(!input.exists()) { - std::cout << "Input file does not exist!" << std::endl; + std::cout << "Input file " + input.filename + " does not exist!" << std::endl; return 1; } diff --git a/src/dawntools/scenetool/SceneTool.cpp b/src/dawntools/scenetool/SceneTool.cpp index b780bb41..d0eda0ee 100644 --- a/src/dawntools/scenetool/SceneTool.cpp +++ b/src/dawntools/scenetool/SceneTool.cpp @@ -18,7 +18,7 @@ std::map SceneTool::getOptionalFlags() { int32_t SceneTool::start() { File input = File(flags["input"]); if(!input.exists()) { - std::cout << "Input file does not exist!" << std::endl; + std::cout << "Input file " + input.filename + " does not exist!" << std::endl; return 1; } diff --git a/src/dawntools/vnscenetool/VNSceneTool.cpp b/src/dawntools/vnscenetool/VNSceneTool.cpp index 23fac8b2..8745284e 100644 --- a/src/dawntools/vnscenetool/VNSceneTool.cpp +++ b/src/dawntools/vnscenetool/VNSceneTool.cpp @@ -18,7 +18,7 @@ std::map VNSceneTool::getOptionalFlags() { int32_t VNSceneTool::start() { File input = File(flags["input"]); if(!input.exists()) { - std::cout << "Input file does not exist!" << std::endl; + std::cout << "Input file " + input.filename + " does not exist!" << std::endl; return 1; }