From 6d5a0542e7ffa2f486757fd07c9cbdc40c5bbe7a Mon Sep 17 00:00:00 2001 From: Petr Mikheev Date: Thu, 26 May 2022 01:47:38 +0200 Subject: [PATCH] Merge files/builtin_scripts and files/vfs into one dir --- files/CMakeLists.txt | 3 +-- .../{builtin_scripts => data}/CMakeLists.txt | 23 +++++++++++----- .../builtin.omwscripts | 0 .../l10n/Calendar/en.yaml | 0 .../l10n/Interface/en.yaml | 0 .../openmw_aux/calendar.lua | 0 .../openmw_aux/time.lua | 0 .../openmw_aux/ui.lua | 0 .../openmw_aux/util.lua | 0 .../scripts/omw/ai.lua | 0 .../scripts/omw/camera.lua | 0 .../scripts/omw/console/global.lua | 0 .../scripts/omw/console/local.lua | 0 .../scripts/omw/console/player.lua | 0 .../scripts/omw/head_bobbing.lua | 0 .../scripts/omw/mwui/borders.lua | 0 .../scripts/omw/mwui/constants.lua | 0 .../scripts/omw/mwui/filters.lua | 0 .../scripts/omw/mwui/init.lua | 0 .../scripts/omw/mwui/space.lua | 0 .../scripts/omw/mwui/text.lua | 0 .../scripts/omw/mwui/textEdit.lua | 0 .../scripts/omw/settings/common.lua | 0 .../scripts/omw/settings/global.lua | 0 .../scripts/omw/settings/player.lua | 0 .../scripts/omw/settings/render.lua | 0 .../scripts/omw/settings/renderers.lua | 0 .../scripts/omw/third_person.lua | 0 .../{vfs => data}/shaders/displaydepth.omwfx | 0 files/{vfs => data}/shaders/main.omwfx | 0 .../textures/omw_menu_scroll_center_h.dds | Bin .../textures/omw_menu_scroll_center_v.dds | Bin .../textures/omw_menu_scroll_down.dds | Bin .../textures/omw_menu_scroll_left.dds | Bin .../textures/omw_menu_scroll_right.dds | Bin .../textures/omw_menu_scroll_up.dds | Bin files/vfs/CMakeLists.txt | 25 ------------------ 37 files changed, 17 insertions(+), 34 deletions(-) rename files/{builtin_scripts => data}/CMakeLists.txt (74%) rename files/{builtin_scripts => data}/builtin.omwscripts (100%) rename files/{builtin_scripts => data}/l10n/Calendar/en.yaml (100%) rename files/{builtin_scripts => data}/l10n/Interface/en.yaml (100%) rename files/{builtin_scripts => data}/openmw_aux/calendar.lua (100%) rename files/{builtin_scripts => data}/openmw_aux/time.lua (100%) rename files/{builtin_scripts => data}/openmw_aux/ui.lua (100%) rename files/{builtin_scripts => data}/openmw_aux/util.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/ai.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/camera.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/console/global.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/console/local.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/console/player.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/head_bobbing.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/mwui/borders.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/mwui/constants.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/mwui/filters.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/mwui/init.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/mwui/space.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/mwui/text.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/mwui/textEdit.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/settings/common.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/settings/global.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/settings/player.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/settings/render.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/settings/renderers.lua (100%) rename files/{builtin_scripts => data}/scripts/omw/third_person.lua (100%) rename files/{vfs => data}/shaders/displaydepth.omwfx (100%) rename files/{vfs => data}/shaders/main.omwfx (100%) rename files/{vfs => data}/textures/omw_menu_scroll_center_h.dds (100%) rename files/{vfs => data}/textures/omw_menu_scroll_center_v.dds (100%) rename files/{vfs => data}/textures/omw_menu_scroll_down.dds (100%) rename files/{vfs => data}/textures/omw_menu_scroll_left.dds (100%) rename files/{vfs => data}/textures/omw_menu_scroll_right.dds (100%) rename files/{vfs => data}/textures/omw_menu_scroll_up.dds (100%) delete mode 100644 files/vfs/CMakeLists.txt diff --git a/files/CMakeLists.txt b/files/CMakeLists.txt index cea33f0f40..a3d5c14e5c 100644 --- a/files/CMakeLists.txt +++ b/files/CMakeLists.txt @@ -1,5 +1,4 @@ add_subdirectory(mygui) add_subdirectory(shaders) -add_subdirectory(vfs) -add_subdirectory(builtin_scripts) +add_subdirectory(data) add_subdirectory(lua_api) diff --git a/files/builtin_scripts/CMakeLists.txt b/files/data/CMakeLists.txt similarity index 74% rename from files/builtin_scripts/CMakeLists.txt rename to files/data/CMakeLists.txt index 38070f7d33..4705355d30 100644 --- a/files/builtin_scripts/CMakeLists.txt +++ b/files/data/CMakeLists.txt @@ -2,14 +2,24 @@ if (NOT DEFINED OPENMW_RESOURCES_ROOT) return() endif() -set(LUA_BUILTIN_FILES - builtin.omwscripts +set(BUILTIN_DATA_FILES + textures/omw_menu_scroll_down.dds + textures/omw_menu_scroll_up.dds + textures/omw_menu_scroll_left.dds + textures/omw_menu_scroll_right.dds + textures/omw_menu_scroll_center_h.dds + textures/omw_menu_scroll_center_v.dds + + l10n/Calendar/en.yaml + l10n/Interface/en.yaml openmw_aux/util.lua openmw_aux/time.lua openmw_aux/calendar.lua openmw_aux/ui.lua + builtin.omwscripts + scripts/omw/ai.lua scripts/omw/camera.lua scripts/omw/head_bobbing.lua @@ -22,10 +32,6 @@ set(LUA_BUILTIN_FILES scripts/omw/settings/common.lua scripts/omw/settings/render.lua scripts/omw/settings/renderers.lua - - l10n/Calendar/en.yaml - l10n/Interface/en.yaml - scripts/omw/mwui/constants.lua scripts/omw/mwui/borders.lua scripts/omw/mwui/filters.lua @@ -33,8 +39,11 @@ set(LUA_BUILTIN_FILES scripts/omw/mwui/textEdit.lua scripts/omw/mwui/space.lua scripts/omw/mwui/init.lua + + shaders/main.omwfx + shaders/displaydepth.omwfx ) -foreach (f ${LUA_BUILTIN_FILES}) +foreach (f ${BUILTIN_DATA_FILES}) copy_resource_file("${CMAKE_CURRENT_SOURCE_DIR}/${f}" "${OPENMW_RESOURCES_ROOT}" "resources/vfs/${f}") endforeach (f) diff --git a/files/builtin_scripts/builtin.omwscripts b/files/data/builtin.omwscripts similarity index 100% rename from files/builtin_scripts/builtin.omwscripts rename to files/data/builtin.omwscripts diff --git a/files/builtin_scripts/l10n/Calendar/en.yaml b/files/data/l10n/Calendar/en.yaml similarity index 100% rename from files/builtin_scripts/l10n/Calendar/en.yaml rename to files/data/l10n/Calendar/en.yaml diff --git a/files/builtin_scripts/l10n/Interface/en.yaml b/files/data/l10n/Interface/en.yaml similarity index 100% rename from files/builtin_scripts/l10n/Interface/en.yaml rename to files/data/l10n/Interface/en.yaml diff --git a/files/builtin_scripts/openmw_aux/calendar.lua b/files/data/openmw_aux/calendar.lua similarity index 100% rename from files/builtin_scripts/openmw_aux/calendar.lua rename to files/data/openmw_aux/calendar.lua diff --git a/files/builtin_scripts/openmw_aux/time.lua b/files/data/openmw_aux/time.lua similarity index 100% rename from files/builtin_scripts/openmw_aux/time.lua rename to files/data/openmw_aux/time.lua diff --git a/files/builtin_scripts/openmw_aux/ui.lua b/files/data/openmw_aux/ui.lua similarity index 100% rename from files/builtin_scripts/openmw_aux/ui.lua rename to files/data/openmw_aux/ui.lua diff --git a/files/builtin_scripts/openmw_aux/util.lua b/files/data/openmw_aux/util.lua similarity index 100% rename from files/builtin_scripts/openmw_aux/util.lua rename to files/data/openmw_aux/util.lua diff --git a/files/builtin_scripts/scripts/omw/ai.lua b/files/data/scripts/omw/ai.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/ai.lua rename to files/data/scripts/omw/ai.lua diff --git a/files/builtin_scripts/scripts/omw/camera.lua b/files/data/scripts/omw/camera.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/camera.lua rename to files/data/scripts/omw/camera.lua diff --git a/files/builtin_scripts/scripts/omw/console/global.lua b/files/data/scripts/omw/console/global.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/console/global.lua rename to files/data/scripts/omw/console/global.lua diff --git a/files/builtin_scripts/scripts/omw/console/local.lua b/files/data/scripts/omw/console/local.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/console/local.lua rename to files/data/scripts/omw/console/local.lua diff --git a/files/builtin_scripts/scripts/omw/console/player.lua b/files/data/scripts/omw/console/player.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/console/player.lua rename to files/data/scripts/omw/console/player.lua diff --git a/files/builtin_scripts/scripts/omw/head_bobbing.lua b/files/data/scripts/omw/head_bobbing.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/head_bobbing.lua rename to files/data/scripts/omw/head_bobbing.lua diff --git a/files/builtin_scripts/scripts/omw/mwui/borders.lua b/files/data/scripts/omw/mwui/borders.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/mwui/borders.lua rename to files/data/scripts/omw/mwui/borders.lua diff --git a/files/builtin_scripts/scripts/omw/mwui/constants.lua b/files/data/scripts/omw/mwui/constants.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/mwui/constants.lua rename to files/data/scripts/omw/mwui/constants.lua diff --git a/files/builtin_scripts/scripts/omw/mwui/filters.lua b/files/data/scripts/omw/mwui/filters.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/mwui/filters.lua rename to files/data/scripts/omw/mwui/filters.lua diff --git a/files/builtin_scripts/scripts/omw/mwui/init.lua b/files/data/scripts/omw/mwui/init.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/mwui/init.lua rename to files/data/scripts/omw/mwui/init.lua diff --git a/files/builtin_scripts/scripts/omw/mwui/space.lua b/files/data/scripts/omw/mwui/space.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/mwui/space.lua rename to files/data/scripts/omw/mwui/space.lua diff --git a/files/builtin_scripts/scripts/omw/mwui/text.lua b/files/data/scripts/omw/mwui/text.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/mwui/text.lua rename to files/data/scripts/omw/mwui/text.lua diff --git a/files/builtin_scripts/scripts/omw/mwui/textEdit.lua b/files/data/scripts/omw/mwui/textEdit.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/mwui/textEdit.lua rename to files/data/scripts/omw/mwui/textEdit.lua diff --git a/files/builtin_scripts/scripts/omw/settings/common.lua b/files/data/scripts/omw/settings/common.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/settings/common.lua rename to files/data/scripts/omw/settings/common.lua diff --git a/files/builtin_scripts/scripts/omw/settings/global.lua b/files/data/scripts/omw/settings/global.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/settings/global.lua rename to files/data/scripts/omw/settings/global.lua diff --git a/files/builtin_scripts/scripts/omw/settings/player.lua b/files/data/scripts/omw/settings/player.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/settings/player.lua rename to files/data/scripts/omw/settings/player.lua diff --git a/files/builtin_scripts/scripts/omw/settings/render.lua b/files/data/scripts/omw/settings/render.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/settings/render.lua rename to files/data/scripts/omw/settings/render.lua diff --git a/files/builtin_scripts/scripts/omw/settings/renderers.lua b/files/data/scripts/omw/settings/renderers.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/settings/renderers.lua rename to files/data/scripts/omw/settings/renderers.lua diff --git a/files/builtin_scripts/scripts/omw/third_person.lua b/files/data/scripts/omw/third_person.lua similarity index 100% rename from files/builtin_scripts/scripts/omw/third_person.lua rename to files/data/scripts/omw/third_person.lua diff --git a/files/vfs/shaders/displaydepth.omwfx b/files/data/shaders/displaydepth.omwfx similarity index 100% rename from files/vfs/shaders/displaydepth.omwfx rename to files/data/shaders/displaydepth.omwfx diff --git a/files/vfs/shaders/main.omwfx b/files/data/shaders/main.omwfx similarity index 100% rename from files/vfs/shaders/main.omwfx rename to files/data/shaders/main.omwfx diff --git a/files/vfs/textures/omw_menu_scroll_center_h.dds b/files/data/textures/omw_menu_scroll_center_h.dds similarity index 100% rename from files/vfs/textures/omw_menu_scroll_center_h.dds rename to files/data/textures/omw_menu_scroll_center_h.dds diff --git a/files/vfs/textures/omw_menu_scroll_center_v.dds b/files/data/textures/omw_menu_scroll_center_v.dds similarity index 100% rename from files/vfs/textures/omw_menu_scroll_center_v.dds rename to files/data/textures/omw_menu_scroll_center_v.dds diff --git a/files/vfs/textures/omw_menu_scroll_down.dds b/files/data/textures/omw_menu_scroll_down.dds similarity index 100% rename from files/vfs/textures/omw_menu_scroll_down.dds rename to files/data/textures/omw_menu_scroll_down.dds diff --git a/files/vfs/textures/omw_menu_scroll_left.dds b/files/data/textures/omw_menu_scroll_left.dds similarity index 100% rename from files/vfs/textures/omw_menu_scroll_left.dds rename to files/data/textures/omw_menu_scroll_left.dds diff --git a/files/vfs/textures/omw_menu_scroll_right.dds b/files/data/textures/omw_menu_scroll_right.dds similarity index 100% rename from files/vfs/textures/omw_menu_scroll_right.dds rename to files/data/textures/omw_menu_scroll_right.dds diff --git a/files/vfs/textures/omw_menu_scroll_up.dds b/files/data/textures/omw_menu_scroll_up.dds similarity index 100% rename from files/vfs/textures/omw_menu_scroll_up.dds rename to files/data/textures/omw_menu_scroll_up.dds diff --git a/files/vfs/CMakeLists.txt b/files/vfs/CMakeLists.txt deleted file mode 100644 index 16911df573..0000000000 --- a/files/vfs/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -if (NOT DEFINED OPENMW_RESOURCES_ROOT) - return() -endif() - -# Copy resource files into the build directory -set(SDIR ${CMAKE_CURRENT_SOURCE_DIR}) -set(DDIRRELATIVE resources/vfs/textures) -set(DDIRRELATIVE_SHADERS resources/vfs/shaders) - -set(TEXTURE_FILES - textures/omw_menu_scroll_down.dds - textures/omw_menu_scroll_up.dds - textures/omw_menu_scroll_left.dds - textures/omw_menu_scroll_right.dds - textures/omw_menu_scroll_center_h.dds - textures/omw_menu_scroll_center_v.dds -) - -set(SHADER_FILES - shaders/main.omwfx - shaders/displaydepth.omwfx -) - -copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE} "${TEXTURE_FILES}") -copy_all_resource_files(${CMAKE_CURRENT_SOURCE_DIR} ${OPENMW_RESOURCES_ROOT} ${DDIRRELATIVE_SHADERS} "${SHADER_FILES}")