Ticket #1334: shared-los-3.patch

binaries/data/mods/public/simulation/components/Player.js

@@ -221 +221 @@
 Player.prototype.SetDiplomacy = function(dipl)
 {
     this.diplomacy = dipl;
+    this.UpdateSharedLos();
+};
+
+Player.prototype.SetDiplomacyIndex = function(ind, value)
+{
+    this.diplomacy[ind] = value;
+    this.UpdateSharedLos();
+};
+
+Player.prototype.UpdateSharedLos = function()
+{
+    var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+    if (!cmpRangeManager)
+        return;
+
+    var allies = [];
+    for (var i = 0; i < this.diplomacy.length; ++i)
+        if (this.IsAlly(i))
+            allies.push(i);
+
+    cmpRangeManager.SetSharedLosMask( this.playerID, allies );
 };
 
 Player.prototype.GetFormations = function()
@@ -275 +296 @@
 
 Player.prototype.SetAlly = function(id)
 {
-    this.diplomacy[id] = 1;
+    this.SetDiplomacyIndex(id, 1);
 };
 
 /**
@@ -288 +309 @@
 
 Player.prototype.SetEnemy = function(id)
 {
-    this.diplomacy[id] = -1;
+    this.SetDiplomacyIndex(id, -1);
 };
 
 /**
@@ -301 +322 @@
 
 Player.prototype.SetNeutral = function(id)
 {
-    this.diplomacy[id] = 0;
+    this.SetDiplomacyIndex(id, 0);
 };
 
 /**

source/graphics/LOSTexture.cpp

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

source/simulation2/components/CCmpRangeManager.cpp

@@ -22 +22 @@
 
 #include "simulation2/MessageTypes.h"
 #include "simulation2/components/ICmpPosition.h"
+#include "simulation2/components/ICmpPlayerManager.h"
 #include "simulation2/components/ICmpTerritoryManager.h"
 #include "simulation2/components/ICmpVision.h"
 #include "simulation2/helpers/Render.h"
@@ -212 +213 @@
     // (TODO: this is usually a waste of memory)
     std::vector<u32> m_LosStateRevealed;
 
+    // Shared LOS masks, one per player.
+    std::vector<u32> m_PlayerLosMasks;
+
     static std::string GetSchema()
     {
         return "<a:component type='system'/><empty/>";
@@ -915 +919 @@
             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 +956 @@
         }
 
         // Visible if within a visible region
+        if (!playerMask)
+            playerMask = GetSharedLosMask(player);
 
-        CLosQuerier los(player, m_LosState, m_TerrainVerticesPerSide);
+        CLosQuerier los(playerMask, m_LosState, m_TerrainVerticesPerSide);
 
         if (los.IsVisible(i, j))
             return VIS_VISIBLE;
@@ -957 +976 @@
         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));
+        }
+
+        return playerMask;
+    }
+
     virtual void SetLosRevealAll(player_id_t player, bool enabled)
     {
         m_LosRevealAll[player] = enabled;
@@ -991 +1025 @@
         return m_LosCircular;
     }
 
+    virtual void SetSharedLosMask(player_id_t player, std::vector<player_id_t> players)
+    {
+        CmpPtr<ICmpPlayerManager> cmpPlayerManager(GetSimContext(), SYSTEM_ENTITY);
+        if (!cmpPlayerManager)
+            return;
+
+        int numPlayers = cmpPlayerManager->GetNumPlayers();
+        m_PlayerLosMasks.resize(numPlayers);
+
+        if (player >= 0  && player <= (int)m_PlayerLosMasks.size())
+            m_PlayerLosMasks[player] = GetLosVisibilityMask(players);
+    }
+
+    virtual u32 GetSharedLosMask(player_id_t player)
+    {
+        if (player < 0 || player >= (int)m_PlayerLosMasks.size())
+            return 0;
+
+        return m_PlayerLosMasks[player];
+    }
+
     void UpdateTerritoriesLos()
     {
         CmpPtr<ICmpTerritoryManager> cmpTerritoryManager(GetSimContext(), SYSTEM_ENTITY);

source/simulation2/components/ICmpRangeManager.cpp

@@ -48 +48 @@
 DEFINE_INTERFACE_METHOD_3("GetLosVisibility", std::string, ICmpRangeManager, GetLosVisibility_wrapper, entity_id_t, player_id_t, bool)
 DEFINE_INTERFACE_METHOD_1("SetLosCircular", void, ICmpRangeManager, SetLosCircular, bool)
 DEFINE_INTERFACE_METHOD_0("GetLosCircular", bool, ICmpRangeManager, GetLosCircular)
+DEFINE_INTERFACE_METHOD_2("SetSharedLosMask", void, ICmpRangeManager, SetSharedLosMask, player_id_t, std::vector<player_id_t>)
 DEFINE_INTERFACE_METHOD_1("GetPercentMapExplored", i32, ICmpRangeManager, GetPercentMapExplored, player_id_t)
 END_INTERFACE_WRAPPER(RangeManager)

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.
@@ -308 +316 @@
     virtual bool GetLosCircular() = 0;
 
     /**
+     * Sets LOS mask for a player based on the supplied array of players.
+     */
+    virtual void SetSharedLosMask(player_id_t player, std::vector<player_id_t> players) = 0;
+    virtual u32 GetSharedLosMask(player_id_t player) = 0;
+
+    /**
      * Get percent map explored statistics for specified player.
      */
     virtual i32 GetPercentMapExplored(player_id_t player) = 0;