From 8f8aed5ee31696fb1855920aedae75dccda908e7 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 11 Apr 2020 20:23:26 +0200 Subject: [PATCH] - moved bitmap.cpp to 'common' and remove the duplicate IceRemap. --- src/CMakeLists.txt | 2 ++ src/{gamedata => common}/textures/bitmap.cpp | 0 src/{gamedata => common}/textures/bitmap.h | 3 ++- src/common/textures/hw_material.cpp | 3 --- src/common/textures/image.h | 2 +- src/r_data/models/models_voxel.cpp | 2 +- src/r_data/r_translate.cpp | 20 -------------------- src/rendering/2d/f_wipe.cpp | 2 +- src/rendering/swrenderer/r_swscene.cpp | 2 +- src/win32/i_system.cpp | 2 +- 10 files changed, 9 insertions(+), 29 deletions(-) rename src/{gamedata => common}/textures/bitmap.cpp (100%) rename src/{gamedata => common}/textures/bitmap.h (99%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index adc168fc2a..9715f062c8 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/gamedata/textures/bitmap.cpp b/src/common/textures/bitmap.cpp similarity index 100% rename from src/gamedata/textures/bitmap.cpp rename to src/common/textures/bitmap.cpp diff --git a/src/gamedata/textures/bitmap.h b/src/common/textures/bitmap.h similarity index 99% rename from src/gamedata/textures/bitmap.h rename to src/common/textures/bitmap.h index 0b48525067..5ee574b7f1 100644 --- a/src/gamedata/textures/bitmap.h +++ b/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; diff --git a/src/common/textures/hw_material.cpp b/src/common/textures/hw_material.cpp index 33406ccd96..55430e686f 100644 --- a/src/common/textures/hw_material.cpp +++ b/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 diff --git a/src/common/textures/image.h b/src/common/textures/image.h index 69042cc445..1f6fcb5fa6 100644 --- a/src/common/textures/image.h +++ b/src/common/textures/image.h @@ -2,7 +2,7 @@ #include #include "tarray.h" -#include "textures/bitmap.h" +#include "bitmap.h" #include "memarena.h" class FImageSource; diff --git a/src/r_data/models/models_voxel.cpp b/src/r_data/models/models_voxel.cpp index fd9cc0a3e0..e279c6c1bc 100644 --- a/src/r_data/models/models_voxel.cpp +++ b/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" diff --git a/src/r_data/r_translate.cpp b/src/r_data/r_translate.cpp index 3ca546a85b..bfa655d4c6 100644 --- a/src/r_data/r_translate.cpp +++ b/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 } -}; - //---------------------------------------------------------------------------- // // diff --git a/src/rendering/2d/f_wipe.cpp b/src/rendering/2d/f_wipe.cpp index f1f5849083..6b66b7dd6c 100644 --- a/src/rendering/2d/f_wipe.cpp +++ b/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 diff --git a/src/rendering/swrenderer/r_swscene.cpp b/src/rendering/swrenderer/r_swscene.cpp index f2d1351ec3..aea5501036 100644 --- a/src/rendering/swrenderer/r_swscene.cpp +++ b/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" diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp index 55f48b8ae1..960ddbf1d4 100644 --- a/src/win32/i_system.cpp +++ b/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 ------------------------------------------------------------------