From cbf1246e2f5b5dcca5be222652d1d2ed4ab424d2 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 21 May 2022 17:49:24 -0400 Subject: [PATCH] Change some references to "data" to the new "game" directory This isn't comprehensive, but will get some things to work. --- example/src/example.cpp | 2 +- platforms/sdl/CMakeLists.txt | 6 +++--- tools/common/src/commoneditor.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/example/src/example.cpp b/example/src/example.cpp index 5e59a41..a55a59d 100644 --- a/example/src/example.cpp +++ b/example/src/example.cpp @@ -8,7 +8,7 @@ #include "path.hpp" void app_main(prism::engine*) { - prism::set_domain_path(prism::domain::app, "{resource_dir}/data"); + prism::set_domain_path(prism::domain::app, "{resource_dir}/game"); prism::set_domain_path(prism::domain::internal, "{resource_dir}/shaders"); platform::open_window("Example", {-1, -1, 1280, 720}, WindowFlags::Resizable); diff --git a/platforms/sdl/CMakeLists.txt b/platforms/sdl/CMakeLists.txt index 863d77b..2247fb8 100644 --- a/platforms/sdl/CMakeLists.txt +++ b/platforms/sdl/CMakeLists.txt @@ -60,13 +60,13 @@ function(add_platform_commands target data_directory skip_data) if(NOT skip_data) if(ENABLE_MACOS) add_custom_target(${target}_copy_assets - COMMAND ${CMAKE_COMMAND} -E copy_directory ${data_directory} $/../Resources/data + COMMAND ${CMAKE_COMMAND} -E copy_directory ${data_directory} $/../Resources/game ) else() - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/data) + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/game) add_custom_target(${target}_copy_assets - COMMAND ${CMAKE_COMMAND} -E copy_directory ${data_directory} ${CMAKE_BINARY_DIR}/bin/data + COMMAND ${CMAKE_COMMAND} -E copy_directory ${data_directory} ${CMAKE_BINARY_DIR}/bin/game ) endif() add_dependencies(${target} ${target}_copy_assets) diff --git a/tools/common/src/commoneditor.cpp b/tools/common/src/commoneditor.cpp index fcd2201..0b8dcf6 100755 --- a/tools/common/src/commoneditor.cpp +++ b/tools/common/src/commoneditor.cpp @@ -43,7 +43,7 @@ const std::map imToPl = { }; CommonEditor::CommonEditor(const std::string_view id) : id(id) { - prism::set_domain_path(prism::domain::app, "{resource_dir}/data"); + prism::set_domain_path(prism::domain::app, "{resource_dir}/game"); prism::set_domain_path(prism::domain::internal, "{resource_dir}/shaders"); ImGuiIO& io = ImGui::GetIO();