From 76352dd9b330c7721c72cf0a54e0641d5b1c038b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 11 Apr 2020 13:04:17 +0200 Subject: [PATCH] - moved the last remaining utilities. --- src/CMakeLists.txt | 4 ++-- src/{ => common}/utility/colormatcher.h | 0 src/{ => common}/utility/filereadermusicinterface.h | 0 src/{ => common}/utility/palette.cpp | 0 src/common/utility/palutil.h | 12 ++++++++++++ src/{ => common}/utility/x86.cpp | 0 src/{ => common}/utility/x86.h | 0 src/r_data/r_translate.h | 2 +- src/utility/palettecontainer.cpp | 1 + src/utility/{palutil.h => palettecontainer.h} | 7 ------- 10 files changed, 16 insertions(+), 10 deletions(-) rename src/{ => common}/utility/colormatcher.h (100%) rename src/{ => common}/utility/filereadermusicinterface.h (100%) rename src/{ => common}/utility/palette.cpp (100%) create mode 100644 src/common/utility/palutil.h rename src/{ => common}/utility/x86.cpp (100%) rename src/{ => common}/utility/x86.h (100%) rename src/utility/{palutil.h => palettecontainer.h} (86%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1c901d4444..deeb42db73 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1125,7 +1125,7 @@ set (PCH_SOURCES common/utility/i_module.cpp common/utility/m_alloc.cpp common/utility/utf8.cpp - utility/palette.cpp + common/utility/palette.cpp utility/palettecontainer.cpp common/utility/files.cpp common/utility/files_decompress.cpp @@ -1173,7 +1173,7 @@ add_executable( zdoom WIN32 MACOSX_BUNDLE ${SYSTEM_SOURCES} ${FASTMATH_SOURCES} ${PCH_SOURCES} - utility/x86.cpp + common/utility/x86.cpp common/thirdparty/strnatcmp.c common/utility/zstring.cpp common/utility/findfile.cpp diff --git a/src/utility/colormatcher.h b/src/common/utility/colormatcher.h similarity index 100% rename from src/utility/colormatcher.h rename to src/common/utility/colormatcher.h diff --git a/src/utility/filereadermusicinterface.h b/src/common/utility/filereadermusicinterface.h similarity index 100% rename from src/utility/filereadermusicinterface.h rename to src/common/utility/filereadermusicinterface.h diff --git a/src/utility/palette.cpp b/src/common/utility/palette.cpp similarity index 100% rename from src/utility/palette.cpp rename to src/common/utility/palette.cpp diff --git a/src/common/utility/palutil.h b/src/common/utility/palutil.h new file mode 100644 index 0000000000..bda7c32512 --- /dev/null +++ b/src/common/utility/palutil.h @@ -0,0 +1,12 @@ +#pragma once + +#include +#include "palentry.h" + +int BestColor(const uint32_t* pal, int r, int g, int b, int first = 1, int num = 255); +int PTM_BestColor(const uint32_t* pal_in, int r, int g, int b, bool reverselookup, float powtable, int first = 1, int num = 255); +void DoBlending(const PalEntry* from, PalEntry* to, int count, int r, int g, int b, int a); +// Colorspace conversion RGB <-> HSV +void RGBtoHSV (float r, float g, float b, float *h, float *s, float *v); +void HSVtoRGB (float *r, float *g, float *b, float h, float s, float v); + diff --git a/src/utility/x86.cpp b/src/common/utility/x86.cpp similarity index 100% rename from src/utility/x86.cpp rename to src/common/utility/x86.cpp diff --git a/src/utility/x86.h b/src/common/utility/x86.h similarity index 100% rename from src/utility/x86.h rename to src/common/utility/x86.h diff --git a/src/r_data/r_translate.h b/src/r_data/r_translate.h index 0b8cb0cbe8..392041fe74 100644 --- a/src/r_data/r_translate.h +++ b/src/r_data/r_translate.h @@ -3,7 +3,7 @@ #include "doomtype.h" #include "tarray.h" -#include "palutil.h" +#include "palettecontainer.h" class FSerializer; diff --git a/src/utility/palettecontainer.cpp b/src/utility/palettecontainer.cpp index e4933469b6..48ff12737b 100644 --- a/src/utility/palettecontainer.cpp +++ b/src/utility/palettecontainer.cpp @@ -39,6 +39,7 @@ #include "printf.h" #include "colormatcher.h" #include "templates.h" +#include "palettecontainer.h" //---------------------------------------------------------------------------- diff --git a/src/utility/palutil.h b/src/utility/palettecontainer.h similarity index 86% rename from src/utility/palutil.h rename to src/utility/palettecontainer.h index 0bcbfeed25..2737f9f899 100644 --- a/src/utility/palutil.h +++ b/src/utility/palettecontainer.h @@ -4,13 +4,6 @@ #include "memarena.h" #include "palentry.h" -int BestColor(const uint32_t* pal, int r, int g, int b, int first = 1, int num = 255); -int PTM_BestColor(const uint32_t* pal_in, int r, int g, int b, bool reverselookup, float powtable, int first = 1, int num = 255); -void DoBlending(const PalEntry* from, PalEntry* to, int count, int r, int g, int b, int a); -// Colorspace conversion RGB <-> HSV -void RGBtoHSV (float r, float g, float b, float *h, float *s, float *v); -void HSVtoRGB (float *r, float *g, float *b, float h, float s, float v); - struct FRemapTable { FRemapTable(int count = 256) { NumEntries = count; }