Ticket #2913: use_cached_visibility.patch

source/simulation2/components/CCmpRangeManager.cpp

@@ -1376 +1376 @@
             return CLosQuerier(GetSharedLosMask(player), m_LosState, m_TerrainVerticesPerSide);
     }
 
-    virtual ELosVisibility GetLosVisibility(CEntityHandle ent, player_id_t player, bool forceRetainInFog)
+    ELosVisibility ComputeLosVisibility(CEntityHandle ent, player_id_t player, bool forceRetainInFog)
     {
         // Entities not with positions in the world are never visible
         if (ent.GetId() == INVALID_ENTITY)
@@ -1424 +1424 @@
         return VIS_HIDDEN;
     }
 
+    ELosVisibility ComputeLosVisibility(entity_id_t ent, player_id_t player, bool forceRetainInFog)
+    {
+        CEntityHandle handle = GetSimContext().GetComponentManager().LookupEntityHandle(ent);
+        return ComputeLosVisibility(handle, player, forceRetainInFog);
+    }
+
+    virtual ELosVisibility GetLosVisibility(CEntityHandle ent, player_id_t player, bool forceRetainInFog)
+    {
+        entity_id_t entId = ent.GetId();
+        
+        // Entities not with positions in the world are never visible
+        if (entId == INVALID_ENTITY)
+            return VIS_HIDDEN;
+        CmpPtr<ICmpPosition> cmpPosition(ent);
+        if (!cmpPosition || !cmpPosition->IsInWorld())
+            return VIS_HIDDEN;
+
+        CFixedVector2D pos = cmpPosition->GetPosition2D();
+        i32 n = PosToLosTilesHelper(pos.X, pos.Y);
+
+        if (m_DirtyVisibility[n])
+            return ComputeLosVisibility(ent, player, forceRetainInFog);
+
+        if (std::find(m_ModifiedEntities.begin(), m_ModifiedEntities.end(), entId) != m_ModifiedEntities.end())
+            return ComputeLosVisibility(ent, player, forceRetainInFog);
+
+        EntityMap<EntityData>::iterator it = m_EntityData.find(entId);
+        if (it == m_EntityData.end())
+            return ComputeLosVisibility(ent, player, forceRetainInFog);
+
+        return static_cast<ELosVisibility>((it->second.visibilities >> (2*(player-1))) & 0x3);
+    }
+
     virtual ELosVisibility GetLosVisibility(entity_id_t ent, player_id_t player, bool forceRetainInFog)
     {
         CEntityHandle handle = GetSimContext().GetComponentManager().LookupEntityHandle(ent);
@@ -1506 +1539 @@
         for (player_id_t player = 1; player < MAX_LOS_PLAYER_ID+1; ++player)
         {
             u8 oldVis = (itEnts->second.visibilities >> (2*(player-1))) & 0x3;
-            u8 newVis = GetLosVisibility(itEnts->first, player, false);
+            u8 newVis = ComputeLosVisibility(itEnts->first, player, false);
             
             oldVisibilities.push_back(oldVis);
             newVisibilities.push_back(newVis);