From 09548488fa09d15a0e58517bffec7cb1104ba8ce Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Fri, 19 Aug 2011 11:23:02 -0300
Subject: [PATCH] cache sprites masks

---
 src/otclient/core/spritemanager.cpp | 46 ++++++++++++++++-------------
 src/otclient/core/spritemanager.h   |  1 +
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/otclient/core/spritemanager.cpp b/src/otclient/core/spritemanager.cpp
index 748d0f58..e2516376 100644
--- a/src/otclient/core/spritemanager.cpp
+++ b/src/otclient/core/spritemanager.cpp
@@ -88,6 +88,29 @@ TexturePtr SpriteManager::loadSpriteTexture(int id)
     return TexturePtr(new Texture(32, 32, 4, pixels));
 }
 
+TexturePtr SpriteManager::loadSpriteMask(TexturePtr spriteTex, SpriteMask mask)
+{
+    auto pixels = spriteTex->getPixels();
+
+    static RGBA maskColors[4] = { Color::red.rgba(), Color::green.rgba(), Color::blue.rgba(), Color::yellow.rgba() };
+    RGBA maskColor = maskColors[mask];
+    RGBA whiteColor = Color::white.rgba();
+    RGBA alphaColor = Color::alpha.rgba();
+
+    // convert pixels
+    // masked color -> white color
+    // any other color -> alpha color
+    for(int i=0;i<4096;i+=4) {
+        RGBA& currentColor = *(RGBA*)&pixels[i];
+        if(currentColor == maskColor)
+            currentColor = whiteColor;
+        else
+            currentColor = alphaColor;
+    }
+
+    return TexturePtr(new Texture(32, 32, 4, &pixels[0]));
+}
+
 TexturePtr SpriteManager::getSpriteTexture(int id, SpriteMask mask)
 {
     if(id == 0)
@@ -104,27 +127,8 @@ TexturePtr SpriteManager::getSpriteTexture(int id, SpriteMask mask)
     // to avoid massive texture allocations
 
     if(mask != SpriteMaskNone) {
-        if(!sprite.masks[mask]) {
-            auto pixels = sprite.texture->getPixels();
-
-            static RGBA maskColors[4] = { Color::red.rgba(), Color::green.rgba(), Color::blue.rgba(), Color::yellow.rgba() };
-            RGBA maskColor = maskColors[mask];
-            RGBA whiteColor = Color::white.rgba();
-            RGBA alphaColor = Color::alpha.rgba();
-
-            // convert pixels
-            // masked color -> white color
-            // any other color -> alpha color
-            for(int i=0;i<4096;i+=4) {
-                RGBA& currentColor = *(RGBA*)&pixels[i];
-                if(currentColor == maskColor)
-                    currentColor = whiteColor;
-                else
-                    currentColor = alphaColor;
-            }
-
-            sprite.masks[mask] = TexturePtr(new Texture(32, 32, 4, &pixels[0]));
-        }
+        if(!sprite.masks[mask])
+            sprite.masks[mask] = loadSpriteMask(sprite.texture, mask);
         return sprite.masks[mask];
     } else
         return sprite.texture;
diff --git a/src/otclient/core/spritemanager.h b/src/otclient/core/spritemanager.h
index 77797396..2d487e13 100644
--- a/src/otclient/core/spritemanager.h
+++ b/src/otclient/core/spritemanager.h
@@ -24,6 +24,7 @@ public:
 
 private:
     TexturePtr loadSpriteTexture(int id);
+    TexturePtr loadSpriteMask(TexturePtr spriteTex, SpriteMask mask);
 
     uint32 m_signature;
     uint16 m_spritesCount;