Ticket #4045: fewercopy.3.patch

simulation2/components/CCmpRangeManager.cpp

@@ -320 +320 @@
     EntityMap<EntityData> m_EntityData;
 
     FastSpatialSubdivision m_Subdivision; // spatial index of m_EntityData
-    std::vector<entity_id_t> m_SubdivisionResults;
+    std::vector<const std::vector<entity_id_t>* > m_SubdivisionResults;
 
     // LOS state:
     static const player_id_t MAX_LOS_PLAYER_ID = 16;
@@ -380 +380 @@
         // SetBounds is called)
         ResetSubdivisions(entity_pos_t::FromInt(1024), entity_pos_t::FromInt(1024));
 
-        m_SubdivisionResults.reserve(4096);
+        m_SubdivisionResults.reserve(256);
 
         // The whole map should be visible to Gaia by default, else e.g. animals
         // will get confused when trying to run from enemies
@@ -1072 +1072 @@
 
             for (size_t i = 0; i < m_SubdivisionResults.size(); ++i)
             {
-                EntityMap<EntityData>::const_iterator it = m_EntityData.find(m_SubdivisionResults[i]);
-                ENSURE(it != m_EntityData.end());
+                std::vector<entity_id_t>::const_iterator eit = m_SubdivisionResults[i]->begin();
+                for (; eit != m_SubdivisionResults[i]->end(); ++eit)
+                {
+                    EntityMap<EntityData>::const_iterator it = m_EntityData.find(*eit);
+                    ENSURE(it != m_EntityData.end());
 
-                if (!TestEntityQuery(q, it->first, it->second))
-                    continue;
+                    if (!TestEntityQuery(q, it->first, it->second))
+                        continue;
 
-                CmpPtr<ICmpPosition> cmpSecondPosition(GetSimContext(), m_SubdivisionResults[i]);
-                if (!cmpSecondPosition || !cmpSecondPosition->IsInWorld())
-                    continue;
-                CFixedVector3D secondPosition = cmpSecondPosition->GetPosition();
+                    CmpPtr<ICmpPosition> cmpSecondPosition(GetSimContext(), *eit);
+                    if (!cmpSecondPosition || !cmpSecondPosition->IsInWorld())
+                        continue;
+                    CFixedVector3D secondPosition = cmpSecondPosition->GetPosition();
 
-                // Restrict based on precise distance
-                if (!InParabolicRange(
+                    // Restrict based on precise distance
+                    if (!InParabolicRange(
                         CFixedVector3D(it->second.x, secondPosition.Y, it->second.z)
-                            - pos3d,
+                        - pos3d,
                         q.maxRange))
-                    continue;
+                        continue;
 
-                if (!q.minRange.IsZero())
-                {
-                    int distVsMin = (CFixedVector2D(it->second.x, it->second.z) - pos).CompareLength(q.minRange);
-                    if (distVsMin < 0)
-                        continue;
+                    if (!q.minRange.IsZero())
+                    {
+                        int distVsMin = (CFixedVector2D(it->second.x, it->second.z) - pos).CompareLength(q.minRange);
+                        if (distVsMin < 0)
+                            continue;
+                    }
+
+                    r.push_back(it->first);
                 }
-
-                r.push_back(it->first);
             }
             std::sort(r.begin(), r.end());
         }
@@ -1110 +1114 @@
 
             for (size_t i = 0; i < m_SubdivisionResults.size(); ++i)
             {
-                EntityMap<EntityData>::const_iterator it = m_EntityData.find(m_SubdivisionResults[i]);
-                ENSURE(it != m_EntityData.end());
+                std::vector<entity_id_t>::const_iterator eit = m_SubdivisionResults[i]->begin();
+                for (; eit != m_SubdivisionResults[i]->end(); ++eit)
+                {
+                    EntityMap<EntityData>::const_iterator it = m_EntityData.find(*eit);
+                    ENSURE(it != m_EntityData.end());
 
-                if (!TestEntityQuery(q, it->first, it->second))
-                    continue;
+                    if (!TestEntityQuery(q, it->first, it->second))
+                        continue;
 
-                // Restrict based on precise distance
-                int distVsMax = (CFixedVector2D(it->second.x, it->second.z) - pos).CompareLength(q.maxRange);
-                if (distVsMax > 0)
-                    continue;
+                    // Restrict based on precise distance
+                    int distVsMax = (CFixedVector2D(it->second.x, it->second.z) - pos).CompareLength(q.maxRange);
+                    if (distVsMax > 0)
+                        continue;
 
-                if (!q.minRange.IsZero())
-                {
-                    int distVsMin = (CFixedVector2D(it->second.x, it->second.z) - pos).CompareLength(q.minRange);
-                    if (distVsMin < 0)
-                        continue;
+                    if (!q.minRange.IsZero())
+                    {
+                        int distVsMin = (CFixedVector2D(it->second.x, it->second.z) - pos).CompareLength(q.minRange);
+                        if (distVsMin < 0)
+                            continue;
+                    }
+
+                    r.push_back(it->first);
                 }
-
-                r.push_back(it->first);
             }
             std::sort(r.begin(), r.end());
         }

simulation2/helpers/Spatial.h

@@ -513 +513 @@
      * Returns a (non sorted) list of items that are either in the square or close to it.
      * It's the responsibility of the querier to do proper distance checking and entity sorting.
      */
-    void GetInRange(std::vector<entity_id_t>& out, CFixedVector2D posMin, CFixedVector2D posMax) const
+    void GetInRange(std::vector< const std::vector<entity_id_t>* >& out, CFixedVector2D posMin, CFixedVector2D posMax) const
     {
         size_t minX = Index(posMin.X);
         size_t minY = Index(posMin.Y);
@@ -530 +530 @@
         ENSURE(out.empty() && "GetInRange: out is not clean");
 
         // Add oversized items, they can be anywhere
-        out.insert(out.end(), m_OverSizedData.begin(), m_OverSizedData.end());
+        if (!m_OverSizedData.empty())
+            out.push_back(&m_OverSizedData);
 
         for (size_t Y = minY; Y < maxY; ++Y)
-        {
             for (size_t X = minX; X < maxX; ++X)
-            {
-                std::vector<entity_id_t>& subdivision = m_SpatialDivisionsData[X + Y*m_ArrayWidth];
-                if (!subdivision.empty())
-                    out.insert(out.end(), subdivision.begin(), subdivision.end());
-            }
-        }
+                out.push_back(&m_SpatialDivisionsData[X + Y*m_ArrayWidth]);
     }
 
     /**
@@ -547 +542 @@
      * Returns a (non sorted) list of items that are either in the circle or close to it.
      * It's the responsibility of the querier to do proper distance checking and entity sorting.
      */
-    void GetNear(std::vector<entity_id_t>& out, CFixedVector2D pos, entity_pos_t range) const
+    void GetNear(std::vector<const std::vector<entity_id_t>* >& out, CFixedVector2D pos, entity_pos_t range) const
     {
         // Because the subdivision size is rather big wrt typical ranges, 
         // this square over-approximation is hopefully not too bad.