Ticket #3612: FixRangeSubdiv.patch

simulation2/helpers/Spatial.h

@@ -398 +398 @@
         return true;
     }
 
+    friend struct SerializeFastSpatialSubdivision;
+
 public:
     FastSpatialSubdivision() : 
         m_SpatialDivisionsData(NULL), m_ArrayWidth(0) 
@@ -409 +411 @@
     {
         Reset(other.m_ArrayWidth);
         std::copy(&other.m_SpatialDivisionsData[0], &other.m_SpatialDivisionsData[m_ArrayWidth*m_ArrayWidth], m_SpatialDivisionsData);
+        m_OverSizedData = other.m_OverSizedData;
     }
 
     ~FastSpatialSubdivision()
@@ -440 +443 @@
         {
             Reset(other.m_ArrayWidth);
             std::copy(&other.m_SpatialDivisionsData[0], &other.m_SpatialDivisionsData[m_ArrayWidth*m_ArrayWidth], m_SpatialDivisionsData);
+            m_OverSizedData = other.m_OverSizedData;
         }
         return *this;
     }
@@ -496 +500 @@
 
     /**
      * Equivalent to Remove() then Add(), but slightly faster.
-     * In particular for big objects nothing needs to be done.
      */
     void Move(entity_id_t item, CFixedVector2D oldPosition, CFixedVector2D newPosition, u32 size)
     {       
         if (size > SUBDIVISION_SIZE)
+        {
+            if (std::find(m_OverSizedData.begin(), m_OverSizedData.end(), item) == m_OverSizedData.end())
+                m_OverSizedData.push_back(item);
             return;
+        }
         if (SubdivisionIdx(newPosition) == SubdivisionIdx(oldPosition))
             return;
 
@@ -572 +579 @@
     }
 };
 
+/**
+ * Serialization helper template for FastSpatialSubdivision
+ */
+struct SerializeFastSpatialSubdivision
+{
+    void operator()(ISerializer& serialize, const char* UNUSED(name), FastSpatialSubdivision& value)
+    {
+        serialize.NumberU32_Unbounded("array width", value.m_ArrayWidth);
+        size_t count = value.m_ArrayWidth * value.m_ArrayWidth;
+        for (size_t i = 0; i < count; ++i)
+            SerializeVector<SerializeU32_Unbounded>()(serialize, "subdiv items", value.m_SpatialDivisionsData[i]);
+        SerializeVector<SerializeU32_Unbounded>()(serialize, "subdiv items", value.m_OverSizedData);
+    }
+    
+    void operator()(IDeserializer& serialize, const char* UNUSED(name), FastSpatialSubdivision& value)
+    {
+        u32 width;
+        serialize.NumberU32_Unbounded("array width", width);
+        value.m_ArrayWidth = width;
+        
+        size_t count = value.m_ArrayWidth * value.m_ArrayWidth;
+
+        delete[] value.m_SpatialDivisionsData;
+        value.m_SpatialDivisionsData = new std::vector<entity_id_t>[count];
+        value.m_OverSizedData.clear();
+
+        for (size_t i = 0; i < count; ++i)
+            SerializeVector<SerializeU32_Unbounded>()(serialize, "subdiv items", value.m_SpatialDivisionsData[i]);
+        
+        SerializeVector<SerializeU32_Unbounded>()(serialize, "subdiv items", value.m_OverSizedData);
+
+    }
+};
+
 #endif // INCLUDED_SPATIAL

simulation2/components/CCmpRangeManager.cpp

@@ -424 +424 @@
         SerializeVector<SerializeU32_Unbounded>()(serialize, "los state", m_LosState);
         SerializeVector<SerializeU32_Unbounded>()(serialize, "shared los masks", m_SharedLosMasks);
         SerializeVector<SerializeU16_Unbounded>()(serialize, "shared dirty visibility masks", m_SharedDirtyVisibilityMasks);
+
+        SerializeFastSpatialSubdivision()(serialize, "range subdivisions", m_Subdivision);
     }
 
     virtual void Serialize(ISerializer& serialize)
@@ -696 +698 @@
         return &m_Subdivision;
     }
 
-    // Reinitialise subdivisions and LOS data, based on entity data
+    // Reinitialise LOS data, based on entity data
     void ResetDerivedData()
     {
         ENSURE(m_WorldX0.IsZero() && m_WorldZ0.IsZero()); // don't bother implementing non-zero offsets yet
+        if (!m_Deserializing)
         ResetSubdivisions(m_WorldX1, m_WorldZ1);
 
         m_LosTilesPerSide = (m_TerrainVerticesPerSide - 1)/LOS_TILES_RATIO;