Ticket #1334: shared-los-2.patch

source/graphics/GameView.cpp

@@ -487 +487 @@
     CheckLightEnv();
 
     m->Game->CachePlayerColours();
+    m->Game->CachePlayerTeamMasks();
 }
 
 void CGameView::Render()

source/graphics/LOSTexture.cpp

@@ -178 +178 @@
     if (!cmpRangeManager)
         return;
 
-    ICmpRangeManager::CLosQuerier los (cmpRangeManager->GetLosQuerier(g_Game->GetPlayerID()));
+    u32 playerMask = g_Game->GetPlayerTeamMask(g_Game->GetPlayerID());
+    ICmpRangeManager::CLosQuerier los (cmpRangeManager->GetLosQuerier(g_Game->GetPlayerID(), playerMask));
 
     GenerateBitmap(los, &losData[0], m_MapSize, m_MapSize);
 

source/ps/Game.cpp

@@ -352 +352 @@
 
     return m_PlayerColours[player];
 }
+
+
+void CGame::CachePlayerTeamMasks()
+{
+    m_PlayerTeamMasks.clear();
+
+    CmpPtr<ICmpPlayerManager> cmpPlayerManager(*m_Simulation2, SYSTEM_ENTITY);
+    if (!cmpPlayerManager)
+        return;
+
+    CmpPtr<ICmpRangeManager> cmpRangeManager(*m_Simulation2, SYSTEM_ENTITY);
+    if (!cmpRangeManager)
+        return;
+
+    int numPlayers = cmpPlayerManager->GetNumPlayers();
+    m_PlayerTeamMasks.resize(numPlayers);
+
+    for (int i = 0; i < numPlayers; ++i)
+    {
+        CmpPtr<ICmpPlayer> cmpPlayer(*m_Simulation2, cmpPlayerManager->GetPlayerByID(i));
+        if (!cmpPlayer)
+            m_PlayerTeamMasks[i] = 0;
+        else
+        {
+            std::vector<int> diplomacy = cmpPlayer->GetDiplomacy();
+            std::vector<int> allies;
+            for (size_t j = 0; j < diplomacy.size(); ++j)
+                if (diplomacy[j] == 1)
+                    allies.push_back(j);
+
+            m_PlayerTeamMasks[i] = cmpRangeManager->GetLosVisibilityMask( allies );
+        }
+    }
+}
+
+
+u32 CGame::GetPlayerTeamMask(int player) const
+{
+    if (player < 0 || player >= (int)m_PlayerTeamMasks.size())
+        return 0;
+
+    return m_PlayerTeamMasks[player];
+}

source/ps/Game.h

@@ -97 +97 @@
     CColor GetPlayerColour(int player) const;
 
     /**
+     * Retrieves each player's list of allies and generates a mask that
+     * allows line-of-sight visibility to be checked against a player and
+     * all allies with one comparison.
+     */
+    void CachePlayerTeamMasks();
+
+    u32 GetPlayerTeamMask(int player) const;
+
+    /**
      * Get m_GameStarted.
      *
      * @return bool the value of m_GameStarted.
@@ -158 +167 @@
     IReplayLogger* m_ReplayLogger;
 
     std::vector<CColor> m_PlayerColours;
+    std::vector<u32> m_PlayerTeamMasks;
 
     int LoadInitialState();
     std::string m_InitialSavedState; // valid between RegisterInit and LoadInitialState

source/simulation2/components/CCmpRangeManager.cpp

@@ -32 +32 @@
 #include "lib/timer.h"
 #include "maths/FixedVector2D.h"
 #include "ps/CLogger.h"
+#include "ps/Game.h"
 #include "ps/Overlay.h"
 #include "ps/Profile.h"
 #include "renderer/Scene.h"
@@ -915 +916 @@
             return CLosQuerier(player, m_LosState, m_TerrainVerticesPerSide);
     }
 
+    virtual CLosQuerier GetLosQuerier(player_id_t player, u32 playerMask)
+    {
+        if (GetLosRevealAll(player))
+            return CLosQuerier(playerMask, m_LosStateRevealed, m_TerrainVerticesPerSide);
+        else
+            return CLosQuerier(playerMask, m_LosState, m_TerrainVerticesPerSide);
+    }
+
     virtual ELosVisibility GetLosVisibility(entity_id_t ent, player_id_t player, bool forceRetainInFog)
     {
+        return GetLosVisibility(ent, player, 0, forceRetainInFog);
+    }
+
+    virtual ELosVisibility GetLosVisibility(entity_id_t ent, player_id_t player, u32 playerMask, bool forceRetainInFog)
+    {
         // (We can't use m_EntityData since this needs to handle LOCAL entities too)
 
         // Entities not with positions in the world are never visible
@@ -939 +953 @@
         }
 
         // Visible if within a visible region
+        if (!playerMask)
+            playerMask = g_Game->GetPlayerTeamMask(player);
 
-        CLosQuerier los(player, m_LosState, m_TerrainVerticesPerSide);
+        CLosQuerier los(playerMask, m_LosState, m_TerrainVerticesPerSide);
 
         if (los.IsVisible(i, j))
             return VIS_VISIBLE;
@@ -957 +973 @@
         return VIS_HIDDEN;
     }
 
+    virtual u32 GetLosVisibilityMask(std::vector<player_id_t> players)
+    {
+        u32 playerMask = 0;
+        player_id_t player;
+
+        for (size_t i = 0; i < players.size(); i++)
+        {
+            player = players[i];
+            if (player > 0 && player <= 16)
+                playerMask |= LOS_MASK << (2*(player-1));
+            else
+                continue;
+        }
+
+        return playerMask;
+    }
+
     virtual void SetLosRevealAll(player_id_t player, bool enabled)
     {
         m_LosRevealAll[player] = enabled;

source/simulation2/components/ICmpPlayer.cpp

@@ -43 +43 @@
         return m_Script.Call<std::wstring>("GetCiv");
     }
 
+    virtual std::vector<int> GetDiplomacy()
+    {
+        return m_Script.Call<std::vector<int> >("GetDiplomacy");
+    }
+
     virtual CFixedVector3D GetStartingCameraPos()
     {
         return m_Script.Call<CFixedVector3D>("GetStartingCameraPos");

source/simulation2/components/ICmpPlayer.h

@@ -33 +33 @@
 public:
     virtual CColor GetColour() = 0;
     virtual std::wstring GetCiv() = 0;
+    virtual std::vector<int> GetDiplomacy() = 0;
     virtual CFixedVector3D GetStartingCameraPos() = 0;
     virtual CFixedVector3D GetStartingCameraRot() = 0;
 

source/simulation2/components/ICmpRangeManager.h

@@ -194 +194 @@
                 m_PlayerMask = 0;
         }
 
+        CLosQuerier(u32 playerMask, const std::vector<u32>& data, ssize_t verticesPerSide) :
+            m_Data(&data[0]), m_VerticesPerSide(verticesPerSide)
+        {
+            m_PlayerMask = playerMask;
+        }
+
         const CLosQuerier& operator=(const CLosQuerier&); // not implemented
 
     public:
@@ -269 +275 @@
      * Returns a CLosQuerier for checking whether vertex positions are visible to the given player.
      */
     virtual CLosQuerier GetLosQuerier(player_id_t player) = 0;
+    virtual CLosQuerier GetLosQuerier(player_id_t player, u32 playerMask) = 0;
 
     /**
      * Returns the visibility status of the given entity, with respect to the given player.
@@ -279 +286 @@
      *  see http://trac.wildfiregames.com/ticket/958
      */
     virtual ELosVisibility GetLosVisibility(entity_id_t ent, player_id_t player, bool forceRetainInFog = false) = 0;
+    virtual u32 GetLosVisibilityMask(std::vector<player_id_t> players) = 0;
 
     /**
      * GetLosVisibility wrapped for script calls.