From 7346288bf55c1e6cb5a31cded9576f7eeb2814bb Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 14 Jul 2019 21:09:49 +0200 Subject: [PATCH] - moved some more files. --- src/CMakeLists.txt | 17 ++++++++++------- src/am_map.cpp | 1 - src/d_main.cpp | 1 - src/g_game.cpp | 1 - src/g_level.cpp | 1 - src/{ => gamedata}/r_defs.h | 0 src/gamedata/textures/texturemanager.cpp | 1 - src/p_saveg.cpp | 1 - src/p_setup.cpp | 2 +- src/playsim/fragglescript/t_cmd.cpp | 1 - src/{ => playsim}/p_acs.cpp | 0 src/{ => playsim}/p_acs.h | 0 src/playsim/p_mobj.cpp | 1 - src/playsim/p_user.cpp | 1 - src/posix/cocoa/i_video.mm | 1 - src/{ => r_data}/v_palette.cpp | 0 src/{ => r_data}/v_palette.h | 0 src/rendering/2d/v_draw.cpp | 1 - src/rendering/gl/renderer/gl_renderer.h | 2 +- src/{ => rendering}/i_video.h | 0 src/{ => rendering}/r_sky.cpp | 0 src/{ => rendering}/r_sky.h | 0 src/{ => rendering}/r_utility.cpp | 2 +- src/{ => rendering}/r_utility.h | 0 src/{ => rendering}/r_videoscale.cpp | 0 src/{ => rendering}/r_videoscale.h | 0 src/{ => rendering/swrenderer}/r_renderer.h | 0 src/rendering/swrenderer/r_swcolormaps.cpp | 2 +- src/rendering/swrenderer/r_swrenderer.h | 2 +- src/rendering/swrenderer/r_swscene.cpp | 2 +- src/{ => rendering}/v_framebuffer.cpp | 2 +- src/{ => rendering}/v_video.cpp | 2 +- src/{ => rendering}/v_video.h | 0 src/{ => sound/music}/i_cd.h | 0 34 files changed, 18 insertions(+), 26 deletions(-) rename src/{ => gamedata}/r_defs.h (100%) rename src/{ => playsim}/p_acs.cpp (100%) rename src/{ => playsim}/p_acs.h (100%) rename src/{ => r_data}/v_palette.cpp (100%) rename src/{ => r_data}/v_palette.h (100%) rename src/{ => rendering}/i_video.h (100%) rename src/{ => rendering}/r_sky.cpp (100%) rename src/{ => rendering}/r_sky.h (100%) rename src/{ => rendering}/r_utility.cpp (99%) rename src/{ => rendering}/r_utility.h (100%) rename src/{ => rendering}/r_videoscale.cpp (100%) rename src/{ => rendering}/r_videoscale.h (100%) rename src/{ => rendering/swrenderer}/r_renderer.h (100%) rename src/{ => rendering}/v_framebuffer.cpp (99%) rename src/{ => rendering}/v_video.cpp (99%) rename src/{ => rendering}/v_video.h (100%) rename src/{ => sound/music}/i_cd.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d8a20e2d9..bcaf90fb5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -704,6 +704,7 @@ file( GLOB HEADER_FILES sound/timidity/*.h sound/timiditypp/*.h sound/wildmidi/*.h + rendering/*.h rendering/2d/*.h rendering/swrenderer/*.h rendering/swrenderer/textures/*.h @@ -971,7 +972,7 @@ set (PCH_SOURCES m_cheat.cpp m_joy.cpp m_misc.cpp - p_acs.cpp + playsim/p_acs.cpp playsim/p_actionfunctions.cpp p_conversation.cpp playsim/p_destructible.cpp @@ -991,9 +992,9 @@ set (PCH_SOURCES playsim/p_things.cpp p_tick.cpp playsim/p_user.cpp - r_utility.cpp - r_sky.cpp - r_videoscale.cpp + rendering/r_utility.cpp + rendering/r_sky.cpp + rendering/r_videoscale.cpp sound/s_advsound.cpp sound/s_environment.cpp sound/s_sndseq.cpp @@ -1001,9 +1002,9 @@ set (PCH_SOURCES serializer.cpp scriptutil.cpp st_stuff.cpp - v_framebuffer.cpp - v_palette.cpp - v_video.cpp + rendering/v_framebuffer.cpp + r_data/v_palette.cpp + rendering/v_video.cpp wi_stuff.cpp gamedata/a_keys.cpp gamedata/a_weapons.cpp @@ -1389,6 +1390,7 @@ include_directories( . gamedata/fonts rendering rendering/2d + r_data sound sound/music sound/backend @@ -1400,6 +1402,7 @@ include_directories( . utility/nodebuilder scripting scripting/vm + rendering rendering/vulkan/thirdparty ../libraries/gdtoa ../libraries/dumb/include diff --git a/src/am_map.cpp b/src/am_map.cpp index e7708ae23..690c078fa 100644 --- a/src/am_map.cpp +++ b/src/am_map.cpp @@ -41,7 +41,6 @@ #include "p_setup.h" #include "c_bind.h" #include "serializer.h" -#include "r_renderer.h" #include "r_sky.h" #include "sbar.h" #include "d_player.h" diff --git a/src/d_main.cpp b/src/d_main.cpp index 8a56a672b..930f1893d 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -91,7 +91,6 @@ #include "m_cheat.h" #include "m_joy.h" #include "po_man.h" -#include "r_renderer.h" #include "p_local.h" #include "autosegs.h" #include "fragglescript/t_fs.h" diff --git a/src/g_game.cpp b/src/g_game.cpp index 3e040df56..0e74f3b44 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -64,7 +64,6 @@ #include "p_acs.h" #include "p_effect.h" #include "m_joy.h" -#include "r_renderer.h" #include "r_utility.h" #include "a_morph.h" #include "p_spec.h" diff --git a/src/g_level.cpp b/src/g_level.cpp index e51ce4e1f..c989af3d8 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -71,7 +71,6 @@ #include "d_netinf.h" #include "menu/menu.h" #include "a_sharedglobal.h" -#include "r_renderer.h" #include "r_utility.h" #include "p_spec.h" #include "serializer.h" diff --git a/src/r_defs.h b/src/gamedata/r_defs.h similarity index 100% rename from src/r_defs.h rename to src/gamedata/r_defs.h diff --git a/src/gamedata/textures/texturemanager.cpp b/src/gamedata/textures/texturemanager.cpp index 6e2f00d4c..a8bdba67e 100644 --- a/src/gamedata/textures/texturemanager.cpp +++ b/src/gamedata/textures/texturemanager.cpp @@ -51,7 +51,6 @@ #include "cmdlib.h" #include "g_level.h" #include "v_video.h" -#include "r_renderer.h" #include "r_sky.h" #include "vm.h" #include "image.h" diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index aebb4519b..b842e23b6 100644 --- a/src/p_saveg.cpp +++ b/src/p_saveg.cpp @@ -52,7 +52,6 @@ #include "sbar.h" #include "r_utility.h" #include "r_sky.h" -#include "r_renderer.h" #include "serializer.h" #include "g_levellocals.h" #include "events.h" diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 7d92b794c..714cb4eba 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -56,7 +56,7 @@ #include "cmdlib.h" #include "md5.h" #include "po_man.h" -#include "r_renderer.h" +#include "swrenderer/r_renderer.h" #include "p_blockmap.h" #include "r_utility.h" #include "p_spec.h" diff --git a/src/playsim/fragglescript/t_cmd.cpp b/src/playsim/fragglescript/t_cmd.cpp index 905c47c99..c9b27aee3 100644 --- a/src/playsim/fragglescript/t_cmd.cpp +++ b/src/playsim/fragglescript/t_cmd.cpp @@ -33,7 +33,6 @@ #include "c_dispatch.h" #include "sc_man.h" #include "g_level.h" -#include "r_renderer.h" #include "d_player.h" #include "g_levellocals.h" diff --git a/src/p_acs.cpp b/src/playsim/p_acs.cpp similarity index 100% rename from src/p_acs.cpp rename to src/playsim/p_acs.cpp diff --git a/src/p_acs.h b/src/playsim/p_acs.h similarity index 100% rename from src/p_acs.h rename to src/playsim/p_acs.h diff --git a/src/playsim/p_mobj.cpp b/src/playsim/p_mobj.cpp index 6766ae030..a933873c5 100644 --- a/src/playsim/p_mobj.cpp +++ b/src/playsim/p_mobj.cpp @@ -85,7 +85,6 @@ #include "d_event.h" #include "p_enemy.h" #include "gstrings.h" -#include "r_renderer.h" #include "po_man.h" #include "p_spec.h" #include "p_checkposition.h" diff --git a/src/playsim/p_user.cpp b/src/playsim/p_user.cpp index 0cb74335d..da1e46494 100644 --- a/src/playsim/p_user.cpp +++ b/src/playsim/p_user.cpp @@ -78,7 +78,6 @@ #include "c_dispatch.h" #include "d_net.h" #include "serializer.h" -#include "r_renderer.h" #include "d_player.h" #include "r_utility.h" #include "p_blockmap.h" diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm index 50529e6ca..a03cae46c 100644 --- a/src/posix/cocoa/i_video.mm +++ b/src/posix/cocoa/i_video.mm @@ -48,7 +48,6 @@ #include "i_system.h" #include "m_argv.h" #include "m_png.h" -#include "r_renderer.h" #include "swrenderer/r_swrenderer.h" #include "st_console.h" #include "v_text.h" diff --git a/src/v_palette.cpp b/src/r_data/v_palette.cpp similarity index 100% rename from src/v_palette.cpp rename to src/r_data/v_palette.cpp diff --git a/src/v_palette.h b/src/r_data/v_palette.h similarity index 100% rename from src/v_palette.h rename to src/r_data/v_palette.h diff --git a/src/rendering/2d/v_draw.cpp b/src/rendering/2d/v_draw.cpp index 0f77380b9..c1ceceac6 100644 --- a/src/rendering/2d/v_draw.cpp +++ b/src/rendering/2d/v_draw.cpp @@ -39,7 +39,6 @@ #include "v_video.h" #include "r_defs.h" #include "r_utility.h" -#include "r_renderer.h" #include "doomstat.h" #include "gi.h" #include "g_level.h" diff --git a/src/rendering/gl/renderer/gl_renderer.h b/src/rendering/gl/renderer/gl_renderer.h index 5587228f5..7dd5ad98c 100644 --- a/src/rendering/gl/renderer/gl_renderer.h +++ b/src/rendering/gl/renderer/gl_renderer.h @@ -4,7 +4,7 @@ #include "r_defs.h" #include "v_video.h" #include "vectors.h" -#include "r_renderer.h" +#include "swrenderer/r_renderer.h" #include "r_data/matrix.h" #include "gl/renderer/gl_renderbuffers.h" #include "hwrenderer/scene/hw_portal.h" diff --git a/src/i_video.h b/src/rendering/i_video.h similarity index 100% rename from src/i_video.h rename to src/rendering/i_video.h diff --git a/src/r_sky.cpp b/src/rendering/r_sky.cpp similarity index 100% rename from src/r_sky.cpp rename to src/rendering/r_sky.cpp diff --git a/src/r_sky.h b/src/rendering/r_sky.h similarity index 100% rename from src/r_sky.h rename to src/rendering/r_sky.h diff --git a/src/r_utility.cpp b/src/rendering/r_utility.cpp similarity index 99% rename from src/r_utility.cpp rename to src/rendering/r_utility.cpp index 3bab7e085..6e063928c 100644 --- a/src/r_utility.cpp +++ b/src/rendering/r_utility.cpp @@ -51,7 +51,7 @@ #include "p_effect.h" #include "st_start.h" #include "v_font.h" -#include "r_renderer.h" +#include "swrenderer/r_renderer.h" #include "serializer.h" #include "r_utility.h" #include "d_player.h" diff --git a/src/r_utility.h b/src/rendering/r_utility.h similarity index 100% rename from src/r_utility.h rename to src/rendering/r_utility.h diff --git a/src/r_videoscale.cpp b/src/rendering/r_videoscale.cpp similarity index 100% rename from src/r_videoscale.cpp rename to src/rendering/r_videoscale.cpp diff --git a/src/r_videoscale.h b/src/rendering/r_videoscale.h similarity index 100% rename from src/r_videoscale.h rename to src/rendering/r_videoscale.h diff --git a/src/r_renderer.h b/src/rendering/swrenderer/r_renderer.h similarity index 100% rename from src/r_renderer.h rename to src/rendering/swrenderer/r_renderer.h diff --git a/src/rendering/swrenderer/r_swcolormaps.cpp b/src/rendering/swrenderer/r_swcolormaps.cpp index 23dbf1281..f22f67cc4 100644 --- a/src/rendering/swrenderer/r_swcolormaps.cpp +++ b/src/rendering/swrenderer/r_swcolormaps.cpp @@ -54,7 +54,7 @@ #include "v_video.h" #include "templates.h" #include "r_utility.h" -#include "r_renderer.h" +#include "swrenderer/r_renderer.h" #include "atterm.h" #include diff --git a/src/rendering/swrenderer/r_swrenderer.h b/src/rendering/swrenderer/r_swrenderer.h index f2cdb116d..7ab3c0508 100644 --- a/src/rendering/swrenderer/r_swrenderer.h +++ b/src/rendering/swrenderer/r_swrenderer.h @@ -1,7 +1,7 @@ #pragma once -#include "r_renderer.h" +#include "swrenderer/r_renderer.h" #include "swrenderer/scene/r_scene.h" struct FSoftwareRenderer : public FRenderer diff --git a/src/rendering/swrenderer/r_swscene.cpp b/src/rendering/swrenderer/r_swscene.cpp index 8c24a3db1..cf4a54ecb 100644 --- a/src/rendering/swrenderer/r_swscene.cpp +++ b/src/rendering/swrenderer/r_swscene.cpp @@ -27,7 +27,7 @@ #include "hwrenderer/textures/hw_ihwtexture.h" #include "hwrenderer/textures/hw_material.h" -#include "r_renderer.h" +#include "swrenderer/r_renderer.h" #include "r_swscene.h" #include "w_wad.h" #include "d_player.h" diff --git a/src/v_framebuffer.cpp b/src/rendering/v_framebuffer.cpp similarity index 99% rename from src/v_framebuffer.cpp rename to src/rendering/v_framebuffer.cpp index 207f888d2..df59a0094 100644 --- a/src/v_framebuffer.cpp +++ b/src/rendering/v_framebuffer.cpp @@ -44,7 +44,7 @@ #include "sbar.h" #include "hardware.h" #include "r_utility.h" -#include "r_renderer.h" +#include "swrenderer/r_renderer.h" #include "vm.h" #include "r_videoscale.h" #include "i_time.h" diff --git a/src/v_video.cpp b/src/rendering/v_video.cpp similarity index 99% rename from src/v_video.cpp rename to src/rendering/v_video.cpp index 645fc9719..66ffa0f99 100644 --- a/src/v_video.cpp +++ b/src/rendering/v_video.cpp @@ -61,7 +61,7 @@ #include "hardware.h" #include "m_png.h" #include "r_utility.h" -#include "r_renderer.h" +#include "swrenderer/r_renderer.h" #include "menu/menu.h" #include "vm.h" #include "r_videoscale.h" diff --git a/src/v_video.h b/src/rendering/v_video.h similarity index 100% rename from src/v_video.h rename to src/rendering/v_video.h diff --git a/src/i_cd.h b/src/sound/music/i_cd.h similarity index 100% rename from src/i_cd.h rename to src/sound/music/i_cd.h