Changeset 27673

Timestamp:

Jun 13, 2023, 5:48:03 PM (14 months ago)

Author:

wraitii

Message:

Don't poll territory in Position component

CmpPosition::TurnStart checks whether the territory changed underneath each entityevery turn. The only user of this is TerritoryDecay (structures, for the most part). It is rather inefficient to have this done for all entities.
The simplest solution is to listen to position-changed messages in TerritoryDecay instead. This should hardly ever happen in vanilla 0 A.D., except in Atlas, so it's basically free.

This sort of reverts rP14754 (original implementation) and rP14768.

Accepted By: Freagarach (concept only)

Differential Revision: ​https://code.wildfiregames.com/D5009

Location:

ps/trunk

Files:

• binaries/data/mods/public/simulation/components/TerritoryDecay.js (modified) (1 diff)
• source/simulation2/MessageTypes.h (modified) (2 diffs)
• source/simulation2/TypeList.h (modified) (2 diffs)
• source/simulation2/components/CCmpPosition.cpp (modified) (6 diffs)
• source/simulation2/scripting/MessageTypeConversions.cpp (modified) (2 diffs)

ps/trunk/binaries/data/mods/public/simulation/components/TerritoryDecay.js

@@ -132 +132 @@
 };
 
-TerritoryDecay.prototype.OnTerritoryPositionChanged = function(msg)
+TerritoryDecay.prototype.OnPositionChanged = function(msg)
 {
     if (this.territoryOwnership)

ps/trunk/source/simulation2/MessageTypes.h

@@ -1 @@
-/* Copyright (C) 2022 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -302 +302 @@
 };
 
-/*Sent whenever the territory type (neutral,own,enemy) differs from the former type*/
-class CMessageTerritoryPositionChanged final : public CMessage
-{
-public:
-    DEFAULT_MESSAGE_IMPL(TerritoryPositionChanged)
-
-    CMessageTerritoryPositionChanged(entity_id_t entity, player_id_t newTerritory) :
-        entity(entity), newTerritory(newTerritory)
-    {
-    }
-
-    entity_id_t entity;
-    player_id_t newTerritory;
-};
-
 /**
  * Sent by CCmpUnitMotion during Update if an event happened that might interest other components.

ps/trunk/source/simulation2/TypeList.h

@@ -1 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -45 +45 @@
 MESSAGE(PositionChanged)
 MESSAGE(InterpolatedPositionChanged)
-MESSAGE(TerritoryPositionChanged)
 MESSAGE(MotionUpdate)
 MESSAGE(RangeUpdate)

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

@@ -25 +25 @@
 
 #include "ICmpTerrain.h"
-#include "ICmpTerritoryManager.h"
 #include "ICmpVisual.h"
 #include "ICmpWaterManager.h"
@@ -90 +89 @@
     // relative to the parent entity
     entity_angle_t m_RotX, m_RotY, m_RotZ;
-
-    player_id_t m_Territory;
 
     entity_id_t m_TurretParent;
@@ -162 +159 @@
         m_InterpolatedRotX = m_InterpolatedRotY = m_InterpolatedRotZ = 0.f;
         m_LastInterpolatedRotX = m_LastInterpolatedRotZ = 0.f;
-        m_Territory = INVALID_PLAYER;
 
         m_TurretParent = INVALID_ENTITY;
@@ -188 +184 @@
             serialize.NumberFixed_Unbounded("last z", m_LastZ);
         }
-        serialize.NumberI32_Unbounded("territory", m_Territory);
+
         serialize.NumberFixed_Unbounded("rot x", m_RotX);
         serialize.NumberFixed_Unbounded("rot y", m_RotY);
@@ -247 +243 @@
             deserialize.NumberFixed_Unbounded("last z", m_LastZ);
         }
-        deserialize.NumberI32_Unbounded("territory", m_Territory);
+
         deserialize.NumberFixed_Unbounded("rot x", m_RotX);
         deserialize.NumberFixed_Unbounded("rot y", m_RotY);
@@ -840 +836 @@
             m_LastYDifference = entity_pos_t::Zero();
 
-
-            // warn when a position change also causes a territory change under the entity
-            if (m_InWorld)
-            {
-                player_id_t newTerritory;
-                CmpPtr<ICmpTerritoryManager> cmpTerritoryManager(GetSystemEntity());
-                if (cmpTerritoryManager)
-                    newTerritory = cmpTerritoryManager->GetOwner(m_X, m_Z);
-                else
-                    newTerritory = INVALID_PLAYER;
-                if (newTerritory != m_Territory)
-                {
-                    m_Territory = newTerritory;
-                    CMessageTerritoryPositionChanged posMsg(GetEntityId(), m_Territory);
-                    GetSimContext().GetComponentManager().PostMessage(GetEntityId(), posMsg);
-                }
-            }
-            else if (m_Territory != INVALID_PLAYER)
-            {
-                m_Territory = INVALID_PLAYER;
-                CMessageTerritoryPositionChanged posMsg(GetEntityId(), m_Territory);
-                GetSimContext().GetComponentManager().PostMessage(GetEntityId(), posMsg);
-            }
             break;
         }

ps/trunk/source/simulation2/scripting/MessageTypeConversions.cpp

@@ -1 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -248 +248 @@
 ////////////////////////////////
 
-JS::Value CMessageTerritoryPositionChanged::ToJSVal(const ScriptInterface& scriptInterface) const
-{
-    TOJSVAL_SETUP();
-    SET_MSG_PROPERTY(entity);
-    SET_MSG_PROPERTY(newTerritory);
-    return JS::ObjectValue(*obj);
-}
-
-CMessage* CMessageTerritoryPositionChanged::FromJSVal(const ScriptInterface& scriptInterface, JS::HandleValue val)
-{
-    FROMJSVAL_SETUP();
-    GET_MSG_PROPERTY(entity_id_t, entity);
-    GET_MSG_PROPERTY(player_id_t, newTerritory);
-    return new CMessageTerritoryPositionChanged(entity, newTerritory);
-}
-
-////////////////////////////////
-
 const std::array<const char*, CMessageMotionUpdate::UpdateType::LENGTH> CMessageMotionUpdate::UpdateTypeStr = { {
     "likelySuccess", "likelyFailure", "obstructed", "veryObstructed"