Differential D4439 Diff 19462 source/simulation2/components/CCmpUnitMotion_System.cpp

Changeset View

Standalone View

source/simulation2/components/CCmpUnitMotion_System.cpp

/* Copyright (C) 2021 Wildfire Games.		/* Copyright (C) 2022 Wildfire Games.
* This file is part of 0 A.D.		* This file is part of 0 A.D.
*		*
* 0 A.D. is free software: you can redistribute it and/or modify		* 0 A.D. is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or		* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.		* (at your option) any later version.
*		*
* 0 A.D. is distributed in the hope that it will be useful,		* 0 A.D. is distributed in the hope that it will be useful,
Show All 11 Lines
#include "CCmpUnitMotionManager.h"		#include "CCmpUnitMotionManager.h"

#include "maths/MathUtil.h"		#include "maths/MathUtil.h"
#include "ps/CLogger.h"		#include "ps/CLogger.h"
#include "ps/Profile.h"		#include "ps/Profile.h"

#include <unordered_set>		#include <unordered_set>

		#include "maths/Frustum.h"

		#define DEBUG_STATS 0
		#define DEBUG_RENDER 0
		#define DEBUG_RENDER_FOR_PERF 0

// NB: this TU contains the CCmpUnitMotion/CCmpUnitMotionManager couple.		// NB: this TU contains the CCmpUnitMotion/CCmpUnitMotionManager couple.
// In practice, UnitMotionManager functions need access to the full implementation of UnitMotion,		// In practice, UnitMotionManager functions need access to the full implementation of UnitMotion,
// but UnitMotion needs access to MotionState (defined in UnitMotionManager).		// but UnitMotion needs access to MotionState (defined in UnitMotionManager).
// To avoid inclusion issues, implementation of UnitMotionManager that uses UnitMotion is here.		// To avoid inclusion issues, implementation of UnitMotionManager that uses UnitMotion is here.

namespace {		namespace {
/**		/**
* Units push only within their own grid square. This is the size of each square (in arbitrary units).		* Units push within their square and neighboring squares (except diagonals). This is the size of each square (in meters).
* TODO: check other values.		* I have tested grid sizes from 10 up to 80 and overall it made little difference to the performance,
		* mostly, I suspect, because pushing is generally dwarfed by regular motion costs.
		* However, the algorithm remains n^2 in comparisons so it's probably best to err on the side of smaller grids, which will have lower spikes.
		* The balancing act is between comparisons, unordered_set insertions and unordered_set iterations.
		* For these reasons, a value of 20 which is rather small but not overly so was chosen.
*/		*/
static const int PUSHING_GRID_SIZE = 20;		static const int PUSHING_GRID_SIZE = 20;

/**		/**
* For pushing, treat the clearances as a circle - they're defined as squares,		* For pushing, treat the clearances as a circle - they're defined as squares,
* so we'll take the circumscribing square (approximately).		* so we'll take the circumscribing square (approximately).
* Clerances are also full-width instead of half, so we want to divide by two. sqrt(2)/2 is about 0.71 < 5/7.		* Clerances are also full-width instead of half, so we want to divide by two. sqrt(2)/2 is about 0.71 < 5/7.
*/		*/
static const entity_pos_t PUSHING_CORRECTION = entity_pos_t::FromInt(5) / 7;		static const entity_pos_t PUSHING_CORRECTION = entity_pos_t::FromInt(5) / 7;

/**		/**
* Arbitrary constant used to reduce pushing to levels that won't break physics for our turn length.		* Arbitrary constant used to reduce pushing to levels that won't break physics for our turn length.
*/		*/
static const int PUSHING_REDUCTION_FACTOR = 2;		static const int PUSHING_REDUCTION_FACTOR = 2;

/**		/**
* Maximum distance multiplier.		* Maximum distance-related multiplier.
* NB: this value interacts with the "minimal pushing" force,		* NB: this value interacts with the "minimal pushing" force,
* as two perfectly overlapping units exert MAX_DISTANCE_FACTOR * Turn length in ms / REDUCTION_FACTOR		* as two perfectly overlapping units exert MAX_DISTANCE_FACTOR * Turn length in ms / REDUCTION_FACTOR
* of force on each other each turn. If this is below the minimal pushing force, any 2 units can entirely overlap.		* of force on each other each turn. If this is below the minimal pushing force, any 2 units can entirely overlap.
*/		*/
static const entity_pos_t MAX_DISTANCE_FACTOR = entity_pos_t::FromInt(5) / 2;		static const entity_pos_t MAX_DISTANCE_FACTOR = entity_pos_t::FromInt(5) / 2;
}		}

CCmpUnitMotionManager::MotionState::MotionState(CmpPtr<ICmpPosition> cmpPos, CCmpUnitMotion* cmpMotion)		#if DEBUG_RENDER
		void RenderDebugOverlay(SceneCollector& collector, const CFrustum& frustum, bool culling);

		struct SDebugData {
		std::vector<SOverlaySphere> m_Spheres;
		std::vector<SOverlayLine> m_Lines;
		StanUnsubmitted Not Done Inline Actions #include <vector> Stan: #include <vector>
		std::vector<SOverlayQuad> m_Quads;
		} debugDataMotionMgr;
		#endif

		CCmpUnitMotionManager::MotionState::MotionState(ICmpPosition* cmpPos, CCmpUnitMotion* cmpMotion)
: cmpPosition(cmpPos), cmpUnitMotion(cmpMotion)		: cmpPosition(cmpPos), cmpUnitMotion(cmpMotion)
{		{
}		}

		void CCmpUnitMotionManager::ClassInit(CComponentManager& componentManager)
		{
		componentManager.SubscribeToMessageType(MT_Deserialized);
		componentManager.SubscribeToMessageType(MT_TerrainChanged);
		componentManager.SubscribeToMessageType(MT_TurnStart);
		componentManager.SubscribeToMessageType(MT_Update_Final);
		componentManager.SubscribeToMessageType(MT_Update_MotionUnit);
		componentManager.SubscribeToMessageType(MT_Update_MotionFormation);
		#if DEBUG_RENDER
		componentManager.SubscribeToMessageType(MT_RenderSubmit);
		#endif
		}

		void CCmpUnitMotionManager::HandleMessage(const CMessage& msg, bool UNUSED(global))
		{
		switch (msg.GetType())
		{
		case MT_TerrainChanged:
		{
		CmpPtr<ICmpTerrain> cmpTerrain(GetSystemEntity());
		if (cmpTerrain->GetVerticesPerSide() != m_MovingUnits.width())
		ResetSubdivisions();
		break;
		}
		case MT_TurnStart:
		{
		OnTurnStart();
		break;
		}
		case MT_Update_MotionFormation:
		{
		fixed dt = static_cast<const CMessageUpdate_MotionFormation&>(msg).turnLength;
		m_ComputingMotion = true;
		MoveFormations(dt);
		m_ComputingMotion = false;
		break;
		}
		case MT_Update_MotionUnit:
		{
		fixed dt = static_cast<const CMessageUpdate_MotionUnit&>(msg).turnLength;
		m_ComputingMotion = true;
		MoveUnits(dt);
		m_ComputingMotion = false;
		break;
		}
		case MT_Deserialized:
		{
		OnDeserialized();
		break;
		}
		#if DEBUG_RENDER
		case MT_RenderSubmit:
		{
		const CMessageRenderSubmit& msgData = static_cast<const CMessageRenderSubmit&> (msg);
		RenderDebugOverlay(msgData.collector, msgData.frustum, msgData.culling);
		break;
		}
		#endif
		}
		}
void CCmpUnitMotionManager::Init(const CParamNode&)		void CCmpUnitMotionManager::Init(const CParamNode&)
{		{
// Load some data - see CCmpPathfinder.xml.		// Load some data - see CCmpPathfinder.xml.
// This assumes the pathfinder component is initialised first and registers the validator.		// This assumes the pathfinder component is initialised first and registers the validator.
// TODO: there seems to be no real reason why we could not register a 'system' entity somewhere instead.		// TODO: there seems to be no real reason why we could not register a 'system' entity somewhere instead.
CParamNode externalParamNode;		CParamNode externalParamNode;
CParamNode::LoadXML(externalParamNode, L"simulation/data/pathfinder.xml", "pathfinder");		CParamNode::LoadXML(externalParamNode, L"simulation/data/pathfinder.xml", "pathfinder");
CParamNode pushingNode = externalParamNode.GetChild("Pathfinder").GetChild("Pushing");		CParamNode pushingNode = externalParamNode.GetChild("Pathfinder").GetChild("Pushing");

// NB: all values are given sane default, but they are not treated as optional in the schema,		// NB: all values are given sane default, but they are not treated as optional in the schema,
// so the XML file is the reference.		// so the XML file is the reference.

		const CParamNode spread = pushingNode.GetChild("Spread");
		if (spread.IsOk())
		{
		m_PushingSpread = Clamp(spread.ToFixed(), entity_pos_t::Zero(), entity_pos_t::FromInt(1));
		if (m_PushingSpread != spread.ToFixed())
		LOGWARNING("Pushing spread was clamped to the 0-1 range.");
		}
		else
		m_PushingSpread = entity_pos_t::FromInt(5) / 8;

const CParamNode radius = pushingNode.GetChild("Radius");		const CParamNode radius = pushingNode.GetChild("Radius");
if (radius.IsOk())		if (radius.IsOk())
{		{
m_PushingRadius = radius.ToFixed();		m_PushingRadiusMultiplier = radius.ToFixed();
if (m_PushingRadius < entity_pos_t::Zero())		if (m_PushingRadiusMultiplier < entity_pos_t::Zero())
{		{
LOGWARNING("Pushing radius cannot be below 0. De-activating pushing but 'pathfinder.xml' should be updated.");		LOGWARNING("Pushing radius multiplier cannot be below 0. De-activating pushing but 'pathfinder.xml' should be updated.");
m_PushingRadius = entity_pos_t::Zero();		m_PushingRadiusMultiplier = entity_pos_t::Zero();
}		}
// No upper value, but things won't behave sanely if values are too high.		// No upper value, but things won't behave sanely if values are too high.
}		}
else		else
m_PushingRadius = entity_pos_t::FromInt(8) / 5;		m_PushingRadiusMultiplier = entity_pos_t::FromInt(8) / 5;

const CParamNode minForce = pushingNode.GetChild("MinimalForce");		const CParamNode minForce = pushingNode.GetChild("MinimalForce");
if (minForce.IsOk())		if (minForce.IsOk())
m_MinimalPushing = minForce.ToFixed();		m_MinimalPushing = minForce.ToFixed();
else		else
m_MinimalPushing = entity_pos_t::FromInt(2) / 10;		m_MinimalPushing = entity_pos_t::FromInt(2) / 10;

const CParamNode movingExt = pushingNode.GetChild("MovingExtension");		const CParamNode movingExt = pushingNode.GetChild("MovingExtension");
const CParamNode staticExt = pushingNode.GetChild("StaticExtension");		const CParamNode staticExt = pushingNode.GetChild("StaticExtension");
if (movingExt.IsOk() && staticExt.IsOk())		if (movingExt.IsOk() && staticExt.IsOk())
{		{
m_MovingPushExtension = movingExt.ToFixed();		m_MovingPushExtension = movingExt.ToFixed();
m_StaticPushExtension = staticExt.ToFixed();		m_StaticPushExtension = staticExt.ToFixed();
}		}
else		else
{		{
m_MovingPushExtension = entity_pos_t::FromInt(5) / 2;		m_MovingPushExtension = entity_pos_t::FromInt(5) / 2;
m_StaticPushExtension = entity_pos_t::FromInt(2);		m_StaticPushExtension = entity_pos_t::FromInt(2);
}		}

		const CParamNode pressureStrength = pushingNode.GetChild("PushingPressureStrength");
		if (pressureStrength.IsOk())
		{
		m_PushingPressureStrength = pressureStrength.ToFixed();
		if (m_PushingPressureStrength < entity_pos_t::Zero())
		{
		LOGWARNING("Pushing pressure strength cannot be below 0. 'pathfinder.xml' should be updated.");
		m_PushingPressureStrength = entity_pos_t::Zero();
		}
		// No upper value, but things won't behave sanely if values are too high.
		}
		else
		m_PushingPressureStrength = entity_pos_t::FromInt(1);

		const CParamNode pushingPressure = pushingNode.GetChild("PushingPressureDecay");
		if (pushingPressure.IsOk())
		{
		m_PushingPressureDecay = Clamp(pushingPressure.ToFixed(), entity_pos_t::Zero(), entity_pos_t::FromInt(1));
		if (m_PushingPressureDecay != pushingPressure.ToFixed())
		LOGWARNING("Pushing pressure decay was clamped to the 0-1 range.");
		}
		else
		m_PushingPressureDecay = entity_pos_t::FromInt(6) / 10;

		}

		template<>
		struct SerializeHelper<CCmpUnitMotionManager::MotionState>
		{
		template<typename S>
		void operator()(S& serialize, const char* UNUSED(name), Serialize::qualify<S, CCmpUnitMotionManager::MotionState> value)
		{
		Serializer(serialize, "pushing pressure", value.pushingPressure);
		}
		};

		template<>
		struct SerializeHelper<EntityMap<CCmpUnitMotionManager::MotionState>>
		{
		void operator()(ISerializer& serialize, const char* UNUSED(name), EntityMap<CCmpUnitMotionManager::MotionState>& value)
		{
		// Serialize manually, we don't have a default-constructor for deserialization.
		Serializer(serialize, "size", static_cast<u32>(value.size()));
		for (EntityMap<CCmpUnitMotionManager::MotionState>::iterator it = value.begin(); it != value.end(); ++it)
		{
		Serializer(serialize, "ent id", it->first);
		Serializer(serialize, "state", it->second);
		}
		}

		void operator()(IDeserializer& deserialize, const char* UNUSED(name), EntityMap<CCmpUnitMotionManager::MotionState>& value)
		{
		u32 units = 0;
		Serializer(deserialize, "size", units);
		for (u32 i = 0; i < units; ++i)
		{
		entity_id_t ent = INVALID_ENTITY;
		Serializer(deserialize, "ent id", ent);
		// Insert an invalid motion state, will be cleared up in MT_Deserialized.
		CCmpUnitMotionManager::MotionState state(nullptr, nullptr);
		Serializer(deserialize, "state", state);
		value.insert(ent, state);
		}
		}
		};

		void CCmpUnitMotionManager::Serialize(ISerializer& serialize)
		{
		Serializer(serialize, "m_Units", m_Units);
		Serializer(serialize, "m_FormationControllers", m_FormationControllers);
		}

		void CCmpUnitMotionManager::Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
		{
		Init(paramNode);
		ResetSubdivisions();
		Serializer(deserialize, "m_Units", m_Units);
		Serializer(deserialize, "m_FormationControllers", m_FormationControllers);
		}

		/**
		* This deserialization process is rather ugly, but it's required to store some data in the motion states.
		* Ideally, the motion state would actually be CCmpUnitMotion themselves, but for data locality
		* (because our components are stored randomly on the heap right now) they're not.
		* If we ever change the simulation so that components could be registered by their managers and exposed,
		* then we could just use CCmpUnitMotion directly and clean this code uglyness.
		*/
		void CCmpUnitMotionManager::OnDeserialized()
		{
		// Fetch the components now that they exist.
		// The rest of the data was already deserialized or will be reconstructed.
		for (EntityMap<MotionState>::iterator it = m_Units.begin(); it != m_Units.end(); ++it)
		{
		it->second.cmpPosition = static_cast<ICmpPosition*>(QueryInterface(GetSimContext(), it->first, IID_Position));
		// We can know for a fact that these are CCmpUnitMotion because those are the ones registering with us
		// (and to ensure that they pass a CCmpUnitMotion pointer when registering).
		it->second.cmpUnitMotion = static_cast<CCmpUnitMotion>(static_cast<ICmpUnitMotion>(QueryInterface(GetSimContext(), it->first, IID_UnitMotion)));
		}
		for (EntityMap<MotionState>::iterator it = m_FormationControllers.begin(); it != m_FormationControllers.end(); ++it)
		{
		it->second.cmpPosition = static_cast<ICmpPosition*>(QueryInterface(GetSimContext(), it->first, IID_Position));
		it->second.cmpUnitMotion = static_cast<CCmpUnitMotion>(static_cast<ICmpUnitMotion>(QueryInterface(GetSimContext(), it->first, IID_UnitMotion)));
		}
		}

		void CCmpUnitMotionManager::ResetSubdivisions()
		{
		CmpPtr<ICmpTerrain> cmpTerrain(GetSystemEntity());
		if (!cmpTerrain)
		return;

		size_t size = cmpTerrain->GetMapSize();
		StanUnsubmitted Not Done Inline Actions const? Stan: const?
		u16 gridSquareSize = static_cast<u16>(size / PUSHING_GRID_SIZE + 1);
		m_MovingUnits.resize(gridSquareSize, gridSquareSize);
}		}

void CCmpUnitMotionManager::Register(CCmpUnitMotion* component, entity_id_t ent, bool formationController)		void CCmpUnitMotionManager::Register(CCmpUnitMotion* component, entity_id_t ent, bool formationController)
{		{
MotionState state(CmpPtr<ICmpPosition>(GetSimContext(), ent), component);		MotionState state(static_cast<ICmpPosition*>(QueryInterface(GetSimContext(), ent, IID_Position)), component);
if (!formationController)		if (!formationController)
m_Units.insert(ent, state);		m_Units.insert(ent, state);
else		else
m_FormationControllers.insert(ent, state);		m_FormationControllers.insert(ent, state);
}		}

void CCmpUnitMotionManager::Unregister(entity_id_t ent)		void CCmpUnitMotionManager::Unregister(entity_id_t ent)
{		{
Show All 24 Lines

void CCmpUnitMotionManager::MoveFormations(fixed dt)		void CCmpUnitMotionManager::MoveFormations(fixed dt)
{		{
Move(m_FormationControllers, dt);		Move(m_FormationControllers, dt);
}		}

void CCmpUnitMotionManager::Move(EntityMap<MotionState>& ents, fixed dt)		void CCmpUnitMotionManager::Move(EntityMap<MotionState>& ents, fixed dt)
{		{
		#if DEBUG_RENDER
		debugDataMotionMgr.m_Spheres.clear();
		debugDataMotionMgr.m_Lines.clear();
		debugDataMotionMgr.m_Quads.clear();
		#endif
		#if DEBUG_STATS
		int comparisons = 0;
		double start = timer_Time();
		#endif

PROFILE2("MotionMgr_Move");		PROFILE2("MotionMgr_Move");
std::unordered_set<std::vector<EntityMap<MotionState>::iterator>*> assigned;		std::unordered_set<std::vector<EntityMap<MotionState>::iterator>*> assigned;
for (EntityMap<MotionState>::iterator it = ents.begin(); it != ents.end(); ++it)		for (EntityMap<MotionState>::iterator it = ents.begin(); it != ents.end(); ++it)
{		{
if (!it->second.cmpPosition->IsInWorld())		if (!it->second.cmpPosition->IsInWorld())
{		{
it->second.needUpdate = false;		it->second.needUpdate = false;
continue;		continue;
Show All 11 Lines	std::vector<EntityMap<MotionState>::iterator>& subdiv = m_MovingUnits.get(
it->second.pos.X.ToInt_RoundToZero() / PUSHING_GRID_SIZE,		it->second.pos.X.ToInt_RoundToZero() / PUSHING_GRID_SIZE,
it->second.pos.Y.ToInt_RoundToZero() / PUSHING_GRID_SIZE		it->second.pos.Y.ToInt_RoundToZero() / PUSHING_GRID_SIZE
);		);
subdiv.emplace_back(it);		subdiv.emplace_back(it);
assigned.emplace(&subdiv);		assigned.emplace(&subdiv);
}		}

for (std::vector<EntityMap<MotionState>::iterator>* vec : assigned)		for (std::vector<EntityMap<MotionState>::iterator>* vec : assigned)
		{
		#if DEBUG_RENDER
		{
		SOverlayLine gridL;
		auto it = (*vec)[0];
		gridL.PushCoords(CVector3D(it->second.pos.X.ToInt_RoundToZero() / PUSHING_GRID_SIZE * PUSHING_GRID_SIZE,
		StanUnsubmitted Not Done Inline Actions macro/ function? Stan: macro/ function?
		wraitiiAuthorUnsubmitted Done Inline Actions Meh, debug code wraitii: Meh, debug code
		it->second.cmpPosition->GetHeightFixed().ToDouble() + 2.f,
		it->second.pos.Y.ToInt_RoundToZero() / PUSHING_GRID_SIZE * PUSHING_GRID_SIZE));
		gridL.PushCoords(CVector3D(it->second.pos.X.ToInt_RoundToZero() / PUSHING_GRID_SIZE * PUSHING_GRID_SIZE + PUSHING_GRID_SIZE,
		it->second.cmpPosition->GetHeightFixed().ToDouble() + 2.f,
		it->second.pos.Y.ToInt_RoundToZero() / PUSHING_GRID_SIZE * PUSHING_GRID_SIZE));
		gridL.PushCoords(CVector3D(it->second.pos.X.ToInt_RoundToZero() / PUSHING_GRID_SIZE * PUSHING_GRID_SIZE + PUSHING_GRID_SIZE,
		it->second.cmpPosition->GetHeightFixed().ToDouble() + 2.f,
		it->second.pos.Y.ToInt_RoundToZero() / PUSHING_GRID_SIZE * PUSHING_GRID_SIZE + PUSHING_GRID_SIZE));
		gridL.PushCoords(CVector3D(it->second.pos.X.ToInt_RoundToZero() / PUSHING_GRID_SIZE * PUSHING_GRID_SIZE,
		it->second.cmpPosition->GetHeightFixed().ToDouble() + 2.f,
		it->second.pos.Y.ToInt_RoundToZero() / PUSHING_GRID_SIZE * PUSHING_GRID_SIZE + PUSHING_GRID_SIZE));
		gridL.PushCoords(CVector3D(it->second.pos.X.ToInt_RoundToZero() / PUSHING_GRID_SIZE * PUSHING_GRID_SIZE,
		it->second.cmpPosition->GetHeightFixed().ToDouble() + 2.f,
		it->second.pos.Y.ToInt_RoundToZero() / PUSHING_GRID_SIZE * PUSHING_GRID_SIZE));
		gridL.m_Color = CColor(1, 1, 0, 1);
		debugDataMotionMgr.m_Lines.push_back(gridL);
		}
		#endif
for (EntityMap<MotionState>::iterator& it : *vec)		for (EntityMap<MotionState>::iterator& it : *vec)
		{
if (it->second.needUpdate)		if (it->second.needUpdate)
it->second.cmpUnitMotion->Move(it->second, dt);		it->second.cmpUnitMotion->Move(it->second, dt);
		// Decay pressure after moving so we can get the full 0-255 range of values.
		it->second.pushingPressure = (m_PushingPressureDecay * it->second.pushingPressure).ToInt_RoundToZero();
		}
		}

// Skip pushing entirely if the radius is 0		// Skip pushing entirely if the radius is 0
if (&ents == &m_Units && m_PushingRadius != entity_pos_t::Zero())		if (&ents == &m_Units && IsPushingActivated())
{		{
PROFILE2("MotionMgr_Pushing");		PROFILE2("MotionMgr_Pushing");
for (std::vector<EntityMap<MotionState>::iterator>* vec : assigned)		for (std::vector<EntityMap<MotionState>::iterator>* vec : assigned)
{		{
ENSURE(!vec->empty());		ENSURE(!vec->empty());
		std::vector< std::vector<EntityMap<MotionState>::iterator>* > consider = { vec };

std::vector<EntityMap<MotionState>::iterator>::iterator cit1 = vec->begin();		int x = (*vec)[0]->second.pos.X.ToInt_RoundToZero() / PUSHING_GRID_SIZE;
do		int z = (*vec)[0]->second.pos.Y.ToInt_RoundToZero() / PUSHING_GRID_SIZE;
		if (x + 1 < m_MovingUnits.width())
		consider.push_back(&m_MovingUnits.get(x + 1, z));
		if (x > 0)
		consider.push_back(&m_MovingUnits.get(x - 1, z));
		if (z + 1 < m_MovingUnits.height())
		consider.push_back(&m_MovingUnits.get(x, z + 1));
		if (z > 0)
		consider.push_back(&m_MovingUnits.get(x, z - 1));

		for (EntityMap<MotionState>::iterator& it : *vec)
		StanUnsubmitted Not Done Inline Actions No way to access it more nicely? E.g. range loop? Stan: No way to access it more nicely? E.g. range loop?
		wraitiiAuthorUnsubmitted Done Inline Actions not sure what you mean? wraitii: not sure what you mean?
		StanUnsubmitted Not Done Inline Actions I mean that the syntax (vec)[0]was not great :) Stan:* I mean that the syntax (*vec)[0]was not great :)
{		{
if ((*cit1)->second.ignore)		if (it->second.ignore)
continue;		continue;
std::vector<EntityMap<MotionState>::iterator>::iterator cit2 = cit1;
while(++cit2 != vec->end())		#if DEBUG_RENDER
if (!(*cit2)->second.ignore)		// Plop a sphere at the unit end-pos.
Push(cit1, cit2, dt);		{
		SOverlaySphere sph;
		sph.m_Center = CVector3D(it->second.pos.X.ToDouble(), it->second.cmpPosition->GetHeightFixed().ToDouble() + 13.f, it->second.pos.Y.ToDouble());
		sph.m_Radius = it->second.cmpUnitMotion->m_Clearance.Multiply(PUSHING_CORRECTION).ToDouble();
		// Color the sphere: the redder, the more 'bogged down' it is.
		sph.m_Color = CColor(it->second.pushingPressure / 255.f, 0, 0, 1);
		debugDataMotionMgr.m_Spheres.push_back(sph);
		}
		/* Show the pushing sphere, kinda unreadable.
		StanUnsubmitted Not Done Inline Actions Macro option instead of comment? Stan: Macro option instead of comment?
		{
		SOverlaySphere sph;
		sph.m_Center = CVector3D(it->second.pos.X.ToDouble(), it->second.cmpPosition->GetHeightFixed().ToDouble() + 13.f, it->second.pos.Y.ToDouble());
		sph.m_Radius = (it->second.cmpUnitMotion->m_Clearance.Multiply(PUSHING_CORRECTION).Multiply(m_PushingRadiusMultiplier) + (it->second.isMoving ? m_StaticPushExtension : m_MovingPushExtension)).ToDouble();
		// Color the sphere: the redder, the more 'bogged down' it is.
		sph.m_Color = CColor(it->second.pushingPressure / 255.f, 0, 0, 0.1);
		debugDataMotionMgr.m_Spheres.push_back(sph);
		}*/
		// Show the travel over this turn.
		SOverlayLine line;
		line.PushCoords(CVector3D(it->second.initialPos.X.ToDouble(),
		it->second.cmpPosition->GetHeightFixed().ToDouble() + 13.f,
		it->second.initialPos.Y.ToDouble()));
		line.PushCoords(CVector3D(it->second.pos.X.ToDouble(),
		it->second.cmpPosition->GetHeightFixed().ToDouble() + 13.f,
		it->second.pos.Y.ToDouble()));
		line.m_Color = CColor(1, 0, 1, 0.5);
		debugDataMotionMgr.m_Lines.push_back(line);
		#endif
		for (std::vector<EntityMap<MotionState>::iterator>* vec2 : consider)
		for (EntityMap<MotionState>::iterator& it2 : *vec2)
		if (it->first < it2->first && !it2->second.ignore)
		{
		#if DEBUG_STATS
		++comparisons;
		#endif
		Push(it, it2, dt);
		}
}		}
while(++cit1 != vec->end());
}		}
}		}

if (m_PushingRadius != entity_pos_t::Zero())		if (IsPushingActivated())
{		{
PROFILE2("MotionMgr_PushAdjust");		PROFILE2("MotionMgr_PushAdjust");
CmpPtr<ICmpPathfinder> cmpPathfinder(GetSystemEntity());		CmpPtr<ICmpPathfinder> cmpPathfinder(GetSystemEntity());
for (std::vector<EntityMap<MotionState>::iterator>* vec : assigned)		for (std::vector<EntityMap<MotionState>::iterator>* vec : assigned)
{		{
for (EntityMap<MotionState>::iterator& it : *vec)		for (EntityMap<MotionState>::iterator& it : *vec)
{		{

if (!it->second.needUpdate \|\| it->second.ignore)		if (!it->second.needUpdate \|\| it->second.ignore)
continue;		continue;

		#if DEBUG_RENDER
		SOverlayLine line;
		line.PushCoords(CVector3D(it->second.pos.X.ToDouble(),
		it->second.cmpPosition->GetHeightFixed().ToDouble() + 15.1f ,
		it->second.pos.Y.ToDouble()));
		line.PushCoords(CVector3D(it->second.pos.X.ToDouble() + it->second.push.X.ToDouble() * 10.f,
		it->second.cmpPosition->GetHeightFixed().ToDouble() + 15.1f ,
		it->second.pos.Y.ToDouble() + it->second.push.Y.ToDouble() * 10.f));
		line.m_Thickness = 0.05f;
		#endif

		// Only apply pushing if the effect is significant enough.
		if (it->second.push.CompareLength(m_MinimalPushing) <= 0)
		{
		#if DEBUG_RENDER
		line.m_Color = CColor(1, 1, 0, 0.6);
		debugDataMotionMgr.m_Lines.push_back(line);
		#endif
		it->second.push = CFixedVector2D();
		continue;
		}

// Prevent pushed units from crossing uncrossable boundaries		// Prevent pushed units from crossing uncrossable boundaries
// (we can assume that normal movement didn't push units into impassable terrain).		// (we can assume that normal movement didn't push units into impassable terrain).
if ((it->second.push.X != entity_pos_t::Zero() \|\| it->second.push.Y != entity_pos_t::Zero()) &&		if ((it->second.push.X != entity_pos_t::Zero() \|\| it->second.push.Y != entity_pos_t::Zero()) &&
!cmpPathfinder->CheckMovement(it->second.cmpUnitMotion->GetObstructionFilter(),		!cmpPathfinder->CheckMovement(it->second.cmpUnitMotion->GetObstructionFilter(),
it->second.pos.X, it->second.pos.Y,		it->second.pos.X, it->second.pos.Y,
it->second.pos.X + it->second.push.X, it->second.pos.Y + it->second.push.Y,		it->second.pos.X + it->second.push.X, it->second.pos.Y + it->second.push.Y,
it->second.cmpUnitMotion->m_Clearance,		it->second.cmpUnitMotion->m_Clearance,
it->second.cmpUnitMotion->m_PassClass))		it->second.cmpUnitMotion->m_PassClass))
{		{
// Mark them as obstructed - this could possibly be optimised		// Mark them as obstructed - this could possibly be optimised
// perhaps it'd make more sense to mark the pushers as blocked.		// perhaps it'd make more sense to mark the pushers as blocked.
it->second.wasObstructed = true;		it->second.wasObstructed = true;
it->second.wentStraight = false;		it->second.wentStraight = false;
it->second.push = CFixedVector2D();		it->second.push = CFixedVector2D();
		continue;
}		}
// Only apply pushing if the effect is significant enough.		// If there was an attempt at movement, and we're getting pushed significantly and
if (it->second.push.CompareLength(m_MinimalPushing) > 0)		// away from where we'd like to go(measured by a low dot product and)
{
// If there was an attempt at movement, and the pushed movement is in a sufficiently different direction
// (measured by an extremely arbitrary dot product)
// then mark the unit as obstructed still.		// then mark the unit as obstructed still.
if (it->second.pos != it->second.initialPos &&		else if (it->second.pos != it->second.initialPos
(it->second.pos - it->second.initialPos).Dot(it->second.pos + it->second.push - it->second.initialPos) < entity_pos_t::FromInt(1)/2)		&& (it->second.pos - it->second.initialPos).Dot(it->second.pos + it->second.push - it->second.initialPos) < entity_pos_t::FromInt(1)/2
		&& it->second.pushingPressure > 100)
{		{
it->second.wasObstructed = true;		it->second.wasObstructed = true;
it->second.wentStraight = false;		it->second.wentStraight = false;
// Push anyways.		// Push anyways.
}		}
it->second.pos += it->second.push;		#if DEBUG_RENDER
}		if (it->second.wasObstructed)
		line.m_Color = CColor(1, 0, 0, 1);
		else
		line.m_Color = CColor(0, 1, 0, 1);
		debugDataMotionMgr.m_Lines.push_back(line);
		#endif
		// Dampen the pushing by the current pushing pressure
		// (but prevent full dampening so that clumped units still get unclumped).
		it->second.pos += it->second.push * (255 - std::min<uint8_t>(150, it->second.pushingPressure)) / 255;
		StanUnsubmitted Not Done Inline Actions #include <algorithm> Stan: #include <algorithm>
it->second.push = CFixedVector2D();		it->second.push = CFixedVector2D();
}		}
}		}
}		}
{		{
PROFILE2("MotionMgr_PostMove");		PROFILE2("MotionMgr_PostMove");
for (EntityMap<MotionState>::value_type& data : ents)		for (EntityMap<MotionState>::value_type& data : ents)
{		{
if (!data.second.needUpdate)		if (!data.second.needUpdate)
continue;		continue;
data.second.cmpUnitMotion->PostMove(data.second, dt);		data.second.cmpUnitMotion->PostMove(data.second, dt);
}		}
}		}
		#if DEBUG_STATS
		int size = 0;
		for (std::vector<EntityMap<MotionState>::iterator>* vec : assigned)
		size += vec->size();
		double time = timer_Time() - start;
		if (comparisons > 0)
		printf(">> %i comparisons over %li grids, %f units per grid in %f secs\n", comparisons, assigned.size(), size / (float)(assigned.size()), time);
		#endif
for (std::vector<EntityMap<MotionState>::iterator>* vec : assigned)		for (std::vector<EntityMap<MotionState>::iterator>* vec : assigned)
vec->clear();		vec->clear();
}		}

// TODO: ought to better simulate in-flight pushing, e.g. if units would cross in-between turns.		// TODO: ought to better simulate in-flight pushing, e.g. if units would cross in-between turns.
void CCmpUnitMotionManager::Push(EntityMap<MotionState>::value_type& a, EntityMap<MotionState>::value_type& b, fixed dt)		void CCmpUnitMotionManager::Push(EntityMap<MotionState>::value_type& a, EntityMap<MotionState>::value_type& b, fixed dt)
{		{
// The hard problem for pushing is knowing when to actually use the pathfinder to go around unpushable obstacles.		// The hard problem for pushing is knowing when to actually use the pathfinder to go around unpushable obstacles.
Show All 10 Lines	if (sameControlGroup)
movingPush = 0;		movingPush = 0;

if (movingPush == 1)		if (movingPush == 1)
return;		return;

entity_pos_t combinedClearance = (a.second.cmpUnitMotion->m_Clearance + b.second.cmpUnitMotion->m_Clearance).Multiply(PUSHING_CORRECTION);		entity_pos_t combinedClearance = (a.second.cmpUnitMotion->m_Clearance + b.second.cmpUnitMotion->m_Clearance).Multiply(PUSHING_CORRECTION);
entity_pos_t maxDist = combinedClearance;		entity_pos_t maxDist = combinedClearance;
if (!sameControlGroup)		if (!sameControlGroup)
maxDist = combinedClearance.Multiply(m_PushingRadius) + (movingPush ? m_MovingPushExtension : m_StaticPushExtension);		{
		maxDist = combinedClearance.Multiply(m_PushingRadiusMultiplier) + (movingPush ? m_MovingPushExtension : m_StaticPushExtension);
		combinedClearance = maxDist.Multiply(m_PushingSpread);
		}

CFixedVector2D offset = a.second.pos - b.second.pos;		// Compare the average position of the two units over the turn - this makes overall behaviour better,
		// as we really care more about units that end up either crossing paths or staying together.
		CFixedVector2D offset = ((a.second.pos + a.second.initialPos) - (b.second.pos + b.second.initialPos)) / 2;

		#if DEBUG_RENDER && DEBUG_RENDER_FOR_PERF
		SOverlayLine line;
		line.PushCoords(CVector3D(a.second.pos.X.ToDouble(),
		a.second.cmpPosition->GetHeightFixed().ToDouble() + 8,
		a.second.pos.Y.ToDouble()));
		line.PushCoords(CVector3D(b.second.pos.X.ToDouble(),
		b.second.cmpPosition->GetHeightFixed().ToDouble() + 8,
		b.second.pos.Y.ToDouble()));
		if (offset.CompareLength(maxDist) > 0)
		{
		line.m_Thickness = 0.01f;
		line.m_Color = CColor(0, 0, 1, 0.4);
		debugDataMotionMgr.m_Lines.push_back(line);
		// then will return
		}
		#endif
if (offset.CompareLength(maxDist) > 0)		if (offset.CompareLength(maxDist) > 0)
return;		return;

entity_pos_t offsetLength = offset.Length();		entity_pos_t offsetLength;

		// If the units appear to have crossed paths, give them a strong perpendicular nudge.
		// Ideally, this will make them look like they avoided each other.
		// Worst case, either the collision detection isn't picked up or they'll end up bogged down.
		// NB: the dot product mostly works because we used average positions earlier.
		// NB: this kinda works only because our turn lengths are large enough to make this relevant.
		// In an ideal world, we'd anticipate here instead.
		if ((a.second.pos - b.second.pos).Dot(a.second.initialPos - b.second.initialPos) < entity_pos_t::FromInt(-1)/10)
		{
		offset = ((a.second.pos - b.second.pos) - (a.second.initialPos - b.second.initialPos)).Perpendicular();
		offsetLength = offset.Length();
		if (offsetLength > entity_pos_t::Epsilon() * 10)
		{
		// This needs to be a strong effect or it won't really work.
		offset.X = offset.X / offsetLength * 3;
		offset.Y = offset.Y / offsetLength * 3;
		}
		offsetLength = entity_pos_t::Zero();
		}
		else
		{
		offsetLength = offset.Length();
// If the offset is small enough that precision would be problematic, pick an arbitrary vector instead.		// If the offset is small enough that precision would be problematic, pick an arbitrary vector instead.
if (offsetLength <= entity_pos_t::Epsilon() * 10)		if (offsetLength <= entity_pos_t::Epsilon() * 10)
{		{
// Throw in some 'randomness' so that clumped units unclump more naturally.		// Throw in some 'randomness' so that clumped units unclump more naturaslly.
		FreagarachUnsubmitted Not Done Inline Actions ^^ Freagarach: ^^
bool dir = a.first % 2;		bool dir = a.first % 2;
offset.X = entity_pos_t::FromInt(dir ? 1 : 0);		offset.X = entity_pos_t::FromInt(dir ? 1 : 0);
offset.Y = entity_pos_t::FromInt(dir ? 0 : 1);		offset.Y = entity_pos_t::FromInt(dir ? 0 : 1);
offsetLength = entity_pos_t::Epsilon() * 10;		offsetLength = entity_pos_t::Epsilon() * 10;
}		}
else		else
{		{
offset.X = offset.X / offsetLength;		offset.X = offset.X / offsetLength;
offset.Y = offset.Y / offsetLength;		offset.Y = offset.Y / offsetLength;
}		}

// If the units are moving in opposite direction, check if they might have phased through each other.
// If it looks like yes, move them perpendicularily so it looks like they avoid each other.
// NB: this isn't very precise, nor will it catch 100% of intersections - it's meant as a cheap improvement.
if (movingPush && (a.second.pos - a.second.initialPos).Dot(b.second.pos - b.second.initialPos) < entity_pos_t::Zero())
// Perform some finer checking.
if (Geometry::TestRayAASquare(a.second.initialPos - b.second.initialPos, a.second.pos - b.second.initialPos,
CFixedVector2D(combinedClearance, combinedClearance))
\|\|
Geometry::TestRayAASquare(a.second.initialPos - b.second.pos, a.second.pos - b.second.pos,
CFixedVector2D(combinedClearance, combinedClearance)))
{
offset = offset.Perpendicular();
offsetLength = fixed::Zero();
}		}

// The pushing distance factor is 1 if the edges are touching, >1 up to MAX if the units overlap, < 1 otherwise.		// The pushing distance factor is 1 at the spread-modified combined clearance, >1 up to MAX if the units 'overlap', < 1 otherwise.
entity_pos_t distanceFactor = maxDist - combinedClearance;		entity_pos_t distanceFactor = maxDist - combinedClearance;
// Force units that overlap a lot to have the maximum factor.		// Force units that overlap a lot to have the maximum factor.
if (distanceFactor <= entity_pos_t::Zero() \|\| offsetLength < combinedClearance / 2)		if (distanceFactor <= entity_pos_t::Zero() \|\| offsetLength < combinedClearance / 2)
distanceFactor = MAX_DISTANCE_FACTOR;		distanceFactor = MAX_DISTANCE_FACTOR;
else		else
distanceFactor = Clamp((maxDist - offsetLength) / distanceFactor, entity_pos_t::Zero(), MAX_DISTANCE_FACTOR);		distanceFactor = Clamp((maxDist - offsetLength) / distanceFactor, entity_pos_t::Zero(), MAX_DISTANCE_FACTOR);

// Mark both as needing an update so they actually get moved.		// Mark both as needing an update so they actually get moved.
a.second.needUpdate = true;		a.second.needUpdate = true;
b.second.needUpdate = true;		b.second.needUpdate = true;

		#if DEBUG_RENDER && DEBUG_RENDER_FOR_PERF
		// Make the lines thicker if the force is stronger.
		line.m_Thickness = distanceFactor.ToDouble() / 10.0;
		line.m_Color = CColor(1, 0, 0, 0.8);
		debugDataMotionMgr.m_Lines.push_back(line);
		#endif

CFixedVector2D pushingDir = offset.Multiply(distanceFactor);		CFixedVector2D pushingDir = offset.Multiply(distanceFactor);

// Divide by an arbitrary constant to avoid pushing too much.		// Divide by an arbitrary constant to avoid pushing too much.
a.second.push += pushingDir.Multiply(dt / PUSHING_REDUCTION_FACTOR);		a.second.push += pushingDir.Multiply(dt / PUSHING_REDUCTION_FACTOR);
b.second.push -= pushingDir.Multiply(dt / PUSHING_REDUCTION_FACTOR);		b.second.push -= pushingDir.Multiply(dt / PUSHING_REDUCTION_FACTOR);
}
		// Use a constant factor to get a more general slowdown in crowded area.
		// The distance factor heavily dampens units that are overlapping.
		int addedPressure = (entity_pos_t::FromInt(2) + distanceFactor * 3).Multiply(m_PushingPressureStrength).ToInt_RoundToZero();
		a.second.pushingPressure = std::min(255, a.second.pushingPressure + addedPressure);
		b.second.pushingPressure = std::min(255, b.second.pushingPressure + addedPressure);
		}

		#if DEBUG_RENDER
		void RenderDebugOverlay(SceneCollector& collector, const CFrustum& frustum, bool UNUSED(culling))
		{
		for (SOverlaySphere& sph: debugDataMotionMgr.m_Spheres)
		if (frustum.IsSphereVisible(sph.m_Center, sph.m_Radius))
		collector.Submit(&sph);
		for (SOverlayLine& l: debugDataMotionMgr.m_Lines)
		if (frustum.IsPointVisible(l.m_Coords[0]) \|\| frustum.IsPointVisible(l.m_Coords[1]))
		collector.Submit(&l);
		for (SOverlayQuad& quad: debugDataMotionMgr.m_Quads)
		collector.Submit(&quad);
		}
		#endif

		#undef DEBUG_STATS
		#undef DEBUG_RENDER
		#undef DEBUG_RENDER_FOR_PERF