diff --git a/data/font.fp b/data/font.fp deleted file mode 100644 index 954ac96..0000000 Binary files a/data/font.fp and /dev/null differ diff --git a/engine/core/src/engine.cpp b/engine/core/src/engine.cpp index 8769595..9e658cd 100755 --- a/engine/core/src/engine.cpp +++ b/engine/core/src/engine.cpp @@ -67,6 +67,8 @@ engine::engine(const int argc, char* argv[]) { console::register_command("quit", console::argument_format(0), [this](const console::arguments&) { quit(); }); + + console::load_cfg(prism::app_domain / "render_options.cfg"); for(int i = 0; i < argc; i++) command_line_arguments.emplace_back(argv[i]); diff --git a/data/OpenSans-Regular.ttf b/example/data/OpenSans-Regular.ttf similarity index 100% rename from data/OpenSans-Regular.ttf rename to example/data/OpenSans-Regular.ttf diff --git a/data/materials/DefaultMaterial.material b/example/data/materials/DefaultMaterial.material similarity index 100% rename from data/materials/DefaultMaterial.material rename to example/data/materials/DefaultMaterial.material diff --git a/data/materials/Material.material b/example/data/materials/Material.material similarity index 100% rename from data/materials/Material.material rename to example/data/materials/Material.material diff --git a/data/materials/kamen_zid.material b/example/data/materials/kamen_zid.material similarity index 100% rename from data/materials/kamen_zid.material rename to example/data/materials/kamen_zid.material diff --git a/data/materials/kamen_zid_parapet.material b/example/data/materials/kamen_zid_parapet.material similarity index 100% rename from data/materials/kamen_zid_parapet.material rename to example/data/materials/kamen_zid_parapet.material diff --git a/data/materials/kamen_zid_prozor.material b/example/data/materials/kamen_zid_prozor.material similarity index 100% rename from data/materials/kamen_zid_prozor.material rename to example/data/materials/kamen_zid_prozor.material diff --git a/data/materials/pod.material b/example/data/materials/pod.material similarity index 100% rename from data/materials/pod.material rename to example/data/materials/pod.material diff --git a/data/materials/pod_rub.material b/example/data/materials/pod_rub.material similarity index 100% rename from data/materials/pod_rub.material rename to example/data/materials/pod_rub.material diff --git a/data/materials/pod_tepih.material b/example/data/materials/pod_tepih.material similarity index 100% rename from data/materials/pod_tepih.material rename to example/data/materials/pod_tepih.material diff --git a/data/materials/rozeta.material b/example/data/materials/rozeta.material similarity index 100% rename from data/materials/rozeta.material rename to example/data/materials/rozeta.material diff --git a/data/materials/sprljci.material b/example/data/materials/sprljci.material similarity index 100% rename from data/materials/sprljci.material rename to example/data/materials/sprljci.material diff --git a/data/materials/staklo.material b/example/data/materials/staklo.material similarity index 100% rename from data/materials/staklo.material rename to example/data/materials/staklo.material diff --git a/data/materials/staklo_crveno.material b/example/data/materials/staklo_crveno.material similarity index 100% rename from data/materials/staklo_crveno.material rename to example/data/materials/staklo_crveno.material diff --git a/data/materials/staklo_plavo.material b/example/data/materials/staklo_plavo.material similarity index 100% rename from data/materials/staklo_plavo.material rename to example/data/materials/staklo_plavo.material diff --git a/data/materials/staklo_zeleno.material b/example/data/materials/staklo_zeleno.material similarity index 100% rename from data/materials/staklo_zeleno.material rename to example/data/materials/staklo_zeleno.material diff --git a/data/materials/staklo_zuto.material b/example/data/materials/staklo_zuto.material similarity index 100% rename from data/materials/staklo_zuto.material rename to example/data/materials/staklo_zuto.material diff --git a/data/materials/stupovi.material b/example/data/materials/stupovi.material similarity index 100% rename from data/materials/stupovi.material rename to example/data/materials/stupovi.material diff --git a/data/materials/zid_vani.material b/example/data/materials/zid_vani.material similarity index 100% rename from data/materials/zid_vani.material rename to example/data/materials/zid_vani.material diff --git a/data/models/arrow.model b/example/data/models/arrow.model similarity index 100% rename from data/models/arrow.model rename to example/data/models/arrow.model diff --git a/data/models/bunny.model b/example/data/models/bunny.model similarity index 100% rename from data/models/bunny.model rename to example/data/models/bunny.model diff --git a/data/models/cube.model b/example/data/models/cube.model similarity index 100% rename from data/models/cube.model rename to example/data/models/cube.model diff --git a/data/models/plane.model b/example/data/models/plane.model similarity index 100% rename from data/models/plane.model rename to example/data/models/plane.model diff --git a/data/models/sibenik.model b/example/data/models/sibenik.model similarity index 100% rename from data/models/sibenik.model rename to example/data/models/sibenik.model diff --git a/data/models/sphere.model b/example/data/models/sphere.model similarity index 100% rename from data/models/sphere.model rename to example/data/models/sphere.model diff --git a/data/sibenik-license.txt b/example/data/sibenik-license.txt similarity index 100% rename from data/sibenik-license.txt rename to example/data/sibenik-license.txt diff --git a/data/textures/KAMEN-stup.png b/example/data/textures/KAMEN-stup.png similarity index 100% rename from data/textures/KAMEN-stup.png rename to example/data/textures/KAMEN-stup.png diff --git a/data/textures/aperture.png b/example/data/textures/aperture.png similarity index 100% rename from data/textures/aperture.png rename to example/data/textures/aperture.png diff --git a/data/textures/kamen-bump.png b/example/data/textures/kamen-bump.png similarity index 100% rename from data/textures/kamen-bump.png rename to example/data/textures/kamen-bump.png diff --git a/data/textures/kamen-normal.png b/example/data/textures/kamen-normal.png similarity index 100% rename from data/textures/kamen-normal.png rename to example/data/textures/kamen-normal.png diff --git a/data/textures/kamen.png b/example/data/textures/kamen.png similarity index 100% rename from data/textures/kamen.png rename to example/data/textures/kamen.png diff --git a/data/textures/mramor6x6-bump.png b/example/data/textures/mramor6x6-bump.png similarity index 100% rename from data/textures/mramor6x6-bump.png rename to example/data/textures/mramor6x6-bump.png diff --git a/data/textures/mramor6x6.png b/example/data/textures/mramor6x6.png similarity index 100% rename from data/textures/mramor6x6.png rename to example/data/textures/mramor6x6.png diff --git a/data/textures/mrarmor-normal.png b/example/data/textures/mrarmor-normal.png similarity index 100% rename from data/textures/mrarmor-normal.png rename to example/data/textures/mrarmor-normal.png diff --git a/data/textures/none.png b/example/data/textures/none.png similarity index 100% rename from data/textures/none.png rename to example/data/textures/none.png diff --git a/data/textures/point.png b/example/data/textures/point.png similarity index 100% rename from data/textures/point.png rename to example/data/textures/point.png diff --git a/data/textures/probe.png b/example/data/textures/probe.png similarity index 100% rename from data/textures/probe.png rename to example/data/textures/probe.png diff --git a/data/textures/spot.png b/example/data/textures/spot.png similarity index 100% rename from data/textures/spot.png rename to example/data/textures/spot.png diff --git a/data/textures/sun.png b/example/data/textures/sun.png similarity index 100% rename from data/textures/sun.png rename to example/data/textures/sun.png diff --git a/platforms/sdl/CMakeLists.txt b/platforms/sdl/CMakeLists.txt index f467e84..766149c 100644 --- a/platforms/sdl/CMakeLists.txt +++ b/platforms/sdl/CMakeLists.txt @@ -44,14 +44,6 @@ add_platform( ) function(add_platform_commands target) - if(NOT SKIP_DATA) - if(ENABLE_MACOS) - add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/data $/../Resources/data) - else() - add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/data $/data) - endif() - endif() - # we HAVE to create this dummy target to convince CMake to properly copy over shader files. # before you ask, we have used POST_BUILD before but that only runs if the TARGET specified is built. # when you change a shader source file on disk, BuildShaders is triggered but that doesn't retrigger your actual @@ -72,7 +64,12 @@ function(add_platform_commands target) COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_BINARY_DIR}/shaders $/shaders ) endif() - - add_dependencies(${target} ${DUMMY_NAME}) + + if(NOT SKIP_DATA) + add_custom_target(${target}_copy_assets + COMMAND ${CMAKE_COMMAND} -E copy_directory /home/josh/Development/prism/example/data/ ${CMAKE_BINARY_DIR}/bin/data + ) + add_dependencies(${target} ${target}_copy_assets) + endif() endfunction()