- moved r_interpolate.cpp and r_translate.cpp to r_data.

- merged r_jpeg.h into jpegtexture.cpp because that's the only place where it's ever used.


SVN r3255 (trunk)

src/CMakeLists.txt

@@ -726,14 +726,12 @@ add_executable( zdoom WIN32
 	r_bsp.cpp
 	r_draw.cpp
 	r_drawt.cpp
-	r_interpolate.cpp
 	r_main.cpp
 	r_plane.cpp
 	r_polymost.cpp
 	r_segs.cpp
 	r_sky.cpp
 	r_things.cpp
-	r_translate.cpp
 	s_advsound.cpp
 	s_environment.cpp
 	s_playlist.cpp
@@ -906,6 +904,8 @@ add_executable( zdoom WIN32
 	r_data/colormaps.cpp
 	r_data/voxels.cpp
 	r_data/renderstyle.cpp
+	r_data/r_interpolate.cpp
+	r_data/r_translate.cpp
 	autozend.cpp
 )
 

src/am_map.cpp

@@ -33,7 +33,7 @@
 #include "w_wad.h"
 #include "a_sharedglobal.h"
 #include "statnums.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "d_event.h"
 #include "gi.h"
 #include "r_bsp.h"

src/d_dehacked.cpp

@@ -67,7 +67,7 @@
 #include "thingdef/thingdef_exp.h"
 #include "vectors.h"
 #include "dobject.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "sc_man.h"
 #include "i_system.h"
 #include "doomerrors.h"

src/d_netinfo.cpp

@@ -53,7 +53,7 @@
 #include "gi.h"
 #include "m_random.h"
 #include "teaminfo.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "templates.h"
 #include "cmdlib.h"
 

src/decallib.cpp

@@ -44,7 +44,7 @@
 #include "templates.h"
 #include "r_draw.h"
 #include "a_sharedglobal.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "gi.h"
 #include "g_level.h"
 #include "colormatcher.h"

src/dobjgc.cpp

@@ -67,7 +67,7 @@
 #include "c_dispatch.h"
 #include "p_acs.h"
 #include "s_sndseq.h"
-#include "r_interpolate.h"
+#include "r_data/r_interpolate.h"
 #include "doomstat.h"
 #include "m_argv.h"
 #include "po_man.h"

src/dsectoreffect.cpp

@@ -26,7 +26,7 @@
 #include "gi.h"
 #include "p_local.h"
 #include "p_3dmidtex.h"
-#include "r_interpolate.h"
+#include "r_data/r_interpolate.h"
 #include "statnums.h"
 
 IMPLEMENT_CLASS (DSectorEffect)

src/g_doom/a_scriptedmarine.cpp

@@ -7,7 +7,7 @@
 #include "p_local.h"
 #include "a_doomglobal.h"
 #include "s_sound.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "thingdef/thingdef.h"
 #include "g_level.h"
 */

src/g_game.cpp

@@ -72,7 +72,7 @@
 #include "gi.h"
 #include "a_keys.h"
 #include "a_artifacts.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "cmdlib.h"
 #include "d_net.h"
 #include "d_event.h"

src/g_heretic/a_hereticmisc.cpp

@@ -12,7 +12,7 @@
 #include "g_level.h"
 #include "a_sharedglobal.h"
 #include "templates.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "doomstat.h"
 
 // Include all the other Heretic stuff here to reduce compile time

src/g_heretic/a_hereticweaps.cpp

@@ -10,7 +10,7 @@
 #include "p_local.h"
 #include "gstrings.h"
 #include "gi.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "thingdef/thingdef.h"
 #include "doomstat.h"
 */

src/g_level.cpp

@@ -69,9 +69,9 @@
 #include "version.h"
 #include "statnums.h"
 #include "sbarinfo.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "p_lnspec.h"
-#include "r_interpolate.h"
+#include "r_data/r_interpolate.h"
 #include "cmdlib.h"
 #include "d_net.h"
 #include "d_netinf.h"

src/g_shared/a_action.cpp

@@ -11,7 +11,7 @@
 #include "p_enemy.h"
 #include "statnums.h"
 #include "templates.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 
 static FRandom pr_freezedeath ("FreezeDeath");
 static FRandom pr_icesettics ("IceSetTics");

src/g_shared/sbarinfo.cpp

@@ -50,7 +50,7 @@
 #include "i_system.h"
 #include "sbarinfo.h"
 #include "gi.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "r_main.h"
 #include "a_weaponpiece.h"
 #include "a_strifeglobal.h"

src/intermission/intermission.cpp

@@ -45,7 +45,7 @@
 #include "actor.h"
 #include "d_player.h"
 #include "r_state.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "c_bind.h"
 #include "g_level.h"
 #include "p_conversation.h"

src/m_cheat.cpp

@@ -40,7 +40,7 @@
 #include "a_keys.h"
 #include "templates.h"
 #include "c_console.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "g_level.h"
 #include "d_net.h"
 #include "d_dehacked.h"

src/menu/menu.h

@@ -6,7 +6,7 @@
 
 #include "dobject.h"
 #include "d_player.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "c_cvars.h"
 #include "v_font.h"
 #include "version.h"

src/menu/playermenu.cpp

@@ -45,7 +45,7 @@
 #include "teaminfo.h"
 #include "v_palette.h"
 #include "r_state.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "v_text.h"
 
 EXTERN_CVAR (String, playerclass)

src/p_acs.cpp

@@ -66,7 +66,7 @@
 #include "sc_man.h"
 #include "c_bind.h"
 #include "info.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "cmdlib.h"
 #include "m_png.h"
 #include "p_setup.h"

src/p_floor.cpp

@@ -30,7 +30,7 @@
 #include "r_state.h"
 #include "tables.h"
 #include "p_3dmidtex.h"
-#include "r_interpolate.h"
+#include "r_data/r_interpolate.h"
 
 //==========================================================================
 //

src/p_lnspec.cpp

@@ -52,7 +52,7 @@
 #include "m_random.h"
 #include "p_conversation.h"
 #include "a_strifeglobal.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "p_3dmidtex.h"
 #include "d_net.h"
 #include "d_event.h"

src/p_map.cpp

@@ -50,7 +50,7 @@
 
 #include "a_sharedglobal.h"
 #include "p_conversation.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "g_level.h"
 
 #define WATER_SINK_FACTOR		3

src/p_mobj.cpp

@@ -53,7 +53,7 @@
 #include "thingdef/thingdef.h"
 #include "g_game.h"
 #include "teaminfo.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "r_sky.h"
 #include "g_level.h"
 #include "d_event.h"

src/p_pillar.cpp

@@ -37,7 +37,7 @@
 #include "p_spec.h"
 #include "g_level.h"
 #include "s_sndseq.h"
-#include "r_interpolate.h"
+#include "r_data/r_interpolate.h"
 
 IMPLEMENT_POINTY_CLASS (DPillar)
 	DECLARE_POINTER(m_Interp_Floor)

src/p_saveg.cpp

@@ -44,7 +44,7 @@
 #include "s_sndseq.h"
 #include "v_palette.h"
 #include "a_sharedglobal.h"
-#include "r_interpolate.h"
+#include "r_data/r_interpolate.h"
 #include "g_level.h"
 #include "po_man.h"
 #include "p_setup.h"

src/p_setup.cpp

@@ -58,8 +58,8 @@
 #include "s_sndseq.h"
 #include "sbar.h"
 #include "p_setup.h"
-#include "r_translate.h"
-#include "r_interpolate.h"
+#include "r_data/r_translate.h"
+#include "r_data/r_interpolate.h"
 #include "r_sky.h"
 #include "cmdlib.h"
 #include "g_level.h"

src/p_spec.cpp

@@ -66,7 +66,7 @@
 
 #include "c_console.h"
 
-#include "r_interpolate.h"
+#include "r_data/r_interpolate.h"
 
 static FRandom pr_playerinspecialsector ("PlayerInSpecialSector");
 void P_SetupPortals();

src/p_tick.cpp

@@ -29,7 +29,7 @@
 #include "s_sound.h"
 #include "doomstat.h"
 #include "sbar.h"
-#include "r_interpolate.h"
+#include "r_data/r_interpolate.h"
 #include "i_sound.h"
 #include "g_level.h"
 

src/po_man.cpp

@@ -24,7 +24,7 @@
 #include "a_sharedglobal.h"
 #include "r_main.h"
 #include "p_lnspec.h"
-#include "r_interpolate.h"
+#include "r_data/r_interpolate.h"
 #include "g_level.h"
 #include "po_man.h"
 #include "p_setup.h"

src/r_data/r_interpolate.cpp

@@ -35,7 +35,7 @@
 
 #include "p_3dmidtex.h"
 #include "stats.h"
-#include "r_interpolate.h"
+#include "r_data/r_interpolate.h"
 #include "p_local.h"
 #include "i_system.h"
 #include "po_man.h"

src/r_data/r_translate.cpp

@@ -37,7 +37,7 @@
 #include "templates.h"
 #include "r_draw.h"
 #include "r_main.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "v_video.h"
 #include "g_game.h"
 #include "colormatcher.h"

src/r_data/voxels.cpp

@@ -62,7 +62,7 @@
 #include "r_plane.h"
 #include "r_segs.h"
 #include "v_palette.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "r_data/colormaps.h"
 #include "voxels.h"
 

src/r_draw.cpp

@@ -36,7 +36,7 @@
 #include "a_hexenglobal.h"
 #include "g_game.h"
 #include "g_level.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
 

src/r_jpeg.h

@@ -1,30 +0,0 @@
-#ifndef __R_JPEG_H
-#define __R_JPEG_H
-
-extern "C"
-{
-#include <jpeglib.h>
-}
-
-class FileReader;
-
-
-struct FLumpSourceMgr : public jpeg_source_mgr
-{
-	FileReader *Lump;
-	JOCTET Buffer[4096];
-	bool StartOfFile;
-
-	FLumpSourceMgr (FileReader *lump, j_decompress_ptr cinfo);
-	static void InitSource (j_decompress_ptr cinfo);
-	static boolean FillInputBuffer (j_decompress_ptr cinfo);
-	static void SkipInputData (j_decompress_ptr cinfo, long num_bytes);
-	static void TermSource (j_decompress_ptr cinfo);
-};
-
-
-void JPEG_ErrorExit (j_common_ptr cinfo);
-void JPEG_OutputMessage (j_common_ptr cinfo);
-
-
-#endif

src/r_main.cpp

@@ -44,9 +44,9 @@
 #include "i_video.h"
 #include "i_system.h"
 #include "a_sharedglobal.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "p_3dmidtex.h"
-#include "r_interpolate.h"
+#include "r_data/r_interpolate.h"
 #include "r_bsp.h"
 #include "r_plane.h"
 #include "r_3dfloors.h"

src/r_things.cpp

@@ -58,7 +58,7 @@
 #include "r_segs.h"
 #include "r_3dfloors.h"
 #include "v_palette.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "r_data/colormaps.h"
 #include "r_data/voxels.h"
 

src/textures/bitmap.cpp

@@ -34,7 +34,7 @@
 
 #include "bitmap.h"
 #include "templates.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "v_palette.h"
 #include "r_data/colormaps.h"
 

src/textures/jpegtexture.cpp

@@ -33,15 +33,35 @@
 **
 */
 
+#include <stdio.h>
+extern "C"
+{
+#include <jpeglib.h>
+}
+
 #include "doomtype.h"
 #include "files.h"
-#include "r_jpeg.h"
 #include "w_wad.h"
 #include "v_text.h"
 #include "bitmap.h"
 #include "v_video.h"
 #include "textures/textures.h"
 
+
+struct FLumpSourceMgr : public jpeg_source_mgr
+{
+	FileReader *Lump;
+	JOCTET Buffer[4096];
+	bool StartOfFile;
+
+	FLumpSourceMgr (FileReader *lump, j_decompress_ptr cinfo);
+	static void InitSource (j_decompress_ptr cinfo);
+	static boolean FillInputBuffer (j_decompress_ptr cinfo);
+	static void SkipInputData (j_decompress_ptr cinfo, long num_bytes);
+	static void TermSource (j_decompress_ptr cinfo);
+};
+
+
 //==========================================================================
 //
 //

src/textures/multipatchtexture.cpp

@@ -42,7 +42,7 @@
 #include "st_start.h"
 #include "sc_man.h"
 #include "templates.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "bitmap.h"
 #include "colormatcher.h"
 #include "v_palette.h"

src/textures/texture.cpp

@@ -38,7 +38,7 @@
 #include "w_wad.h"
 #include "templates.h"
 #include "i_system.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "bitmap.h"
 #include "colormatcher.h"
 #include "c_dispatch.h"

src/textures/texturemanager.cpp

@@ -39,7 +39,7 @@
 #include "w_wad.h"
 #include "templates.h"
 #include "i_system.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "c_dispatch.h"
 #include "v_text.h"
 #include "sc_man.h"

src/thingdef/olddecorations.cpp

@@ -49,7 +49,7 @@
 #include "decallib.h"
 #include "i_system.h"
 #include "thingdef.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 
 // TYPES -------------------------------------------------------------------
 

src/thingdef/thingdef_properties.cpp

@@ -64,7 +64,7 @@
 #include "v_text.h"
 #include "thingdef.h"
 #include "a_sharedglobal.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "a_morph.h"
 #include "colormatcher.h"
 #include "teaminfo.h"

src/v_draw.cpp

@@ -42,7 +42,7 @@
 #include "r_draw.h"
 #include "r_main.h"
 #include "r_things.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "doomstat.h"
 #include "v_palette.h"
 #include "gi.h"

src/v_font.cpp

@@ -91,7 +91,7 @@ The FON2 header is followed by variable length data:
 #include "sc_man.h"
 #include "hu_stuff.h"
 #include "r_draw.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "colormatcher.h"
 #include "v_palette.h"
 

src/v_video.cpp

@@ -56,7 +56,7 @@
 #include "templates.h"
 #include "sbar.h"
 #include "hardware.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "f_wipe.h"
 #include "m_png.h"
 #include "colormatcher.h"

src/wi_stuff.cpp

@@ -45,7 +45,7 @@
 #include "sc_man.h"
 #include "v_text.h"
 #include "gi.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "templates.h"
 #include "gstrings.h"
 

src/win32/fb_d3d9.cpp

@@ -64,7 +64,7 @@
 #include "stats.h"
 #include "doomerrors.h"
 #include "r_main.h"
-#include "r_translate.h"
+#include "r_data/r_translate.h"
 #include "f_wipe.h"
 #include "st_stuff.h"
 #include "win32iface.h"

zdoom.vcproj

@@ -2331,10 +2331,6 @@
 					RelativePath=".\src\r_drawt.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\src\r_interpolate.cpp"
-					>
-				</File>
 				<File
 					RelativePath=".\src\r_main.cpp"
 					>
@@ -2359,10 +2355,6 @@
 					RelativePath=".\src\r_things.cpp"
 					>
 				</File>
-				<File
-					RelativePath=".\src\r_translate.cpp"
-					>
-				</File>
 			</Filter>
 			<Filter
 				Name="Render Headers"
@@ -2383,14 +2375,6 @@
 					RelativePath=".\src\r_draw.h"
 					>
 				</File>
-				<File
-					RelativePath=".\src\r_interpolate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\r_jpeg.h"
-					>
-				</File>
 				<File
 					RelativePath=".\src\r_local.h"
 					>
@@ -2423,10 +2407,6 @@
 					RelativePath=".\src\r_things.h"
 					>
 				</File>
-				<File
-					RelativePath=".\src\r_translate.h"
-					>
-				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -6632,6 +6612,14 @@
 					RelativePath=".\src\r_data\colormaps.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\r_data\r_interpolate.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\r_data\r_translate.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\r_data\renderstyle.h"
 					>
@@ -6648,6 +6636,14 @@
 					RelativePath=".\src\r_data\colormaps.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\r_data\r_interpolate.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\r_data\r_translate.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\r_data\renderstyle.cpp"
 					>