Merged revisions 3705-3711,3714,3718,3721-3722,3729-3731,3735,3742 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
(dynamic recoloring of sprites and related changes)

........
  r3705 | gmelquio | 2007-11-03 10:58:25 +0100 (Sat, 03 Nov 2007) | 1 line
  
  Fixed double load of hair graphics.
........
  r3706 | gmelquio | 2007-11-03 22:04:51 +0100 (Sat, 03 Nov 2007) | 1 line
  
  Added automatic recoloring of images. Inspired by fungos' ideas (PR #41).
........
  r3707 | gmelquio | 2007-11-03 22:08:21 +0100 (Sat, 03 Nov 2007) | 1 line
  
  Experimented recoloring on scorpions.
........
  r3708 | gmelquio | 2007-11-04 12:52:44 +0100 (Sun, 04 Nov 2007) | 1 line
  
  Tightened palette handling.
........
  r3709 | gmelquio | 2007-11-04 12:54:31 +0100 (Sun, 04 Nov 2007) | 1 line
  
  Experimented with scorpions again.
........
  r3710 | gmelquio | 2007-11-04 16:40:37 +0100 (Sun, 04 Nov 2007) | 1 line
  
  Applied recoloring to hair styles.
........
  r3711 | gmelquio | 2007-11-04 17:50:37 +0100 (Sun, 04 Nov 2007) | 1 line
  
  Converted slimes to recoloring.
........
  r3742 | gmelquio | 2007-11-16 14:16:00 +0100 (Fri, 16 Nov 2007) | 1 line
  
  Sped up recoloring of transparent pixels.
........

1 files changed, 222 insertions, 0 deletions

diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
new file mode 100644
index 00000000..2ce4a48d
--- /dev/null
+++ b/src/resources/dye.cpp
@@ -0,0 +1,222 @@
+/*
+ *  The Mana World
+ *  Copyright 2007 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World 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.
+ *
+ *  The Mana World 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 The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id: dye.cpp 3708 2007-11-04 11:52:44Z gmelquio $
+ */
+
+#include <algorithm>
+#include <sstream>
+
+#include "dye.h"
+
+#include "../log.h"
+
+Palette::Palette(std::string const &description)
+{
+    int size = description.length();
+    if (size == 0) return;
+    if (description[0] != '#')
+    {
+        // TODO: load palette from file.
+        return;
+    }
+
+    int pos = 1;
+    for (;;)
+    {
+        if (pos + 6 > size) break;
+        int v = 0;
+        for (int i = 0; i < 6; ++i)
+        {
+            char c = description[pos + i];
+            int n;
+            if ('0' <= c && c <= '9') n = c - '0';
+            else if ('A' <= c && c <= 'F') n = c - 'A' + 10;
+            else if ('a' <= c && c <= 'f') n = c - 'a' + 10;
+            else goto error;
+            v = (v << 4) | n;
+        }
+        Color c = { { v >> 16, v >> 8, v } };
+        mColors.push_back(c);
+        pos += 6;
+        if (pos == size) return;
+        if (description[pos] != ',') break;
+        ++pos;
+    }
+
+    error:
+    logger->log("Error, invalid embedded palette: %s", description.c_str());
+}
+
+void Palette::getColor(int intensity, int color[3]) const
+{
+    if (intensity == 0)
+    {
+        color[0] = 0;
+        color[1] = 0;
+        color[2] = 0;
+        return;
+    }
+
+    int last = mColors.size();
+    if (last == 0) return;
+
+    int i = intensity * last / 255;
+    int t = intensity * last % 255;
+
+    int j = t != 0 ? i : i - 1;
+    // Get the exact color if any, the next color otherwise.
+    int r2 = mColors[j].value[0],
+        g2 = mColors[j].value[1],
+        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)
+    {
+        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;
+}
+
+Dye::Dye(std::string const &description)
+{
+    for (int i = 0; i < 7; ++i)
+        mPalettes[i] = 0;
+
+    if (description.empty()) return;
+
+    std::string::size_type next_pos = 0, length = description.length();
+    do
+    {
+        std::string::size_type pos = next_pos;
+        next_pos = description.find(';', pos);
+        if (next_pos == std::string::npos)
+            next_pos = length;
+        if (next_pos <= pos + 3 || description[pos + 1] != ':')
+        {
+            logger->log("Error, invalid dye: %s", description.c_str());
+            return;
+        }
+        int i = 0;
+        switch (description[pos])
+        {
+            case 'R': i = 0; break;
+            case 'G': i = 1; break;
+            case 'Y': i = 2; break;
+            case 'B': i = 3; break;
+            case 'M': i = 4; break;
+            case 'C': i = 5; break;
+            case 'W': i = 6; break;
+            default:
+                logger->log("Error, invalid dye: %s", description.c_str());
+                return;
+        }
+        mPalettes[i] = new Palette(description.substr(pos + 2, next_pos - pos - 2));
+        ++next_pos;
+    }
+    while (next_pos < length);
+}
+
+Dye::~Dye()
+{
+    for (int i = 0; i < 7; ++i)
+        delete mPalettes[i];
+}
+
+void Dye::update(int color[3]) const
+{
+    int cmax = std::max(color[0], std::max(color[1], color[2]));
+    if (cmax == 0) return;
+
+    int cmin = std::min(color[0], std::min(color[1], color[2]));
+    int intensity = color[0] + color[1] + color[2];
+
+    if (cmin != cmax &&
+        (cmin != 0 || (intensity != cmax && intensity != 2 * cmax)))
+    {
+        // not pure
+        return;
+    }
+
+    int i = (color[0] != 0) | ((color[1] != 0) << 1) | ((color[2] != 0) << 2);
+
+    if (mPalettes[i - 1])
+        mPalettes[i - 1]->getColor(cmax, color);
+}
+
+void Dye::instantiate(std::string &target, std::string const &palettes)
+{
+    std::string::size_type next_pos = target.find('|');
+    if (next_pos == std::string::npos || palettes.empty()) return;
+    ++next_pos;
+
+    std::ostringstream s;
+    s << target.substr(0, next_pos);
+    std::string::size_type last_pos = target.length(), pal_pos = 0;
+    do
+    {
+        std::string::size_type pos = next_pos;
+        next_pos = target.find(';', pos);
+        if (next_pos == std::string::npos) next_pos = last_pos;
+        if (next_pos == pos + 1)
+        {
+            std::string::size_type pal_next_pos = palettes.find(';');
+            s << target[pos] << ':';
+            if (pal_next_pos == std::string::npos)
+            {
+                s << palettes.substr(pal_pos);
+                s << target.substr(next_pos);
+                break;
+            }
+            s << palettes.substr(pal_pos, pal_next_pos - pal_pos);
+            pal_pos = pal_next_pos;
+        }
+        else if (next_pos > pos + 2)
+        {
+            s << target.substr(pos, next_pos - pos);
+        }
+        else
+        {
+            logger->log("Error, invalid dye placeholder: %s", target.c_str());
+            return;
+        }
+        s << target[next_pos];
+        ++next_pos;
+    }
+    while (next_pos < last_pos);
+
+    target = s.str();
+}