Merge remote-tracking branch 'origin/master' into clientserver

ZDoom · Jul 14, 2019 · 6e9ba2f · 6e9ba2f
2 parents c93447a + f25e5c7
commit 6e9ba2f
Show file tree

Hide file tree

Showing 34 changed files with 21 additions and 31 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -705,6 +705,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
@@ -977,7 +978,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
@@ -997,19 +998,19 @@ 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
 	sound/s_sound.cpp
 	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
@@ -1395,6 +1396,7 @@ include_directories( .
 	gamedata/fonts
 	rendering
 	rendering/2d
+	r_data
 	sound
 	sound/music
 	sound/backend
@@ -1406,12 +1408,13 @@ include_directories( .
 	utility/nodebuilder
 	scripting
 	scripting/vm
+	rendering
 	rendering/vulkan/thirdparty
 	../libraries/gdtoa
 	../libraries/dumb/include
 	../libraries/glslang/glslang/Public
 	../libraries/glslang/spirv
-	${CMAKE_BINARY_DIR}/gdtoa
+	${CMAKE_BINARY_DIR}/libraries/gdtoa
 	${SYSTEM_SOURCES_DIR} )
 
 add_dependencies( zdoom revision_check )

diff --git 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
@@ -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
@@ -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
@@ -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 → src/gamedata/r_defs.h b/src/r_defs.h → src/gamedata/r_defs.h
diff --git 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
@@ -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
@@ -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
@@ -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 → src/playsim/p_acs.cpp b/src/p_acs.cpp → src/playsim/p_acs.cpp
@@ -542,9 +542,6 @@ FRandom pr_acs ("ACS");
 // potentially get used with recursive functions.
 #define STACK_SIZE 4096
 
-#define CLAMPCOLOR(c)		(EColorRange)((unsigned)(c) >= NUM_TEXT_COLORS ? CR_UNTRANSLATED : (c))
-#define LANGREGIONMASK		MAKE_ID(0,0,0xff,0xff)
-
 // HUD message flags
 #define HUDMSG_LOG					(0x80000000)
 #define HUDMSG_COLORSTRING			(0x40000000)
@@ -8654,7 +8651,8 @@ int DLevelScript::RunScript()
 					}
 					else
 					{
-						color = CLAMPCOLOR(Stack[optstart-4]);
+						auto c = Stack[optstart - 4];
+						color = (EColorRange)((unsigned)(c) >= NUM_TEXT_COLORS ? CR_UNTRANSLATED : (c));
 					}
 
 					switch (type & 0xFF)

diff --git a/src/p_acs.h → src/playsim/p_acs.h b/src/p_acs.h → src/playsim/p_acs.h
diff --git 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
@@ -78,7 +78,6 @@
 #include "c_dispatch.h"
 #include "network/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
@@ -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 → src/r_data/v_palette.cpp b/src/v_palette.cpp → src/r_data/v_palette.cpp
diff --git a/src/v_palette.h → src/r_data/v_palette.h b/src/v_palette.h → src/r_data/v_palette.h
diff --git 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
@@ -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 → src/rendering/i_video.h b/src/i_video.h → src/rendering/i_video.h
diff --git a/src/r_sky.cpp → src/rendering/r_sky.cpp b/src/r_sky.cpp → src/rendering/r_sky.cpp
diff --git a/src/r_sky.h → src/rendering/r_sky.h b/src/r_sky.h → src/rendering/r_sky.h
diff --git a/src/r_utility.cpp → src/rendering/r_utility.cpp b/src/r_utility.cpp → 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 → src/rendering/r_utility.h b/src/r_utility.h → src/rendering/r_utility.h
diff --git a/src/r_videoscale.cpp → src/rendering/r_videoscale.cpp b/src/r_videoscale.cpp → src/rendering/r_videoscale.cpp
diff --git a/src/r_videoscale.h → src/rendering/r_videoscale.h b/src/r_videoscale.h → src/rendering/r_videoscale.h
diff --git a/src/r_renderer.h → src/rendering/swrenderer/r_renderer.h b/src/r_renderer.h → src/rendering/swrenderer/r_renderer.h
diff --git 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 <atomic>
 

diff --git 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
@@ -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 → src/rendering/v_framebuffer.cpp b/src/v_framebuffer.cpp → 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 → src/rendering/v_video.cpp b/src/v_video.cpp → 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 → src/rendering/v_video.h b/src/v_video.h → src/rendering/v_video.h
diff --git a/src/i_cd.h → src/sound/music/i_cd.h b/src/i_cd.h → src/sound/music/i_cd.h