Changeset 9932 for ps

Timestamp:

07/30/11 14:07:27 (13 years ago)

Author:

philip

Message:

Use player colours for territory borders in minimap

File:

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

ps/trunk/source/graphics/TerritoryTexture.cpp

@@ -22 +22 @@
 #include "graphics/Terrain.h"
 #include "lib/bits.h"
+#include "ps/Overlay.h"
 #include "ps/Profile.h"
 #include "renderer/Renderer.h"
 #include "simulation2/Simulation2.h"
+#include "simulation2/components/ICmpPlayer.h"
+#include "simulation2/components/ICmpPlayerManager.h"
 #include "simulation2/components/ICmpTerrain.h"
 #include "simulation2/components/ICmpTerritoryManager.h"
@@ -172 +175 @@
     int alphaFalloff = 0x20;
 
+    CmpPtr<ICmpPlayerManager> cmpPlayerManager(m_Simulation, SYSTEM_ENTITY);
+
     u8* p = bitmap;
     for (ssize_t j = 0; j < h; ++j)
@@ -178 +183 @@
         {
             u8 val = territories.get(i, j);
-            switch (val)
+
+            CColor color(1, 0, 1, 1);
+            if (!cmpPlayerManager.null())
             {
-            // TODO: use player colours or something
-            case 1: *p++ = 0x00; *p++ = 0x00; *p++ = 0xFF; break;
-            case 2: *p++ = 0x00; *p++ = 0xFF; *p++ = 0x00; break;
-            case 3: *p++ = 0xFF; *p++ = 0x00; *p++ = 0x00; break;
-            case 4: *p++ = 0x00; *p++ = 0xFF; *p++ = 0xFF; break;
-            case 5: *p++ = 0xFF; *p++ = 0xFF; *p++ = 0x00; break;
-            case 6: *p++ = 0xFF; *p++ = 0x00; *p++ = 0xFF; break;
-            default: *p++ = 0xFF; *p++ = 0xFF; *p++ = 0xFF; break;
+                CmpPtr<ICmpPlayer> cmpPlayer(m_Simulation, cmpPlayerManager->GetPlayerByID(val));
+                if (!cmpPlayer.null())
+                    color = cmpPlayer->GetColour();
             }
+
+            *p++ = (int)(color.b*255.f);
+            *p++ = (int)(color.g*255.f);
+            *p++ = (int)(color.r*255.f);
 
             if ((i > 0 && territories.get(i-1, j) != val)