mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-28 02:24:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increase pushing range by 60%

Browse Source 
Reduces the 'clumpiness' of units, particularly when ordered to move to
a single point. The minimum pushing force was increased to compensate.

Differential Revision: https://code.wildfiregames.com/D3978
This was SVN commit r25479.
This commit is contained in:
wraitii
2021-05-21 07:23:47 +00:00
parent 37c8e9caa8
commit b6f2dee43b
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/components/CCmpUnitMotion_System.cpp
+16 -5
View File
@@ -41,10 +41,23 @@ namespace {
/**
* Pushing is ignored if the combined push force has lower magnitude than this.
*/
static const entity_pos_t MINIMAL_PUSHING = entity_pos_t::FromInt(1)/10;
static const entity_pos_t MINIMAL_PUSHING = entity_pos_t::FromInt(3) / 10;
/**
* When moving, units extert a pushing influence at a greater distance.
* For pushing, treat the clearances as a circle - they're defined as squares,
* 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.
*/
static const entity_pos_t PUSHING_CORRECTION = entity_pos_t::FromInt(5) / 7;
/**
* The maximum distance at which units exert a pushing influence on each other, as a multiple of clearance.
* (This is multiplied by PUSHING_CORRECTION for convenience).
*/
static const entity_pos_t PUSHING_RADIUS = (entity_pos_t::FromInt(8) / 5).Multiply(PUSHING_CORRECTION);
/**
* When moving, units exert a pushing influence at a greater distance.
*/
static const entity_pos_t PUSHING_MOVING_INFLUENCE_EXTENSION = entity_pos_t::FromInt(1);
@@ -229,9 +242,7 @@ void CCmpUnitMotionManager::Push(EntityMap<MotionState>::value_type& a, EntityMa
if (movingPush == 1)
return;
// Treat the clearances as a circle - they're defined as squares, so we'll slightly overcompensate the diagonal
// (they're also full-width instead of half, so we want to divide by two. sqrt(2)/2 is about 0.71 < 5/7).
entity_pos_t combinedClearance = (a.second.cmpUnitMotion->m_Clearance + b.second.cmpUnitMotion->m_Clearance) * 5 / 7;
entity_pos_t combinedClearance = (a.second.cmpUnitMotion->m_Clearance + b.second.cmpUnitMotion->m_Clearance).Multiply(PUSHING_RADIUS);
entity_pos_t maxDist = combinedClearance;
if (movingPush)
maxDist += PUSHING_MOVING_INFLUENCE_EXTENSION;