cache sprites masks

src/otclient/core/spritemanager.cpp

@@ -88,24 +88,9 @@ TexturePtr SpriteManager::loadSpriteTexture(int id)
     return TexturePtr(new Texture(32, 32, 4, pixels));
 }
 
-TexturePtr SpriteManager::getSpriteTexture(int id, SpriteMask mask)
+TexturePtr SpriteManager::loadSpriteMask(TexturePtr spriteTex, SpriteMask mask)
 {
-    if(id == 0)
-        return g_graphics.getEmptyTexture();
-
-    assert(id > 0 && id <= m_spritesCount);
-
-    // load sprites on demand
-    Sprite& sprite = m_sprites[id-1];
-    if(!sprite.texture)
-        sprite.texture = loadSpriteTexture(id);
-
-    //TODO: release unused sprites textures after X seconds
-    // to avoid massive texture allocations
-
-    if(mask != SpriteMaskNone) {
-        if(!sprite.masks[mask]) {
-            auto pixels = sprite.texture->getPixels();
+    auto pixels = spriteTex->getPixels();
 
     static RGBA maskColors[4] = { Color::red.rgba(), Color::green.rgba(), Color::blue.rgba(), Color::yellow.rgba() };
     RGBA maskColor = maskColors[mask];
@@ -123,8 +108,27 @@ TexturePtr SpriteManager::getSpriteTexture(int id, SpriteMask mask)
             currentColor = alphaColor;
     }
 
-            sprite.masks[mask] = TexturePtr(new Texture(32, 32, 4, &pixels[0]));
+    return TexturePtr(new Texture(32, 32, 4, &pixels[0]));
 }
+
+TexturePtr SpriteManager::getSpriteTexture(int id, SpriteMask mask)
+{
+    if(id == 0)
+        return g_graphics.getEmptyTexture();
+
+    assert(id > 0 && id <= m_spritesCount);
+
+    // load sprites on demand
+    Sprite& sprite = m_sprites[id-1];
+    if(!sprite.texture)
+        sprite.texture = loadSpriteTexture(id);
+
+    //TODO: release unused sprites textures after X seconds
+    // to avoid massive texture allocations
+
+    if(mask != SpriteMaskNone) {
+        if(!sprite.masks[mask])
+            sprite.masks[mask] = loadSpriteMask(sprite.texture, mask);
         return sprite.masks[mask];
     } else
         return sprite.texture;

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;