- moved bitmap.cpp to 'common' and remove the duplicate IceRemap.

src/CMakeLists.txt

@@ -608,6 +608,7 @@ file( GLOB HEADER_FILES
 	common/fonts/*.h
 	common/objects/*.h
 	common/filesystem/*.h
+	common/textures/*.h
 	common/textures/hires/hqnx/*.h
 	common/textures/hires/hqnx_asm/*.h
 	common/textures/hires/xbr/*.h
@@ -1241,6 +1242,7 @@ include_directories( .
 	common/audio/music
 	common/2d
 	common/thirdparty
+	common/textures
 	common/textures/formats
 	common/textures/hires
 	common/filesystem

src/common/textures/bitmap.h

@@ -36,8 +36,9 @@
 #ifndef __BITMAP_H__
 #define __BITMAP_H__
 
-#include "doomtype.h"
+#include "basics.h"
 #include "templates.h"
+#include "palentry.h"
 
 struct FCopyInfo;
 

src/common/textures/hw_material.cpp

@@ -28,9 +28,6 @@
 #include "texturemanager.h"
 #include "c_cvars.h"
 
-EXTERN_CVAR(Bool, gl_texture_usehires)
-IHardwareTexture* CreateHardwareTexture();
-
 //===========================================================================
 //
 // Constructor

src/common/textures/image.h

@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include "tarray.h"
-#include "textures/bitmap.h"
+#include "bitmap.h"
 #include "memarena.h"
 
 class FImageSource;

src/r_data/models/models_voxel.cpp

@@ -29,7 +29,7 @@
 #include "filesystem.h"
 #include "g_level.h"
 #include "colormatcher.h"
-#include "textures/bitmap.h"
+#include "bitmap.h"
 #include "g_levellocals.h"
 #include "models.h"
 #include "image.h"

src/r_data/r_translate.cpp

@@ -54,26 +54,6 @@
 
 #include "gi.h"
 
-const uint8_t IcePalette[16][3] =
-{
-	{  10,  8, 18 },
-	{  15, 15, 26 },
-	{  20, 16, 36 },
-	{  30, 26, 46 },
-	{  40, 36, 57 },
-	{  50, 46, 67 },
-	{  59, 57, 78 },
-	{  69, 67, 88 },
-	{  79, 77, 99 },
-	{  89, 87,109 },
-	{  99, 97,120 },
-	{ 109,107,130 },
-	{ 118,118,141 },
-	{ 128,128,151 },
-	{ 138,138,162 },
-	{ 148,148,172 }
-};
-
 //----------------------------------------------------------------------------
 //
 //

src/rendering/2d/f_wipe.cpp

@@ -27,7 +27,7 @@
 #include "m_random.h"
 #include "f_wipe.h"
 #include "templates.h"
-#include "textures/bitmap.h"
+#include "bitmap.h"
 #include "hw_material.h"
 
 class FBurnTexture : public FTexture

src/rendering/swrenderer/r_swscene.cpp

@@ -31,7 +31,7 @@
 #include "r_swscene.h"
 #include "filesystem.h"
 #include "d_player.h"
-#include "textures/bitmap.h"
+#include "bitmap.h"
 #include "swrenderer/scene/r_light.h"
 #include "image.h"
 #include "engineerrors.h"

src/win32/i_system.cpp

@@ -84,7 +84,7 @@
 #include "g_level.h"
 #include "doomstat.h"
 #include "i_system.h"
-#include "textures/bitmap.h"
+#include "bitmap.h"
 
 // MACROS ------------------------------------------------------------------