mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-12 12:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow giving different weights to different templates when pushing.

Browse Source 
This makes it possible to make units heavier, which both push more & get
pushed less by other units.
In particular, the diff does it for siege units & elephants.

This improves movement for these units in crowd situation, since they
will now basically not move when other regular units push into them.

Supported By: asterix, marder
Refs #6127

Differential Revision: https://code.wildfiregames.com/D4452
This was SVN commit r26275.
This commit is contained in:
wraitii
2022-01-30 14:22:27 +00:00
parent 4df03ed2d2
commit 0e403632cf
13 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/components/CCmpUnitMotion_System.cpp
+17 -3
View File
@@ -69,6 +69,12 @@ constexpr int PUSHING_REDUCTION_FACTOR = 2;
*/
constexpr entity_pos_t MAX_DISTANCE_FACTOR = entity_pos_t::FromFraction(5, 2);
/**
* Maximum pushing multiplier for a single push calculation.
* This exists for numerical stability of the system between a lightweight and a heavy unit.
*/
constexpr int MAX_PUSHING_MULTIPLIER = 4;
/**
* When two units collide, if their movement dot product is below this value, give them a perpendicular nudge instead of trying to push in the regular way.
*/
@@ -745,9 +751,17 @@ void CCmpUnitMotionManager::Push(EntityMap<MotionState>::value_type& a, EntityMa
CFixedVector2D pushingDir = offset.Multiply(distanceFactor);
// Divide by an arbitrary constant to avoid pushing too much.
a.second.push += pushingDir.Multiply(dt / PUSHING_REDUCTION_FACTOR);
b.second.push -= pushingDir.Multiply(dt / PUSHING_REDUCTION_FACTOR);
// These cannot be zero, checked in the schema.
entity_pos_t aWeight = a.second.cmpUnitMotion->GetWeight();
entity_pos_t bWeight = b.second.cmpUnitMotion->GetWeight();
// Final corrections:
// - divide by an arbitrary constant to avoid pushing too much.
// - multiply by the weight ratio (limiting the maximum positive push for numerical accuracy).
entity_pos_t timeFactor = dt / PUSHING_REDUCTION_FACTOR;
entity_pos_t maxPushing = timeFactor * MAX_PUSHING_MULTIPLIER;
a.second.push += pushingDir.Multiply(std::min(bWeight.MulDiv(timeFactor, aWeight), maxPushing));
b.second.push -= pushingDir.Multiply(std::min(aWeight.MulDiv(timeFactor, bWeight), maxPushing));
// Use a constant factor to get a more general slowdown in crowded area.
// The distance factor heavily dampens units that are overlapping.