Changeset 10019 for ps

Timestamp:

08/17/11 01:39:16 (13 years ago)

Author:

philip

Message:

Be less grossly inefficient when computing minimap territory texture

File:

• ps/trunk/source/graphics/TerritoryTexture.cpp (modified) (2 diffs)

ps/trunk/source/graphics/TerritoryTexture.cpp

@@ -177 +177 @@
     CmpPtr<ICmpPlayerManager> cmpPlayerManager(m_Simulation, SYSTEM_ENTITY);
 
+    std::vector<CColor> colors;
+    i32 numPlayers = cmpPlayerManager->GetNumPlayers();
+    for (i32 p = 0; p < numPlayers; ++p)
+    {
+        CColor color(1, 0, 1, 1);
+        CmpPtr<ICmpPlayer> cmpPlayer(m_Simulation, cmpPlayerManager->GetPlayerByID(p));
+        if (!cmpPlayer.null())
+            color = cmpPlayer->GetColour();
+        colors.push_back(color);
+    }
+
     u8* p = bitmap;
     for (ssize_t j = 0; j < h; ++j)
@@ -185 +196 @@
 
             CColor color(1, 0, 1, 1);
-            if (!cmpPlayerManager.null())
-            {
-                CmpPtr<ICmpPlayer> cmpPlayer(m_Simulation, cmpPlayerManager->GetPlayerByID(val));
-                if (!cmpPlayer.null())
-                    color = cmpPlayer->GetColour();
-            }
+            if (val < colors.size())
+                color = colors[val];
 
             *p++ = (int)(color.b*255.f);