Ticket #2012: percent-explored.patch

source/simulation2/components/CCmpRangeManager.cpp

@@ -238 +238 @@
     // Shared LOS masks, one per player.
     std::map<player_id_t, u32> m_SharedLosMasks;
 
+    u32 m_OverallVisibleVertices;
+    // Number of explored vertices per player.
+    std::vector<u32> m_ExploredVertices;
+
     static std::string GetSchema()
     {
         return "<a:component type='system'/><empty/>";
@@ -514 +518 @@
         SpatialSubdivision<entity_id_t> oldSubdivision = m_Subdivision;
 
         ResetDerivedData(true);
-        
+
         if (oldPlayerCounts != m_LosPlayerCounts)
         {
             for (size_t i = 0; i < oldPlayerCounts.size(); ++i)
@@ -547 +551 @@
 
         m_LosPlayerCounts.clear();
         m_LosPlayerCounts.resize(MAX_LOS_PLAYER_ID+1);
-        if (!skipLosState)
+        m_ExploredVertices.clear();
+        m_ExploredVertices.resize(MAX_LOS_PLAYER_ID+1, 0);
+        if (skipLosState) {
+            // recalc current exploration stats.
+            for (i32 j = 0; j < m_TerrainVerticesPerSide; j++)
+            {
+                for (i32 i = 0; i < m_TerrainVerticesPerSide; i++)
+                {
+                    if (!LosIsOffWorld(i, j))
+                    {
+                        for (u8 k = 1; k < MAX_LOS_PLAYER_ID+1; ++k) {
+                            m_ExploredVertices.at(k) += ((m_LosState[j*m_TerrainVerticesPerSide + i] & (LOS_EXPLORED << (2*(k-1)))) > 0);
+                        }
+                    }
+                }
+            }
+        }
+        else
         {
             m_LosState.clear();
             m_LosState.resize(m_TerrainVerticesPerSide*m_TerrainVerticesPerSide);
@@ -561 +582 @@
                 LosAdd(it->second.owner, it->second.visionRange, CFixedVector2D(it->second.x, it->second.z));
         }
 
+        m_OverallVisibleVertices = 0;
         for (ssize_t j = 0; j < m_TerrainVerticesPerSide; ++j)
             for (ssize_t i = 0; i < m_TerrainVerticesPerSide; ++i)
-                m_LosStateRevealed[i + j*m_TerrainVerticesPerSide] = LosIsOffWorld(i, j) ? 0 : 0xFFFFFFFFu;
+            {
+                if (LosIsOffWorld(i,j))
+                {
+                    m_LosStateRevealed[i + j*m_TerrainVerticesPerSide] = 0;
+                }
+                else
+                {
+                    m_LosStateRevealed[i + j*m_TerrainVerticesPerSide] = 0xFFFFFFFFu;
+                    m_OverallVisibleVertices++;
+                }
+            }
     }
 
     void ResetSubdivisions(entity_pos_t x1, entity_pos_t z1)
@@ -931 +963 @@
         for (size_t i = 0; i < m_DebugOverlayLines.size(); ++i)
             collector.Submit(&m_DebugOverlayLines[i]);
     }
-    
+
     virtual u8 GetEntityFlagMask(std::string identifier)
     {
         if (identifier == "normal")
@@ -942 +974 @@
         LOGWARNING(L"CCmpRangeManager: Invalid flag identifier %hs", identifier.c_str());
         return 0;
     }
-    
+
     virtual void SetEntityFlag(entity_id_t ent, std::string identifier, bool value)
     {
         std::map<entity_id_t, EntityData>::iterator it = m_EntityData.find(ent);
@@ -1085 +1117 @@
                 u8 p = grid.get(i, j) & ICmpTerritoryManager::TERRITORY_PLAYER_MASK;
                 if (p > 0 && p <= MAX_LOS_PLAYER_ID)
                 {
+                    u32 &explored = m_ExploredVertices.at(p);
+                    explored += !(m_LosState[i + j*m_TerrainVerticesPerSide] & (LOS_EXPLORED << (2*(p-1))));
                     m_LosState[i + j*m_TerrainVerticesPerSide] |= (LOS_EXPLORED << (2*(p-1)));
+                    explored += !(m_LosState[i+1 + j*m_TerrainVerticesPerSide] & (LOS_EXPLORED << (2*(p-1))));
                     m_LosState[i+1 + j*m_TerrainVerticesPerSide] |= (LOS_EXPLORED << (2*(p-1)));
+                    explored += !(m_LosState[i + (j+1)*m_TerrainVerticesPerSide] & (LOS_EXPLORED << (2*(p-1))));
                     m_LosState[i + (j+1)*m_TerrainVerticesPerSide] |= (LOS_EXPLORED << (2*(p-1)));
+                    explored += !(m_LosState[i+1 + (j+1)*m_TerrainVerticesPerSide] & (LOS_EXPLORED << (2*(p-1))));
                     m_LosState[i+1 + (j+1)*m_TerrainVerticesPerSide] |= (LOS_EXPLORED << (2*(p-1)));
                 }
             }
@@ -1135 +1172 @@
 
         i32 idx0 = j*m_TerrainVerticesPerSide + i0;
         i32 idx1 = j*m_TerrainVerticesPerSide + i1;
-
+        u32 &explored = m_ExploredVertices.at(owner);
         for (i32 idx = idx0; idx <= idx1; ++idx)
         {
             // Increasing from zero to non-zero - move from unexplored/explored to visible+explored
             if (counts[idx] == 0)
             {
                 i32 i = i0 + idx - idx0;
-                if (!LosIsOffWorld(i, j))
+                if (!LosIsOffWorld(i, j)) {
+                    explored += !(m_LosState[idx] & (LOS_EXPLORED << (2*(owner-1))));
                     m_LosState[idx] |= ((LOS_VISIBLE | LOS_EXPLORED) << (2*(owner-1)));
+                }
             }
 
             ASSERT(counts[idx] < 65535);
@@ -1161 +1200 @@
 
         i32 idx0 = j*m_TerrainVerticesPerSide + i0;
         i32 idx1 = j*m_TerrainVerticesPerSide + i1;
-
         for (i32 idx = idx0; idx <= idx1; ++idx)
         {
             ASSERT(counts[idx] > 0);
@@ -1432 +1470 @@
         }
     }
 
-    virtual i32 GetPercentMapExplored(player_id_t player)
+    virtual u8 GetPercentMapExplored(player_id_t player)
     {
-        i32 exploredVertices = 0;
-        i32 overallVisibleVertices = 0;
-        CLosQuerier los(CalcPlayerLosMask(player), m_LosState, m_TerrainVerticesPerSide);
-
-        for (i32 j = 0; j < m_TerrainVerticesPerSide; j++)
-        {
-            for (i32 i = 0; i < m_TerrainVerticesPerSide; i++)
-            {
-                if (!LosIsOffWorld(i, j))
-                {
-                    overallVisibleVertices++;
-                    exploredVertices += (i32)los.IsExplored_UncheckedRange(i, j);
-                }
-            }
-        }
-
-        if (overallVisibleVertices == 0) // avoid divide-by-zero
-            return 0;
-
-        return exploredVertices * 100 / overallVisibleVertices;
+        return m_ExploredVertices.at((u8)player) * 100 / m_OverallVisibleVertices;
     }
 };
 

source/simulation2/components/ICmpRangeManager.cpp

@@ -49 +49 @@
 DEFINE_INTERFACE_METHOD_1("SetLosCircular", void, ICmpRangeManager, SetLosCircular, bool)
 DEFINE_INTERFACE_METHOD_0("GetLosCircular", bool, ICmpRangeManager, GetLosCircular)
 DEFINE_INTERFACE_METHOD_2("SetSharedLos", void, ICmpRangeManager, SetSharedLos, player_id_t, std::vector<player_id_t>)
-DEFINE_INTERFACE_METHOD_1("GetPercentMapExplored", i32, ICmpRangeManager, GetPercentMapExplored, player_id_t)
+DEFINE_INTERFACE_METHOD_1("GetPercentMapExplored", u8, ICmpRangeManager, GetPercentMapExplored, player_id_t)
 END_INTERFACE_WRAPPER(RangeManager)

source/simulation2/components/ICmpRangeManager.h

@@ -317 +317 @@
     /**
      * Get percent map explored statistics for specified player.
      */
-    virtual i32 GetPercentMapExplored(player_id_t player) = 0;
+    virtual u8 GetPercentMapExplored(player_id_t player) = 0;
 
 
     /**

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

@@ -225 +225 @@
 {
     var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
     var cmpPlayer = Engine.QueryInterface(this.entity, IID_Player);
-    return cmpRangeManager.GetPercentMapExplored(cmpPlayer.GetPlayerID());
+    if (cmpPlayer.GetPlayerID() == 0) return 0;
+    return cmpRangeManager.GetPercentMapExplored(cmpPlayer.GetPlayerID());  
 };
 
 Engine.RegisterComponentType(IID_StatisticsTracker, "StatisticsTracker", StatisticsTracker);