From db77ed79cd2da11875bcf092b73281ea3e352751 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 1 Feb 2019 18:31:57 +0100 Subject: [PATCH] - moved the resourcefiles and textures folders into gamedata. --- src/CMakeLists.txt | 132 +++++++++--------- .../resourcefiles/ancientzip.cpp | 0 src/{ => gamedata}/resourcefiles/ancientzip.h | 0 src/{ => gamedata}/resourcefiles/file_7z.cpp | 0 .../resourcefiles/file_directory.cpp | 0 src/{ => gamedata}/resourcefiles/file_grp.cpp | 0 .../resourcefiles/file_lump.cpp | 0 src/{ => gamedata}/resourcefiles/file_pak.cpp | 0 src/{ => gamedata}/resourcefiles/file_rff.cpp | 0 src/{ => gamedata}/resourcefiles/file_wad.cpp | 0 src/{ => gamedata}/resourcefiles/file_zip.cpp | 0 src/{ => gamedata}/resourcefiles/file_zip.h | 0 .../resourcefiles/resourcefile.cpp | 0 .../resourcefiles/resourcefile.h | 0 src/{ => gamedata}/textures/anim_switches.cpp | 0 src/{ => gamedata}/textures/animations.cpp | 0 src/{ => gamedata}/textures/bitmap.cpp | 0 src/{ => gamedata}/textures/bitmap.h | 0 .../textures/formats/automaptexture.cpp | 0 .../textures/formats/brightmaptexture.cpp | 0 .../textures/formats/buildtexture.cpp | 0 .../textures/formats/canvastexture.cpp | 0 .../textures/formats/ddstexture.cpp | 0 .../textures/formats/emptytexture.cpp | 0 .../textures/formats/flattexture.cpp | 0 .../textures/formats/fontchars.cpp | 0 .../textures/formats/fontchars.h | 0 .../textures/formats/imgztexture.cpp | 0 .../textures/formats/jpegtexture.cpp | 0 .../textures/formats/md5check.cpp | 0 .../textures/formats/multipatchtexture.cpp | 0 .../textures/formats/multipatchtexture.h | 0 .../textures/formats/patchtexture.cpp | 0 .../textures/formats/pcxtexture.cpp | 0 .../textures/formats/pngtexture.cpp | 0 .../textures/formats/rawpagetexture.cpp | 0 .../textures/formats/shadertexture.cpp | 0 .../textures/formats/tgatexture.cpp | 0 .../textures/hires/hirestex.cpp | 0 .../textures/hires/hqnx/common.h | 0 .../textures/hires/hqnx/hq2x.cpp | 0 .../textures/hires/hqnx/hq3x.cpp | 0 .../textures/hires/hqnx/hq4x.cpp | 0 src/{ => gamedata}/textures/hires/hqnx/hqx.h | 0 .../textures/hires/hqnx/init.cpp | 0 .../textures/hires/hqnx_asm/hq2x_asm.cpp | 0 .../textures/hires/hqnx_asm/hq3x_asm.cpp | 0 .../textures/hires/hqnx_asm/hq4x_asm.cpp | 0 .../textures/hires/hqnx_asm/hqnx_asm.h | 0 .../hires/hqnx_asm/hqnx_asm_Image.cpp | 0 .../textures/hires/hqnx_asm/hqnx_asm_Image.h | 0 .../textures/hires/hqresize.cpp | 0 .../textures/hires/xbr/xbrz.cpp | 0 src/{ => gamedata}/textures/hires/xbr/xbrz.h | 0 .../textures/hires/xbr/xbrz_config.h | 0 .../textures/hires/xbr/xbrz_config_old.h | 0 .../textures/hires/xbr/xbrz_old.cpp | 0 .../textures/hires/xbr/xbrz_old.h | 0 .../textures/hires/xbr/xbrz_tools.h | 0 src/{ => gamedata}/textures/image.cpp | 0 src/{ => gamedata}/textures/image.h | 0 src/{ => gamedata}/textures/imagehelpers.h | 0 src/{ => gamedata}/textures/imagetexture.cpp | 0 .../textures/multipatchtexturebuilder.cpp | 0 src/{ => gamedata}/textures/skyboxtexture.cpp | 0 src/{ => gamedata}/textures/skyboxtexture.h | 0 src/{ => gamedata}/textures/texture.cpp | 0 .../textures/texturemanager.cpp | 0 src/{ => gamedata}/textures/textures.h | 0 69 files changed, 66 insertions(+), 66 deletions(-) rename src/{ => gamedata}/resourcefiles/ancientzip.cpp (100%) rename src/{ => gamedata}/resourcefiles/ancientzip.h (100%) rename src/{ => gamedata}/resourcefiles/file_7z.cpp (100%) rename src/{ => gamedata}/resourcefiles/file_directory.cpp (100%) rename src/{ => gamedata}/resourcefiles/file_grp.cpp (100%) rename src/{ => gamedata}/resourcefiles/file_lump.cpp (100%) rename src/{ => gamedata}/resourcefiles/file_pak.cpp (100%) rename src/{ => gamedata}/resourcefiles/file_rff.cpp (100%) rename src/{ => gamedata}/resourcefiles/file_wad.cpp (100%) rename src/{ => gamedata}/resourcefiles/file_zip.cpp (100%) rename src/{ => gamedata}/resourcefiles/file_zip.h (100%) rename src/{ => gamedata}/resourcefiles/resourcefile.cpp (100%) rename src/{ => gamedata}/resourcefiles/resourcefile.h (100%) rename src/{ => gamedata}/textures/anim_switches.cpp (100%) rename src/{ => gamedata}/textures/animations.cpp (100%) rename src/{ => gamedata}/textures/bitmap.cpp (100%) rename src/{ => gamedata}/textures/bitmap.h (100%) rename src/{ => gamedata}/textures/formats/automaptexture.cpp (100%) rename src/{ => gamedata}/textures/formats/brightmaptexture.cpp (100%) rename src/{ => gamedata}/textures/formats/buildtexture.cpp (100%) rename src/{ => gamedata}/textures/formats/canvastexture.cpp (100%) rename src/{ => gamedata}/textures/formats/ddstexture.cpp (100%) rename src/{ => gamedata}/textures/formats/emptytexture.cpp (100%) rename src/{ => gamedata}/textures/formats/flattexture.cpp (100%) rename src/{ => gamedata}/textures/formats/fontchars.cpp (100%) rename src/{ => gamedata}/textures/formats/fontchars.h (100%) rename src/{ => gamedata}/textures/formats/imgztexture.cpp (100%) rename src/{ => gamedata}/textures/formats/jpegtexture.cpp (100%) rename src/{ => gamedata}/textures/formats/md5check.cpp (100%) rename src/{ => gamedata}/textures/formats/multipatchtexture.cpp (100%) rename src/{ => gamedata}/textures/formats/multipatchtexture.h (100%) rename src/{ => gamedata}/textures/formats/patchtexture.cpp (100%) rename src/{ => gamedata}/textures/formats/pcxtexture.cpp (100%) rename src/{ => gamedata}/textures/formats/pngtexture.cpp (100%) rename src/{ => gamedata}/textures/formats/rawpagetexture.cpp (100%) rename src/{ => gamedata}/textures/formats/shadertexture.cpp (100%) rename src/{ => gamedata}/textures/formats/tgatexture.cpp (100%) rename src/{ => gamedata}/textures/hires/hirestex.cpp (100%) rename src/{ => gamedata}/textures/hires/hqnx/common.h (100%) rename src/{ => gamedata}/textures/hires/hqnx/hq2x.cpp (100%) rename src/{ => gamedata}/textures/hires/hqnx/hq3x.cpp (100%) rename src/{ => gamedata}/textures/hires/hqnx/hq4x.cpp (100%) rename src/{ => gamedata}/textures/hires/hqnx/hqx.h (100%) rename src/{ => gamedata}/textures/hires/hqnx/init.cpp (100%) rename src/{ => gamedata}/textures/hires/hqnx_asm/hq2x_asm.cpp (100%) rename src/{ => gamedata}/textures/hires/hqnx_asm/hq3x_asm.cpp (100%) rename src/{ => gamedata}/textures/hires/hqnx_asm/hq4x_asm.cpp (100%) rename src/{ => gamedata}/textures/hires/hqnx_asm/hqnx_asm.h (100%) rename src/{ => gamedata}/textures/hires/hqnx_asm/hqnx_asm_Image.cpp (100%) rename src/{ => gamedata}/textures/hires/hqnx_asm/hqnx_asm_Image.h (100%) rename src/{ => gamedata}/textures/hires/hqresize.cpp (100%) rename src/{ => gamedata}/textures/hires/xbr/xbrz.cpp (100%) rename src/{ => gamedata}/textures/hires/xbr/xbrz.h (100%) rename src/{ => gamedata}/textures/hires/xbr/xbrz_config.h (100%) rename src/{ => gamedata}/textures/hires/xbr/xbrz_config_old.h (100%) rename src/{ => gamedata}/textures/hires/xbr/xbrz_old.cpp (100%) rename src/{ => gamedata}/textures/hires/xbr/xbrz_old.h (100%) rename src/{ => gamedata}/textures/hires/xbr/xbrz_tools.h (100%) rename src/{ => gamedata}/textures/image.cpp (100%) rename src/{ => gamedata}/textures/image.h (100%) rename src/{ => gamedata}/textures/imagehelpers.h (100%) rename src/{ => gamedata}/textures/imagetexture.cpp (100%) rename src/{ => gamedata}/textures/multipatchtexturebuilder.cpp (100%) rename src/{ => gamedata}/textures/skyboxtexture.cpp (100%) rename src/{ => gamedata}/textures/skyboxtexture.h (100%) rename src/{ => gamedata}/textures/texture.cpp (100%) rename src/{ => gamedata}/textures/texturemanager.cpp (100%) rename src/{ => gamedata}/textures/textures.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 57f059030..8e06ff79c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -564,17 +564,17 @@ if( HAVE_MMX ) add_definitions( -DHAVE_MMX=1 ) set( SYSTEM_SOURCES ${SYSTEM_SOURCES} - textures/hires/hqnx_asm/hq2x_asm.cpp - textures/hires/hqnx_asm/hq3x_asm.cpp - textures/hires/hqnx_asm/hq4x_asm.cpp - textures/hires/hqnx_asm/hqnx_asm_Image.cpp) + gamedata/textures/hires/hqnx_asm/hq2x_asm.cpp + gamedata/textures/hires/hqnx_asm/hq3x_asm.cpp + gamedata/textures/hires/hqnx_asm/hq4x_asm.cpp + gamedata/textures/hires/hqnx_asm/hqnx_asm_Image.cpp) if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) set_source_files_properties( - textures/hires/hqnx_asm/hq2x_asm.cpp - textures/hires/hqnx_asm/hq3x_asm.cpp - textures/hires/hqnx_asm/hq4x_asm.cpp - textures/hires/gl_hqresize.cpp + gamedata/textures/hires/hqnx_asm/hq2x_asm.cpp + gamedata/textures/hires/hqnx_asm/hq3x_asm.cpp + gamedata/textures/hires/hqnx_asm/hq4x_asm.cpp + gamedata/textures/hires/gl_hqresize.cpp PROPERTIES COMPILE_FLAGS "-mmmx" ) endif( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) endif( HAVE_MMX ) @@ -648,6 +648,11 @@ file( GLOB HEADER_FILES g_shared/*.h g_statusbar/*.h gamedata/*.h + gamedata/resourcefiles/*.h + gamedata/textures/*.h + gamedata/textures/hires/hqnx/*.h + gamedata/textures/hires/hqnx_asm/*.h + gamedata/textures/hires/xbr/*.h intermission/*.h maploader/*.h menu/*.h @@ -662,15 +667,10 @@ file( GLOB HEADER_FILES r_data/*.h r_data/models/*.h utility/rapidjson/*.h - resourcefiles/*.h utility/sfmt/*.h utility/math./*h utility/*.h sound/*.h - textures/*.h - textures/hires/hqnx/*.h - textures/hires/hqnx_asm/*.h - textures/hires/xbr/*.h scripting/*.h scripting/backend/*.h scripting/decorate/*.h @@ -818,12 +818,12 @@ set( FASTMATH_SOURCES sound/sndfile_decoder.cpp sound/timiditypp/fft4g.cpp sound/timiditypp/reverb.cpp - textures/hires/hqnx/init.cpp - textures/hires/hqnx/hq2x.cpp - textures/hires/hqnx/hq3x.cpp - textures/hires/hqnx/hq4x.cpp - textures/hires/xbr/xbrz.cpp - textures/hires/xbr/xbrz_old.cpp + gamedata/textures/hires/hqnx/init.cpp + gamedata/textures/hires/hqnx/hq2x.cpp + gamedata/textures/hires/hqnx/hq3x.cpp + gamedata/textures/hires/hqnx/hq4x.cpp + gamedata/textures/hires/xbr/xbrz.cpp + gamedata/textures/hires/xbr/xbrz_old.cpp rendering/gl_load/gl_load.c rendering/hwrenderer/postprocessing/hw_postprocess_cvars.cpp rendering/hwrenderer/postprocessing/hw_postprocessshader.cpp @@ -1070,45 +1070,45 @@ set (PCH_SOURCES menu/optionmenu.cpp menu/playermenu.cpp menu/resolutionmenu.cpp - resourcefiles/ancientzip.cpp - resourcefiles/file_7z.cpp - resourcefiles/file_grp.cpp - resourcefiles/file_lump.cpp - resourcefiles/file_rff.cpp - resourcefiles/file_wad.cpp - resourcefiles/file_zip.cpp - resourcefiles/file_pak.cpp - resourcefiles/file_directory.cpp - resourcefiles/resourcefile.cpp - textures/animations.cpp - textures/anim_switches.cpp - textures/bitmap.cpp - textures/texture.cpp - textures/image.cpp - textures/imagetexture.cpp - textures/texturemanager.cpp - textures/multipatchtexturebuilder.cpp - textures/skyboxtexture.cpp - textures/formats/automaptexture.cpp - textures/formats/brightmaptexture.cpp - textures/formats/buildtexture.cpp - textures/formats/canvastexture.cpp - textures/formats/ddstexture.cpp - textures/formats/flattexture.cpp - textures/formats/fontchars.cpp - textures/formats/imgztexture.cpp - textures/formats/jpegtexture.cpp - textures/formats/md5check.cpp - textures/formats/multipatchtexture.cpp - textures/formats/patchtexture.cpp - textures/formats/pcxtexture.cpp - textures/formats/pngtexture.cpp - textures/formats/rawpagetexture.cpp - textures/formats/emptytexture.cpp - textures/formats/shadertexture.cpp - textures/formats/tgatexture.cpp - textures/hires/hqresize.cpp - textures/hires/hirestex.cpp + gamedata/resourcefiles/ancientzip.cpp + gamedata/resourcefiles/file_7z.cpp + gamedata/resourcefiles/file_grp.cpp + gamedata/resourcefiles/file_lump.cpp + gamedata/resourcefiles/file_rff.cpp + gamedata/resourcefiles/file_wad.cpp + gamedata/resourcefiles/file_zip.cpp + gamedata/resourcefiles/file_pak.cpp + gamedata/resourcefiles/file_directory.cpp + gamedata/resourcefiles/resourcefile.cpp + gamedata/textures/animations.cpp + gamedata/textures/anim_switches.cpp + gamedata/textures/bitmap.cpp + gamedata/textures/texture.cpp + gamedata/textures/image.cpp + gamedata/textures/imagetexture.cpp + gamedata/textures/texturemanager.cpp + gamedata/textures/multipatchtexturebuilder.cpp + gamedata/textures/skyboxtexture.cpp + gamedata/textures/formats/automaptexture.cpp + gamedata/textures/formats/brightmaptexture.cpp + gamedata/textures/formats/buildtexture.cpp + gamedata/textures/formats/canvastexture.cpp + gamedata/textures/formats/ddstexture.cpp + gamedata/textures/formats/flattexture.cpp + gamedata/textures/formats/fontchars.cpp + gamedata/textures/formats/imgztexture.cpp + gamedata/textures/formats/jpegtexture.cpp + gamedata/textures/formats/md5check.cpp + gamedata/textures/formats/multipatchtexture.cpp + gamedata/textures/formats/patchtexture.cpp + gamedata/textures/formats/pcxtexture.cpp + gamedata/textures/formats/pngtexture.cpp + gamedata/textures/formats/rawpagetexture.cpp + gamedata/textures/formats/emptytexture.cpp + gamedata/textures/formats/shadertexture.cpp + gamedata/textures/formats/tgatexture.cpp + gamedata/textures/hires/hqresize.cpp + gamedata/textures/hires/hirestex.cpp xlat/parse_xlat.cpp fragglescript/t_func.cpp fragglescript/t_load.cpp @@ -1322,9 +1322,9 @@ include_directories( . g_statusbar g_shared gamedata + gamedata/textures rendering sound - textures sound/oplsynth sound/timidity sound/wildmidi @@ -1440,6 +1440,13 @@ source_group("External\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_D source_group("External\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sfmt/.+") source_group("FraggleScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/fragglescript/.+") source_group("Game Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/.+") +source_group("Game Data\\Resource Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/resourcefiles/.+") +source_group("Game Data\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/.+") +source_group("Game Data\\Textures\\Hires" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/hires/.+") +source_group("Game Data\\Textures\\Hires\\HQ Resize" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/hires/hqnx/.+") +source_group("Game Data\\Textures\\Hires\\HQ Resize MMX version" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/hires/hqnx_asm/.+") +source_group("Game Data\\Textures\\Hires\\XBRZ" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/hires/xbr/.+") +source_group("Game Data\\Textures\\Formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/formats/.+") source_group("Intermission" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/intermission/.+") source_group("Map Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/maploader/.+") source_group("Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/menu/.+") @@ -1478,15 +1485,8 @@ source_group("Rendering\\Poly Renderer\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRE source_group("Rendering\\Poly Renderer\\Drawers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/polyrenderer/drawers/.+") source_group("Rendering\\Poly Renderer\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/polyrenderer/scene/.+") source_group("Render Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/.+") -source_group("Render Data\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/.+") -source_group("Render Data\\Textures\\Hires" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/hires/.+") -source_group("Render Data\\Textures\\Hires\\HQ Resize" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/hires/hqnx/.+") -source_group("Render Data\\Textures\\Hires\\HQ Resize MMX version" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/hires/hqnx_asm/.+") -source_group("Render Data\\Textures\\Hires\\XBRZ" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/hires/xbr/.+") -source_group("Render Data\\Textures\\Formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/formats/.+") source_group("Render Data\\Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/models/.+") source_group("Render Interface" FILES r_defs.h r_renderer.h r_sky.cpp r_sky.h r_state.h r_utility.cpp r_utility.h) -source_group("Resource Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/resourcefiles/.+") source_group("Platforms\\POSIX Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/.+") source_group("Platforms\\Cocoa Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/cocoa/.+") source_group("Platforms\\OS X Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/osx/.+") diff --git a/src/resourcefiles/ancientzip.cpp b/src/gamedata/resourcefiles/ancientzip.cpp similarity index 100% rename from src/resourcefiles/ancientzip.cpp rename to src/gamedata/resourcefiles/ancientzip.cpp diff --git a/src/resourcefiles/ancientzip.h b/src/gamedata/resourcefiles/ancientzip.h similarity index 100% rename from src/resourcefiles/ancientzip.h rename to src/gamedata/resourcefiles/ancientzip.h diff --git a/src/resourcefiles/file_7z.cpp b/src/gamedata/resourcefiles/file_7z.cpp similarity index 100% rename from src/resourcefiles/file_7z.cpp rename to src/gamedata/resourcefiles/file_7z.cpp diff --git a/src/resourcefiles/file_directory.cpp b/src/gamedata/resourcefiles/file_directory.cpp similarity index 100% rename from src/resourcefiles/file_directory.cpp rename to src/gamedata/resourcefiles/file_directory.cpp diff --git a/src/resourcefiles/file_grp.cpp b/src/gamedata/resourcefiles/file_grp.cpp similarity index 100% rename from src/resourcefiles/file_grp.cpp rename to src/gamedata/resourcefiles/file_grp.cpp diff --git a/src/resourcefiles/file_lump.cpp b/src/gamedata/resourcefiles/file_lump.cpp similarity index 100% rename from src/resourcefiles/file_lump.cpp rename to src/gamedata/resourcefiles/file_lump.cpp diff --git a/src/resourcefiles/file_pak.cpp b/src/gamedata/resourcefiles/file_pak.cpp similarity index 100% rename from src/resourcefiles/file_pak.cpp rename to src/gamedata/resourcefiles/file_pak.cpp diff --git a/src/resourcefiles/file_rff.cpp b/src/gamedata/resourcefiles/file_rff.cpp similarity index 100% rename from src/resourcefiles/file_rff.cpp rename to src/gamedata/resourcefiles/file_rff.cpp diff --git a/src/resourcefiles/file_wad.cpp b/src/gamedata/resourcefiles/file_wad.cpp similarity index 100% rename from src/resourcefiles/file_wad.cpp rename to src/gamedata/resourcefiles/file_wad.cpp diff --git a/src/resourcefiles/file_zip.cpp b/src/gamedata/resourcefiles/file_zip.cpp similarity index 100% rename from src/resourcefiles/file_zip.cpp rename to src/gamedata/resourcefiles/file_zip.cpp diff --git a/src/resourcefiles/file_zip.h b/src/gamedata/resourcefiles/file_zip.h similarity index 100% rename from src/resourcefiles/file_zip.h rename to src/gamedata/resourcefiles/file_zip.h diff --git a/src/resourcefiles/resourcefile.cpp b/src/gamedata/resourcefiles/resourcefile.cpp similarity index 100% rename from src/resourcefiles/resourcefile.cpp rename to src/gamedata/resourcefiles/resourcefile.cpp diff --git a/src/resourcefiles/resourcefile.h b/src/gamedata/resourcefiles/resourcefile.h similarity index 100% rename from src/resourcefiles/resourcefile.h rename to src/gamedata/resourcefiles/resourcefile.h diff --git a/src/textures/anim_switches.cpp b/src/gamedata/textures/anim_switches.cpp similarity index 100% rename from src/textures/anim_switches.cpp rename to src/gamedata/textures/anim_switches.cpp diff --git a/src/textures/animations.cpp b/src/gamedata/textures/animations.cpp similarity index 100% rename from src/textures/animations.cpp rename to src/gamedata/textures/animations.cpp diff --git a/src/textures/bitmap.cpp b/src/gamedata/textures/bitmap.cpp similarity index 100% rename from src/textures/bitmap.cpp rename to src/gamedata/textures/bitmap.cpp diff --git a/src/textures/bitmap.h b/src/gamedata/textures/bitmap.h similarity index 100% rename from src/textures/bitmap.h rename to src/gamedata/textures/bitmap.h diff --git a/src/textures/formats/automaptexture.cpp b/src/gamedata/textures/formats/automaptexture.cpp similarity index 100% rename from src/textures/formats/automaptexture.cpp rename to src/gamedata/textures/formats/automaptexture.cpp diff --git a/src/textures/formats/brightmaptexture.cpp b/src/gamedata/textures/formats/brightmaptexture.cpp similarity index 100% rename from src/textures/formats/brightmaptexture.cpp rename to src/gamedata/textures/formats/brightmaptexture.cpp diff --git a/src/textures/formats/buildtexture.cpp b/src/gamedata/textures/formats/buildtexture.cpp similarity index 100% rename from src/textures/formats/buildtexture.cpp rename to src/gamedata/textures/formats/buildtexture.cpp diff --git a/src/textures/formats/canvastexture.cpp b/src/gamedata/textures/formats/canvastexture.cpp similarity index 100% rename from src/textures/formats/canvastexture.cpp rename to src/gamedata/textures/formats/canvastexture.cpp diff --git a/src/textures/formats/ddstexture.cpp b/src/gamedata/textures/formats/ddstexture.cpp similarity index 100% rename from src/textures/formats/ddstexture.cpp rename to src/gamedata/textures/formats/ddstexture.cpp diff --git a/src/textures/formats/emptytexture.cpp b/src/gamedata/textures/formats/emptytexture.cpp similarity index 100% rename from src/textures/formats/emptytexture.cpp rename to src/gamedata/textures/formats/emptytexture.cpp diff --git a/src/textures/formats/flattexture.cpp b/src/gamedata/textures/formats/flattexture.cpp similarity index 100% rename from src/textures/formats/flattexture.cpp rename to src/gamedata/textures/formats/flattexture.cpp diff --git a/src/textures/formats/fontchars.cpp b/src/gamedata/textures/formats/fontchars.cpp similarity index 100% rename from src/textures/formats/fontchars.cpp rename to src/gamedata/textures/formats/fontchars.cpp diff --git a/src/textures/formats/fontchars.h b/src/gamedata/textures/formats/fontchars.h similarity index 100% rename from src/textures/formats/fontchars.h rename to src/gamedata/textures/formats/fontchars.h diff --git a/src/textures/formats/imgztexture.cpp b/src/gamedata/textures/formats/imgztexture.cpp similarity index 100% rename from src/textures/formats/imgztexture.cpp rename to src/gamedata/textures/formats/imgztexture.cpp diff --git a/src/textures/formats/jpegtexture.cpp b/src/gamedata/textures/formats/jpegtexture.cpp similarity index 100% rename from src/textures/formats/jpegtexture.cpp rename to src/gamedata/textures/formats/jpegtexture.cpp diff --git a/src/textures/formats/md5check.cpp b/src/gamedata/textures/formats/md5check.cpp similarity index 100% rename from src/textures/formats/md5check.cpp rename to src/gamedata/textures/formats/md5check.cpp diff --git a/src/textures/formats/multipatchtexture.cpp b/src/gamedata/textures/formats/multipatchtexture.cpp similarity index 100% rename from src/textures/formats/multipatchtexture.cpp rename to src/gamedata/textures/formats/multipatchtexture.cpp diff --git a/src/textures/formats/multipatchtexture.h b/src/gamedata/textures/formats/multipatchtexture.h similarity index 100% rename from src/textures/formats/multipatchtexture.h rename to src/gamedata/textures/formats/multipatchtexture.h diff --git a/src/textures/formats/patchtexture.cpp b/src/gamedata/textures/formats/patchtexture.cpp similarity index 100% rename from src/textures/formats/patchtexture.cpp rename to src/gamedata/textures/formats/patchtexture.cpp diff --git a/src/textures/formats/pcxtexture.cpp b/src/gamedata/textures/formats/pcxtexture.cpp similarity index 100% rename from src/textures/formats/pcxtexture.cpp rename to src/gamedata/textures/formats/pcxtexture.cpp diff --git a/src/textures/formats/pngtexture.cpp b/src/gamedata/textures/formats/pngtexture.cpp similarity index 100% rename from src/textures/formats/pngtexture.cpp rename to src/gamedata/textures/formats/pngtexture.cpp diff --git a/src/textures/formats/rawpagetexture.cpp b/src/gamedata/textures/formats/rawpagetexture.cpp similarity index 100% rename from src/textures/formats/rawpagetexture.cpp rename to src/gamedata/textures/formats/rawpagetexture.cpp diff --git a/src/textures/formats/shadertexture.cpp b/src/gamedata/textures/formats/shadertexture.cpp similarity index 100% rename from src/textures/formats/shadertexture.cpp rename to src/gamedata/textures/formats/shadertexture.cpp diff --git a/src/textures/formats/tgatexture.cpp b/src/gamedata/textures/formats/tgatexture.cpp similarity index 100% rename from src/textures/formats/tgatexture.cpp rename to src/gamedata/textures/formats/tgatexture.cpp diff --git a/src/textures/hires/hirestex.cpp b/src/gamedata/textures/hires/hirestex.cpp similarity index 100% rename from src/textures/hires/hirestex.cpp rename to src/gamedata/textures/hires/hirestex.cpp diff --git a/src/textures/hires/hqnx/common.h b/src/gamedata/textures/hires/hqnx/common.h similarity index 100% rename from src/textures/hires/hqnx/common.h rename to src/gamedata/textures/hires/hqnx/common.h diff --git a/src/textures/hires/hqnx/hq2x.cpp b/src/gamedata/textures/hires/hqnx/hq2x.cpp similarity index 100% rename from src/textures/hires/hqnx/hq2x.cpp rename to src/gamedata/textures/hires/hqnx/hq2x.cpp diff --git a/src/textures/hires/hqnx/hq3x.cpp b/src/gamedata/textures/hires/hqnx/hq3x.cpp similarity index 100% rename from src/textures/hires/hqnx/hq3x.cpp rename to src/gamedata/textures/hires/hqnx/hq3x.cpp diff --git a/src/textures/hires/hqnx/hq4x.cpp b/src/gamedata/textures/hires/hqnx/hq4x.cpp similarity index 100% rename from src/textures/hires/hqnx/hq4x.cpp rename to src/gamedata/textures/hires/hqnx/hq4x.cpp diff --git a/src/textures/hires/hqnx/hqx.h b/src/gamedata/textures/hires/hqnx/hqx.h similarity index 100% rename from src/textures/hires/hqnx/hqx.h rename to src/gamedata/textures/hires/hqnx/hqx.h diff --git a/src/textures/hires/hqnx/init.cpp b/src/gamedata/textures/hires/hqnx/init.cpp similarity index 100% rename from src/textures/hires/hqnx/init.cpp rename to src/gamedata/textures/hires/hqnx/init.cpp diff --git a/src/textures/hires/hqnx_asm/hq2x_asm.cpp b/src/gamedata/textures/hires/hqnx_asm/hq2x_asm.cpp similarity index 100% rename from src/textures/hires/hqnx_asm/hq2x_asm.cpp rename to src/gamedata/textures/hires/hqnx_asm/hq2x_asm.cpp diff --git a/src/textures/hires/hqnx_asm/hq3x_asm.cpp b/src/gamedata/textures/hires/hqnx_asm/hq3x_asm.cpp similarity index 100% rename from src/textures/hires/hqnx_asm/hq3x_asm.cpp rename to src/gamedata/textures/hires/hqnx_asm/hq3x_asm.cpp diff --git a/src/textures/hires/hqnx_asm/hq4x_asm.cpp b/src/gamedata/textures/hires/hqnx_asm/hq4x_asm.cpp similarity index 100% rename from src/textures/hires/hqnx_asm/hq4x_asm.cpp rename to src/gamedata/textures/hires/hqnx_asm/hq4x_asm.cpp diff --git a/src/textures/hires/hqnx_asm/hqnx_asm.h b/src/gamedata/textures/hires/hqnx_asm/hqnx_asm.h similarity index 100% rename from src/textures/hires/hqnx_asm/hqnx_asm.h rename to src/gamedata/textures/hires/hqnx_asm/hqnx_asm.h diff --git a/src/textures/hires/hqnx_asm/hqnx_asm_Image.cpp b/src/gamedata/textures/hires/hqnx_asm/hqnx_asm_Image.cpp similarity index 100% rename from src/textures/hires/hqnx_asm/hqnx_asm_Image.cpp rename to src/gamedata/textures/hires/hqnx_asm/hqnx_asm_Image.cpp diff --git a/src/textures/hires/hqnx_asm/hqnx_asm_Image.h b/src/gamedata/textures/hires/hqnx_asm/hqnx_asm_Image.h similarity index 100% rename from src/textures/hires/hqnx_asm/hqnx_asm_Image.h rename to src/gamedata/textures/hires/hqnx_asm/hqnx_asm_Image.h diff --git a/src/textures/hires/hqresize.cpp b/src/gamedata/textures/hires/hqresize.cpp similarity index 100% rename from src/textures/hires/hqresize.cpp rename to src/gamedata/textures/hires/hqresize.cpp diff --git a/src/textures/hires/xbr/xbrz.cpp b/src/gamedata/textures/hires/xbr/xbrz.cpp similarity index 100% rename from src/textures/hires/xbr/xbrz.cpp rename to src/gamedata/textures/hires/xbr/xbrz.cpp diff --git a/src/textures/hires/xbr/xbrz.h b/src/gamedata/textures/hires/xbr/xbrz.h similarity index 100% rename from src/textures/hires/xbr/xbrz.h rename to src/gamedata/textures/hires/xbr/xbrz.h diff --git a/src/textures/hires/xbr/xbrz_config.h b/src/gamedata/textures/hires/xbr/xbrz_config.h similarity index 100% rename from src/textures/hires/xbr/xbrz_config.h rename to src/gamedata/textures/hires/xbr/xbrz_config.h diff --git a/src/textures/hires/xbr/xbrz_config_old.h b/src/gamedata/textures/hires/xbr/xbrz_config_old.h similarity index 100% rename from src/textures/hires/xbr/xbrz_config_old.h rename to src/gamedata/textures/hires/xbr/xbrz_config_old.h diff --git a/src/textures/hires/xbr/xbrz_old.cpp b/src/gamedata/textures/hires/xbr/xbrz_old.cpp similarity index 100% rename from src/textures/hires/xbr/xbrz_old.cpp rename to src/gamedata/textures/hires/xbr/xbrz_old.cpp diff --git a/src/textures/hires/xbr/xbrz_old.h b/src/gamedata/textures/hires/xbr/xbrz_old.h similarity index 100% rename from src/textures/hires/xbr/xbrz_old.h rename to src/gamedata/textures/hires/xbr/xbrz_old.h diff --git a/src/textures/hires/xbr/xbrz_tools.h b/src/gamedata/textures/hires/xbr/xbrz_tools.h similarity index 100% rename from src/textures/hires/xbr/xbrz_tools.h rename to src/gamedata/textures/hires/xbr/xbrz_tools.h diff --git a/src/textures/image.cpp b/src/gamedata/textures/image.cpp similarity index 100% rename from src/textures/image.cpp rename to src/gamedata/textures/image.cpp diff --git a/src/textures/image.h b/src/gamedata/textures/image.h similarity index 100% rename from src/textures/image.h rename to src/gamedata/textures/image.h diff --git a/src/textures/imagehelpers.h b/src/gamedata/textures/imagehelpers.h similarity index 100% rename from src/textures/imagehelpers.h rename to src/gamedata/textures/imagehelpers.h diff --git a/src/textures/imagetexture.cpp b/src/gamedata/textures/imagetexture.cpp similarity index 100% rename from src/textures/imagetexture.cpp rename to src/gamedata/textures/imagetexture.cpp diff --git a/src/textures/multipatchtexturebuilder.cpp b/src/gamedata/textures/multipatchtexturebuilder.cpp similarity index 100% rename from src/textures/multipatchtexturebuilder.cpp rename to src/gamedata/textures/multipatchtexturebuilder.cpp diff --git a/src/textures/skyboxtexture.cpp b/src/gamedata/textures/skyboxtexture.cpp similarity index 100% rename from src/textures/skyboxtexture.cpp rename to src/gamedata/textures/skyboxtexture.cpp diff --git a/src/textures/skyboxtexture.h b/src/gamedata/textures/skyboxtexture.h similarity index 100% rename from src/textures/skyboxtexture.h rename to src/gamedata/textures/skyboxtexture.h diff --git a/src/textures/texture.cpp b/src/gamedata/textures/texture.cpp similarity index 100% rename from src/textures/texture.cpp rename to src/gamedata/textures/texture.cpp diff --git a/src/textures/texturemanager.cpp b/src/gamedata/textures/texturemanager.cpp similarity index 100% rename from src/textures/texturemanager.cpp rename to src/gamedata/textures/texturemanager.cpp diff --git a/src/textures/textures.h b/src/gamedata/textures/textures.h similarity index 100% rename from src/textures/textures.h rename to src/gamedata/textures/textures.h