Changeset 9951 for ps

Timestamp:

08/01/11 23:25:12 (13 years ago)

Author:

philip

Message:

# Remove SoD inside territories.
Fix some serialisation issues.

Location:

ps/trunk/source/simulation2

Files:

• MessageTypes.h (modified) (1 diff)
• components/CCmpRangeManager.cpp (modified) (11 diffs)
• components/CCmpTerritoryManager.cpp (modified) (1 diff)

ps/trunk/source/simulation2/MessageTypes.h

@@ -279 +279 @@
     DEFAULT_MESSAGE_IMPL(TerrainChanged)
 
-    CMessageTerrainChanged(ssize_t i0, ssize_t j0, ssize_t i1, ssize_t j1) :
+    CMessageTerrainChanged(int32_t i0, int32_t j0, int32_t i1, int32_t j1) :
         i0(i0), j0(j0), i1(i1), j1(j1)
     {
     }
 
-    ssize_t i0, j0, i1, j1; // inclusive lower bound, exclusive upper bound, in tiles
+    int32_t i0, j0, i1, j1; // inclusive lower bound, exclusive upper bound, in tiles
 };
 

ps/trunk/source/simulation2/components/CCmpRangeManager.cpp

@@ -21 +21 @@
 #include "ICmpRangeManager.h"
 
-#include "ICmpPosition.h"
-#include "ICmpVision.h"
 #include "simulation2/MessageTypes.h"
+#include "simulation2/components/ICmpPosition.h"
+#include "simulation2/components/ICmpTerritoryManager.h"
+#include "simulation2/components/ICmpVision.h"
 #include "simulation2/helpers/Render.h"
 #include "simulation2/helpers/Spatial.h"
@@ -189 +190 @@
     bool m_LosCircular;
     i32 m_TerrainVerticesPerSide;
+    size_t m_TerritoriesDirtyID;
 
     // Counts of units seeing vertex, per vertex, per player (starting with player 0).
@@ -229 +231 @@
         m_LosCircular = false;
         m_TerrainVerticesPerSide = 0;
+
+        m_TerritoriesDirtyID = 0;
     }
 
@@ -251 +255 @@
         serialize.NumberI32_Unbounded("terrain verts per side", m_TerrainVerticesPerSide);
 
-        // We don't serialize m_Subdivision, m_LosPlayerCounts, m_LosState
-        // since they can be recomputed from the entity data when deserializing
+        // We don't serialize m_Subdivision or m_LosPlayerCounts
+        // since they can be recomputed from the entity data when deserializing;
+        // m_LosState must be serialized since it depends on the history of exploration
+
+        SerializeVector<SerializeU32_Unbounded>()(serialize, "los state", m_LosState);
     }
 
@@ -267 +274 @@
 
         // Reinitialise subdivisions and LOS data
-        ResetDerivedData();
+        ResetDerivedData(true);
     }
 
@@ -396 +403 @@
         {
             m_DebugOverlayDirty = true;
+            UpdateTerritoriesLos();
             ExecuteActiveQueries();
             break;
@@ -416 +424 @@
         m_TerrainVerticesPerSide = vertices;
 
-        ResetDerivedData();
+        ResetDerivedData(false);
     }
 
     // Reinitialise subdivisions and LOS data, based on entity data
-    void ResetDerivedData()
+    void ResetDerivedData(bool skipLosState)
     {
         ENSURE(m_WorldX0.IsZero() && m_WorldZ0.IsZero()); // don't bother implementing non-zero offsets yet
@@ -427 +435 @@
         m_LosPlayerCounts.clear();
         m_LosPlayerCounts.resize(MAX_LOS_PLAYER_ID+1);
-        m_LosState.clear();
-        m_LosState.resize(m_TerrainVerticesPerSide*m_TerrainVerticesPerSide);
+        if (!skipLosState)
+        {
+            m_LosState.clear();
+            m_LosState.resize(m_TerrainVerticesPerSide*m_TerrainVerticesPerSide);
+        }
         m_LosStateRevealed.clear();
         m_LosStateRevealed.resize(m_TerrainVerticesPerSide*m_TerrainVerticesPerSide);
@@ -801 +812 @@
     }
 
+    // ****************************************************************
 
     // LOS implementation:
@@ -880 +892 @@
         m_LosCircular = enabled;
 
-        ResetDerivedData();
+        ResetDerivedData(false);
     }
 
@@ -886 +898 @@
     {
         return m_LosCircular;
+    }
+
+    void UpdateTerritoriesLos()
+    {
+        CmpPtr<ICmpTerritoryManager> cmpTerritoryManager(GetSimContext(), SYSTEM_ENTITY);
+        if (cmpTerritoryManager.null() || !cmpTerritoryManager->NeedUpdate(&m_TerritoriesDirtyID))
+            return;
+
+        const Grid<u8>& grid = cmpTerritoryManager->GetTerritoryGrid();
+        ENSURE(grid.m_W == m_TerrainVerticesPerSide-1 && grid.m_H == m_TerrainVerticesPerSide-1);
+
+        // For each tile, if it is owned by a valid player then update the LOS
+        // for every vertex around that tile, to mark them as explored
+
+        for (size_t j = 0; j < grid.m_H; ++j)
+        {
+            for (size_t i = 0; i < grid.m_W; ++i)
+            {
+                u8 p = grid.get(i, j);
+                if (p > 0 && p <= MAX_LOS_PLAYER_ID)
+                {
+                    m_LosState[i + j*m_TerrainVerticesPerSide] |= (LOS_EXPLORED << (2*(p-1)));
+                    m_LosState[i+1 + j*m_TerrainVerticesPerSide] |= (LOS_EXPLORED << (2*(p-1)));
+                    m_LosState[i + (j+1)*m_TerrainVerticesPerSide] |= (LOS_EXPLORED << (2*(p-1)));
+                    m_LosState[i+1 + (j+1)*m_TerrainVerticesPerSide] |= (LOS_EXPLORED << (2*(p-1)));
+                }
+            }
+        }
     }
 

ps/trunk/source/simulation2/components/CCmpTerritoryManager.cpp

@@ -183 +183 @@
     virtual bool NeedUpdate(size_t* dirtyID)
     {
-        ENSURE(*dirtyID <= m_DirtyID);
-        if (*dirtyID < m_DirtyID)
+        if (*dirtyID != m_DirtyID)
         {
             *dirtyID = m_DirtyID;