summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/theme.cpp1
-rw-r--r--src/resources/dye.cpp368
-rw-r--r--src/resources/dye.h56
-rw-r--r--src/resources/dyepalette.cpp400
-rw-r--r--src/resources/dyepalette.h87
-rw-r--r--src/resources/imagehelper.cpp1
-rw-r--r--src/resources/openglimagehelper.cpp1
-rw-r--r--src/resources/sdl2imagehelper.cpp1
-rw-r--r--src/resources/sdlimagehelper.cpp4
11 files changed, 503 insertions, 422 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 983fa1132..d31035579 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -533,6 +533,8 @@ SET(SRCS
resources/dye.cpp
resources/dye.h
resources/dyecolor.h
+ resources/dyepalette.cpp
+ resources/dyepalette.h
resources/db/emotedb.cpp
resources/db/emotedb.h
resources/fboinfo.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 43c594c8d..599f66026 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,6 +71,8 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \
resources/db/palettedb.h \
resources/dye.cpp \
resources/dye.h \
+ resources/dyepalette.cpp \
+ resources/dyepalette.h \
resources/image.cpp \
resources/image.h \
resources/imagehelper.cpp \
@@ -639,6 +641,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
resources/dye.cpp \
resources/dye.h \
resources/dyecolor.h \
+ resources/dyepalette.cpp \
+ resources/dyepalette.h \
resources/db/emotedb.cpp \
resources/db/emotedb.h \
resources/fboinfo.h \
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index c11132d8d..5e1c6e4c8 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -31,6 +31,7 @@
#include "gui/themeinfo.h"
#include "resources/dye.h"
+#include "resources/dyepalette.h"
#include "resources/image.h"
#include "resources/resourcemanager.h"
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index ce15c5b2d..3f6929c5c 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -24,6 +24,8 @@
#include "logger.h"
+#include "resources/dyepalette.h"
+
#include "resources/db/palettedb.h"
#include "utils/delete2.h"
@@ -35,372 +37,6 @@
#include "debug.h"
-DyePalette::DyePalette(const std::string &description,
- const uint8_t blockSize) :
- mColors()
-{
- const size_t size = static_cast<size_t>(description.length());
- if (size == 0)
- return;
-
- if (description[0] == '#')
- {
- size_t pos = 1;
- for ( ; ; )
- {
- if (pos + blockSize > size)
- break;
-
- DyeColor color(0, 0, 0, 0);
-
- for (size_t i = 0, colorIdx = 0; i < blockSize && colorIdx < 4;
- i += 2, colorIdx ++)
- {
- color.value[colorIdx] = static_cast<unsigned char>((
- hexDecode(description[pos + i]) << 4)
- + hexDecode(description[pos + i + 1]));
- }
- mColors.push_back(color);
- pos += blockSize;
-
- if (pos == size)
- return;
- if (description[pos] != ',')
- break;
-
- ++pos;
- }
- }
- else if (description[0] == '@')
- {
- size_t pos = 1;
- for ( ; pos < size ; )
- {
- const size_t idx = description.find(',', pos);
- if (idx == std::string::npos)
- return;
- if (idx == pos)
- break;
- mColors.push_back(PaletteDB::getColor(
- description.substr(pos, idx - pos)));
- pos = idx + 1;
- }
- }
-
- logger->log("Error, invalid embedded palette: %s", description.c_str());
-}
-
-unsigned int DyePalette::hexDecode(const signed char c)
-{
- if ('0' <= c && c <= '9')
- return c - '0';
- else if ('A' <= c && c <= 'F')
- return c - 'A' + 10;
- else if ('a' <= c && c <= 'f')
- return c - 'a' + 10;
- else
- return 0;
-}
-
-void DyePalette::getColor(const int intensity, int color[3]) const
-{
- if (intensity == 0)
- {
- color[0] = 0;
- color[1] = 0;
- color[2] = 0;
- return;
- }
-
- const int last = static_cast<int>(mColors.size());
- if (last == 0)
- return;
-
- const int intLast = intensity * last;
- const int i = intLast / 255;
- const int t = intLast % 255;
-
- int j = t != 0 ? i : i - 1;
-
- if (j >= last)
- j = 0;
-
- // Get the exact color if any, the next color otherwise.
- const int r2 = mColors[j].value[0];
- const int g2 = mColors[j].value[1];
- const int b2 = mColors[j].value[2];
-
- if (t == 0)
- {
- // Exact color.
- color[0] = r2;
- color[1] = g2;
- color[2] = b2;
- return;
- }
-
- // Get the previous color. First color is implicitly black.
- int r1 = 0, g1 = 0, b1 = 0;
- if (i > 0 && i < last + 1)
- {
- r1 = mColors[i - 1].value[0];
- g1 = mColors[i - 1].value[1];
- b1 = mColors[i - 1].value[2];
- }
-
- // Perform a linear interpolation.
- color[0] = ((255 - t) * r1 + t * r2) / 255;
- color[1] = ((255 - t) * g1 + t * g2) / 255;
- color[2] = ((255 - t) * b1 + t * b2) / 255;
-}
-
-void DyePalette::getColor(double intensity, int color[3]) const
-{
- // Nothing to do here
- if (mColors.empty())
- return;
-
- // Force range
- if (intensity > 1.0)
- intensity = 1.0;
- else if (intensity < 0.0)
- intensity = 0.0;
-
- // Scale up
- intensity *= static_cast<double>(mColors.size() - 1);
-
- // Color indices
- const int i = static_cast<int>(floor(intensity));
- const int j = static_cast<int>(ceil(intensity));
-
- if (i == j)
- {
- // Exact color.
- color[0] = mColors[i].value[0];
- color[1] = mColors[i].value[1];
- color[2] = mColors[i].value[2];
- return;
- }
-
- intensity -= i;
- const double rest = 1 - intensity;
-
- // Get the colors
- const int r1 = mColors[i].value[0];
- const int g1 = mColors[i].value[1];
- const int b1 = mColors[i].value[2];
- const int r2 = mColors[j].value[0];
- const int g2 = mColors[j].value[1];
- const int b2 = mColors[j].value[2];
-
- // Perform the interpolation.
- color[0] = static_cast<int>(rest * r1 + intensity * r2);
- color[1] = static_cast<int>(rest * g1 + intensity * g2);
- color[2] = static_cast<int>(rest * b1 + intensity * b2);
-}
-
-void DyePalette::replaceSColor(uint32_t *restrict pixels,
- const int bufSize) const
-{
- std::vector<DyeColor>::const_iterator it_end = mColors.end();
- const size_t sz = mColors.size();
- if (!sz)
- return;
- if (sz % 2)
- -- it_end;
-
- for (uint32_t *p_end = pixels + static_cast<size_t>(bufSize);
- pixels != p_end;
- ++pixels)
- {
- uint8_t *const p = reinterpret_cast<uint8_t *>(pixels);
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- const int alpha = *pixels & 0xff000000;
- const unsigned int data = (*pixels) & 0x00ffffff;
-#else
- const int alpha = *p & 0xff;
- const unsigned int data = (*pixels) & 0xffffff00;
-#endif
-// logger->log("c:%04d %08x", c, *pixels);
-// logger->log("data: %08x", data);
- if (!alpha)
- {
-// logger->log("skip: %08x", *pixels);
- continue;
- }
-
- std::vector<DyeColor>::const_iterator it = mColors.begin();
- while (it != it_end)
- {
- const DyeColor &col = *it;
- ++ it;
- const DyeColor &col2 = *it;
-
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- const unsigned int coldata = (col.value[2] << 16)
- | (col.value[1] << 8) | (col.value[0]);
-#else
- const unsigned int coldata = (col.value[2] << 8)
- | (col.value[1] << 16) | (col.value[0] << 24);
-#endif
-// logger->log("coldata: %08x", coldata);
- if (data == coldata)
- {
-// logger->log("correct");
- p[3] = col2.value[0];
- p[2] = col2.value[1];
- p[1] = col2.value[2];
- break;
- }
-
- ++ it;
- }
- }
-}
-
-void DyePalette::replaceAColor(uint32_t *restrict pixels,
- const int bufSize) const
-{
- std::vector<DyeColor>::const_iterator it_end = mColors.end();
- const size_t sz = mColors.size();
- if (!sz)
- return;
- if (sz % 2)
- -- it_end;
-
- for (uint32_t *p_end = pixels + static_cast<size_t>(bufSize);
- pixels != p_end;
- ++pixels)
- {
- uint8_t *const p = reinterpret_cast<uint8_t *>(pixels);
- const unsigned int data = *pixels;
-
- std::vector<DyeColor>::const_iterator it = mColors.begin();
- while (it != it_end)
- {
- const DyeColor &col = *it;
- ++ it;
- const DyeColor &col2 = *it;
-
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- const unsigned int coldata = (col.value[3] << 24)
- | (col.value[2] << 16) | (col.value[1] << 8) | (col.value[0]);
-#else
- const unsigned int coldata = (col.value[3]) | (col.value[2] << 8)
- | (col.value[1] << 16) | (col.value[0] << 24);
-#endif
-
- if (data == coldata)
- {
- p[3] = col2.value[0];
- p[2] = col2.value[1];
- p[1] = col2.value[2];
- p[0] = col2.value[3];
- break;
- }
-
- ++ it;
- }
- }
-}
-
-void DyePalette::replaceSOGLColor(uint32_t *restrict pixels,
- const int bufSize) const
-{
- std::vector<DyeColor>::const_iterator it_end = mColors.end();
- const size_t sz = mColors.size();
- if (!sz)
- return;
- if (sz % 2)
- -- it_end;
-
- for (uint32_t *p_end = pixels + static_cast<size_t>(bufSize);
- pixels != p_end;
- ++pixels)
- {
- uint8_t *const p = reinterpret_cast<uint8_t *>(pixels);
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- const int alpha = *p & 0xff;
- const unsigned int data = (*pixels) & 0xffffff00;
-#else
- const int alpha = *pixels & 0xff000000;
- const unsigned int data = (*pixels) & 0x00ffffff;
-#endif
- if (!alpha)
- continue;
-
- std::vector<DyeColor>::const_iterator it = mColors.begin();
- while (it != it_end)
- {
- const DyeColor &col = *it;
- ++ it;
- const DyeColor &col2 = *it;
-
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- const unsigned int coldata = (col.value[0] << 24)
- | (col.value[1] << 16) | (col.value[2] << 8);
-#else
- const unsigned int coldata = (col.value[0])
- | (col.value[1] << 8) | (col.value[2] << 16);
-#endif
- if (data == coldata)
- {
- p[0] = col2.value[0];
- p[1] = col2.value[1];
- p[2] = col2.value[2];
- break;
- }
-
- ++ it;
- }
- }
-}
-
-void DyePalette::replaceAOGLColor(uint32_t *restrict pixels,
- const int bufSize) const
-{
- std::vector<DyeColor>::const_iterator it_end = mColors.end();
- const size_t sz = mColors.size();
- if (!sz)
- return;
- if (sz % 2)
- -- it_end;
-
- for (uint32_t *p_end = pixels + static_cast<size_t>(bufSize);
- pixels != p_end;
- ++pixels)
- {
- uint8_t *const p = reinterpret_cast<uint8_t *>(pixels);
- const unsigned int data = *pixels;
-
- std::vector<DyeColor>::const_iterator it = mColors.begin();
- while (it != it_end)
- {
- const DyeColor &col = *it;
- ++ it;
- const DyeColor &col2 = *it;
-
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- const unsigned int coldata = (col.value[0] << 24)
- | (col.value[1] << 16) | (col.value[2] << 8) | col.value[3];
-#else
- const unsigned int coldata = (col.value[0]) | (col.value[1] << 8)
- | (col.value[2] << 16) | (col.value[3] << 24);
-#endif
- if (data == coldata)
- {
- p[0] = col2.value[0];
- p[1] = col2.value[1];
- p[2] = col2.value[2];
- p[3] = col2.value[3];
- break;
- }
-
- ++ it;
- }
- }
-}
-
Dye::Dye(const std::string &description)
{
for (int i = 0; i < dyePalateSize; ++i)
diff --git a/src/resources/dye.h b/src/resources/dye.h
index 80da36506..ad2253ea3 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -30,65 +30,13 @@
#include "localconsts.h"
+class DyePalette;
+
const int dyePalateSize = 9;
const int sPaleteIndex = 7;
const int aPaleteIndex = 8;
/**
- * Class for performing a linear interpolation between colors.
- */
-class DyePalette final
-{
- public:
- /**
- * Creates a palette based on the given string.
- * The string is either a file name or a sequence of hexadecimal RGB
- * values separated by ',' and starting with '#'.
- */
- DyePalette(const std::string &pallete, const uint8_t blockSize);
-
- A_DELETE_COPY(DyePalette)
-
- /**
- * Gets a pixel color depending on its intensity. First color is
- * implicitly black (0, 0, 0).
- */
- void getColor(const int intensity, int color[3]) const;
-
- /**
- * Gets a pixel color depending on its intensity.
- */
- void getColor(double intensity, int color[3]) const;
-
- /**
- * replace colors for SDL for S dye.
- */
- void replaceSColor(uint32_t *restrict pixels, const int bufSize) const;
-
- /**
- * replace colors for SDL for S dye.
- */
- void replaceAColor(uint32_t *restrict pixels, const int bufSize) const;
-
- /**
- * replace colors for OpenGL for S dye.
- */
- void replaceSOGLColor(uint32_t *restrict pixels,
- const int bufSize) const;
-
- /**
- * replace colors for OpenGL for A dye.
- */
- void replaceAOGLColor(uint32_t *restrict pixels,
- const int bufSize) const;
-
- static unsigned int hexDecode(const signed char c) A_WARN_UNUSED;
-
- private:
- std::vector<DyeColor> mColors;
-};
-
-/**
* Class for dispatching pixel-recoloring amongst several palettes.
*/
class Dye final
diff --git a/src/resources/dyepalette.cpp b/src/resources/dyepalette.cpp
new file mode 100644
index 000000000..ab1e2c2f2
--- /dev/null
+++ b/src/resources/dyepalette.cpp
@@ -0,0 +1,400 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2007-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/dyepalette.h"
+
+#include "logger.h"
+
+#include "resources/db/palettedb.h"
+
+#include <cmath>
+#include <sstream>
+
+#include <SDL_endian.h>
+
+#include "debug.h"
+
+DyePalette::DyePalette(const std::string &description,
+ const uint8_t blockSize) :
+ mColors()
+{
+ const size_t size = static_cast<size_t>(description.length());
+ if (size == 0)
+ return;
+
+ if (description[0] == '#')
+ {
+ size_t pos = 1;
+ for ( ; ; )
+ {
+ if (pos + blockSize > size)
+ break;
+
+ DyeColor color(0, 0, 0, 0);
+
+ for (size_t i = 0, colorIdx = 0; i < blockSize && colorIdx < 4;
+ i += 2, colorIdx ++)
+ {
+ color.value[colorIdx] = static_cast<unsigned char>((
+ hexDecode(description[pos + i]) << 4)
+ + hexDecode(description[pos + i + 1]));
+ }
+ mColors.push_back(color);
+ pos += blockSize;
+
+ if (pos == size)
+ return;
+ if (description[pos] != ',')
+ break;
+
+ ++pos;
+ }
+ }
+ else if (description[0] == '@')
+ {
+ size_t pos = 1;
+ for ( ; pos < size ; )
+ {
+ const size_t idx = description.find(',', pos);
+ if (idx == std::string::npos)
+ return;
+ if (idx == pos)
+ break;
+ mColors.push_back(PaletteDB::getColor(
+ description.substr(pos, idx - pos)));
+ pos = idx + 1;
+ }
+ }
+
+ logger->log("Error, invalid embedded palette: %s", description.c_str());
+}
+
+unsigned int DyePalette::hexDecode(const signed char c)
+{
+ if ('0' <= c && c <= '9')
+ return c - '0';
+ else if ('A' <= c && c <= 'F')
+ return c - 'A' + 10;
+ else if ('a' <= c && c <= 'f')
+ return c - 'a' + 10;
+ else
+ return 0;
+}
+
+void DyePalette::getColor(const int intensity, int color[3]) const
+{
+ if (intensity == 0)
+ {
+ color[0] = 0;
+ color[1] = 0;
+ color[2] = 0;
+ return;
+ }
+
+ const int last = static_cast<int>(mColors.size());
+ if (last == 0)
+ return;
+
+ const int intLast = intensity * last;
+ const int i = intLast / 255;
+ const int t = intLast % 255;
+
+ int j = t != 0 ? i : i - 1;
+
+ if (j >= last)
+ j = 0;
+
+ // Get the exact color if any, the next color otherwise.
+ const int r2 = mColors[j].value[0];
+ const int g2 = mColors[j].value[1];
+ const int b2 = mColors[j].value[2];
+
+ if (t == 0)
+ {
+ // Exact color.
+ color[0] = r2;
+ color[1] = g2;
+ color[2] = b2;
+ return;
+ }
+
+ // Get the previous color. First color is implicitly black.
+ int r1 = 0, g1 = 0, b1 = 0;
+ if (i > 0 && i < last + 1)
+ {
+ r1 = mColors[i - 1].value[0];
+ g1 = mColors[i - 1].value[1];
+ b1 = mColors[i - 1].value[2];
+ }
+
+ // Perform a linear interpolation.
+ color[0] = ((255 - t) * r1 + t * r2) / 255;
+ color[1] = ((255 - t) * g1 + t * g2) / 255;
+ color[2] = ((255 - t) * b1 + t * b2) / 255;
+}
+
+void DyePalette::getColor(double intensity, int color[3]) const
+{
+ // Nothing to do here
+ if (mColors.empty())
+ return;
+
+ // Force range
+ if (intensity > 1.0)
+ intensity = 1.0;
+ else if (intensity < 0.0)
+ intensity = 0.0;
+
+ // Scale up
+ intensity *= static_cast<double>(mColors.size() - 1);
+
+ // Color indices
+ const int i = static_cast<int>(floor(intensity));
+ const int j = static_cast<int>(ceil(intensity));
+
+ if (i == j)
+ {
+ // Exact color.
+ color[0] = mColors[i].value[0];
+ color[1] = mColors[i].value[1];
+ color[2] = mColors[i].value[2];
+ return;
+ }
+
+ intensity -= i;
+ const double rest = 1 - intensity;
+
+ // Get the colors
+ const int r1 = mColors[i].value[0];
+ const int g1 = mColors[i].value[1];
+ const int b1 = mColors[i].value[2];
+ const int r2 = mColors[j].value[0];
+ const int g2 = mColors[j].value[1];
+ const int b2 = mColors[j].value[2];
+
+ // Perform the interpolation.
+ color[0] = static_cast<int>(rest * r1 + intensity * r2);
+ color[1] = static_cast<int>(rest * g1 + intensity * g2);
+ color[2] = static_cast<int>(rest * b1 + intensity * b2);
+}
+
+void DyePalette::replaceSColor(uint32_t *restrict pixels,
+ const int bufSize) const
+{
+ std::vector<DyeColor>::const_iterator it_end = mColors.end();
+ const size_t sz = mColors.size();
+ if (!sz)
+ return;
+ if (sz % 2)
+ -- it_end;
+
+ for (uint32_t *p_end = pixels + static_cast<size_t>(bufSize);
+ pixels != p_end;
+ ++pixels)
+ {
+ uint8_t *const p = reinterpret_cast<uint8_t *>(pixels);
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ const int alpha = *pixels & 0xff000000;
+ const unsigned int data = (*pixels) & 0x00ffffff;
+#else
+ const int alpha = *p & 0xff;
+ const unsigned int data = (*pixels) & 0xffffff00;
+#endif
+// logger->log("c:%04d %08x", c, *pixels);
+// logger->log("data: %08x", data);
+ if (!alpha)
+ {
+// logger->log("skip: %08x", *pixels);
+ continue;
+ }
+
+ std::vector<DyeColor>::const_iterator it = mColors.begin();
+ while (it != it_end)
+ {
+ const DyeColor &col = *it;
+ ++ it;
+ const DyeColor &col2 = *it;
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ const unsigned int coldata = (col.value[2] << 16)
+ | (col.value[1] << 8) | (col.value[0]);
+#else
+ const unsigned int coldata = (col.value[2] << 8)
+ | (col.value[1] << 16) | (col.value[0] << 24);
+#endif
+// logger->log("coldata: %08x", coldata);
+ if (data == coldata)
+ {
+// logger->log("correct");
+ p[3] = col2.value[0];
+ p[2] = col2.value[1];
+ p[1] = col2.value[2];
+ break;
+ }
+
+ ++ it;
+ }
+ }
+}
+
+void DyePalette::replaceAColor(uint32_t *restrict pixels,
+ const int bufSize) const
+{
+ std::vector<DyeColor>::const_iterator it_end = mColors.end();
+ const size_t sz = mColors.size();
+ if (!sz)
+ return;
+ if (sz % 2)
+ -- it_end;
+
+ for (uint32_t *p_end = pixels + static_cast<size_t>(bufSize);
+ pixels != p_end;
+ ++pixels)
+ {
+ uint8_t *const p = reinterpret_cast<uint8_t *>(pixels);
+ const unsigned int data = *pixels;
+
+ std::vector<DyeColor>::const_iterator it = mColors.begin();
+ while (it != it_end)
+ {
+ const DyeColor &col = *it;
+ ++ it;
+ const DyeColor &col2 = *it;
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ const unsigned int coldata = (col.value[3] << 24)
+ | (col.value[2] << 16) | (col.value[1] << 8) | (col.value[0]);
+#else
+ const unsigned int coldata = (col.value[3]) | (col.value[2] << 8)
+ | (col.value[1] << 16) | (col.value[0] << 24);
+#endif
+
+ if (data == coldata)
+ {
+ p[3] = col2.value[0];
+ p[2] = col2.value[1];
+ p[1] = col2.value[2];
+ p[0] = col2.value[3];
+ break;
+ }
+
+ ++ it;
+ }
+ }
+}
+
+void DyePalette::replaceSOGLColor(uint32_t *restrict pixels,
+ const int bufSize) const
+{
+ std::vector<DyeColor>::const_iterator it_end = mColors.end();
+ const size_t sz = mColors.size();
+ if (!sz)
+ return;
+ if (sz % 2)
+ -- it_end;
+
+ for (uint32_t *p_end = pixels + static_cast<size_t>(bufSize);
+ pixels != p_end;
+ ++pixels)
+ {
+ uint8_t *const p = reinterpret_cast<uint8_t *>(pixels);
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ const int alpha = *p & 0xff;
+ const unsigned int data = (*pixels) & 0xffffff00;
+#else
+ const int alpha = *pixels & 0xff000000;
+ const unsigned int data = (*pixels) & 0x00ffffff;
+#endif
+ if (!alpha)
+ continue;
+
+ std::vector<DyeColor>::const_iterator it = mColors.begin();
+ while (it != it_end)
+ {
+ const DyeColor &col = *it;
+ ++ it;
+ const DyeColor &col2 = *it;
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ const unsigned int coldata = (col.value[0] << 24)
+ | (col.value[1] << 16) | (col.value[2] << 8);
+#else
+ const unsigned int coldata = (col.value[0])
+ | (col.value[1] << 8) | (col.value[2] << 16);
+#endif
+ if (data == coldata)
+ {
+ p[0] = col2.value[0];
+ p[1] = col2.value[1];
+ p[2] = col2.value[2];
+ break;
+ }
+
+ ++ it;
+ }
+ }
+}
+
+void DyePalette::replaceAOGLColor(uint32_t *restrict pixels,
+ const int bufSize) const
+{
+ std::vector<DyeColor>::const_iterator it_end = mColors.end();
+ const size_t sz = mColors.size();
+ if (!sz)
+ return;
+ if (sz % 2)
+ -- it_end;
+
+ for (uint32_t *p_end = pixels + static_cast<size_t>(bufSize);
+ pixels != p_end;
+ ++pixels)
+ {
+ uint8_t *const p = reinterpret_cast<uint8_t *>(pixels);
+ const unsigned int data = *pixels;
+
+ std::vector<DyeColor>::const_iterator it = mColors.begin();
+ while (it != it_end)
+ {
+ const DyeColor &col = *it;
+ ++ it;
+ const DyeColor &col2 = *it;
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ const unsigned int coldata = (col.value[0] << 24)
+ | (col.value[1] << 16) | (col.value[2] << 8) | col.value[3];
+#else
+ const unsigned int coldata = (col.value[0]) | (col.value[1] << 8)
+ | (col.value[2] << 16) | (col.value[3] << 24);
+#endif
+ if (data == coldata)
+ {
+ p[0] = col2.value[0];
+ p[1] = col2.value[1];
+ p[2] = col2.value[2];
+ p[3] = col2.value[3];
+ break;
+ }
+
+ ++ it;
+ }
+ }
+}
diff --git a/src/resources/dyepalette.h b/src/resources/dyepalette.h
new file mode 100644
index 000000000..a2f555b4f
--- /dev/null
+++ b/src/resources/dyepalette.h
@@ -0,0 +1,87 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2007-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_DYEPALETTE_H
+#define RESOURCES_DYEPALETTE_H
+
+#include "resources/dyecolor.h"
+
+#include <string>
+#include <vector>
+
+#include "localconsts.h"
+
+/**
+ * Class for performing a linear interpolation between colors.
+ */
+class DyePalette final
+{
+ public:
+ /**
+ * Creates a palette based on the given string.
+ * The string is either a file name or a sequence of hexadecimal RGB
+ * values separated by ',' and starting with '#'.
+ */
+ DyePalette(const std::string &pallete, const uint8_t blockSize);
+
+ A_DELETE_COPY(DyePalette)
+
+ /**
+ * Gets a pixel color depending on its intensity. First color is
+ * implicitly black (0, 0, 0).
+ */
+ void getColor(const int intensity, int color[3]) const;
+
+ /**
+ * Gets a pixel color depending on its intensity.
+ */
+ void getColor(double intensity, int color[3]) const;
+
+ /**
+ * replace colors for SDL for S dye.
+ */
+ void replaceSColor(uint32_t *restrict pixels, const int bufSize) const;
+
+ /**
+ * replace colors for SDL for S dye.
+ */
+ void replaceAColor(uint32_t *restrict pixels, const int bufSize) const;
+
+ /**
+ * replace colors for OpenGL for S dye.
+ */
+ void replaceSOGLColor(uint32_t *restrict pixels,
+ const int bufSize) const;
+
+ /**
+ * replace colors for OpenGL for A dye.
+ */
+ void replaceAOGLColor(uint32_t *restrict pixels,
+ const int bufSize) const;
+
+ static unsigned int hexDecode(const signed char c) A_WARN_UNUSED;
+
+ private:
+ std::vector<DyeColor> mColors;
+};
+
+#endif // RESOURCES_DYEPALETTE_H
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp
index d72550767..ad0c98ad1 100644
--- a/src/resources/imagehelper.cpp
+++ b/src/resources/imagehelper.cpp
@@ -26,6 +26,7 @@
#include "main.h"
#include "resources/dye.h"
+#include "resources/dyepalette.h"
#include "utils/sdlcheckutils.h"
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index dc0218d65..33330c568 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -34,6 +34,7 @@
#include "render/safeopenglgraphics.h"
#include "resources/dye.h"
+#include "resources/dyepalette.h"
#include "resources/image.h"
#include "utils/sdlcheckutils.h"
diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp
index b31622e51..3cda18c51 100644
--- a/src/resources/sdl2imagehelper.cpp
+++ b/src/resources/sdl2imagehelper.cpp
@@ -25,6 +25,7 @@
#include "resources/sdl2imagehelper.h"
#include "resources/dye.h"
+#include "resources/dyepalette.h"
#include "resources/resourcemanager.h"
#include "logger.h"
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index 0858a9908..16f0b45ba 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -24,11 +24,11 @@
#include "resources/sdlimagehelper.h"
-#include "resources/dye.h"
-
#include "logger.h"
#include "main.h"
+#include "resources/dye.h"
+#include "resources/dyepalette.h"
#include "resources/image.h"
#include "utils/sdlcheckutils.h"
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-09 06:39:41 +0000