dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 13:23:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
0ad/source/simulation2/components/ICmpUnitMotion.cpp

160 lines
5 KiB
C++
Raw Normal View History

Use UnitMotion to predict target position in Attack.js to prevent 'dancing' Attack.js can use UnitMotion to calculate the position of the unit in the future, accounting for odd movements such as zigzags, turnarouds and early stops (to the extent of the current order). This improves the resilience of units against the 'dancing' trick. The linear interpolation is kept as a failsafe and to avoid an edge case in the new prediction code. Patch by: bb Refs #5106 Differential Revision: https://code.wildfiregames.com/D3225 This was SVN commit r24701.
2021-01-19 07:59:03 -08:00
/* Copyright (C) 2021 Wildfire Games.
# Rewrite of the game's simulation system Giant merge from http://svn.wildfiregames.com/hg-source/file/5fb522019d5e Infrastructure is largely complete, gameplay is largely missing Disabled by default; use command-line flag "-sim2" (Second attempt at commit...) This was SVN commit r7259.
2010-01-09 11:20:14 -08:00
* This file is part of 0 A.D.
*
* 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
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* 0 A.D. is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
#include "precompiled.h"
#include "ICmpUnitMotion.h"
#include "simulation2/system/InterfaceScripted.h"
# Add experimental fighter planes. This was SVN commit r9605.
2011-06-09 12:44:40 -07:00
#include "simulation2/scripting/ScriptComponent.h"
# Rewrite of the game's simulation system Giant merge from http://svn.wildfiregames.com/hg-source/file/5fb522019d5e Infrastructure is largely complete, gameplay is largely missing Disabled by default; use command-line flag "-sim2" (Second attempt at commit...) This was SVN commit r7259.
2010-01-09 11:20:14 -08:00
BEGIN_INTERFACE_WRAPPER(UnitMotion)
Migrate DEFINE_INTERFACE_METHOD_* to the ScriptFunction wrappers. The main benefits are more convenient code in the component interfaces TU and no limit on the # of arguments that can be passed. Differential Revision: https://code.wildfiregames.com/D3910 This was SVN commit r25350.
2021-05-01 01:01:30 -07:00
DEFINE_INTERFACE_METHOD("MoveToPointRange", ICmpUnitMotion, MoveToPointRange)
DEFINE_INTERFACE_METHOD("MoveToTargetRange", ICmpUnitMotion, MoveToTargetRange)
DEFINE_INTERFACE_METHOD("MoveToFormationOffset", ICmpUnitMotion, MoveToFormationOffset)
Further Pushing tweaks: more customisable, longer ranges. This overall decreases the deathball effect from units walking to each other a bit. - Fix formations - this cleans up a UnitMotion hack for formations, making it possible to increase pushing ranges without breaking closely knit formations like testudo. - Make MINIMAL_PUSHING and the MOVE_EXTENSION configurable, and add a STATIC_EXTENSION as well. - Increase the pushing range significantly, making units sparser. Differential Revision: https://code.wildfiregames.com/D4098 This was SVN commit r25708.
2021-06-06 08:25:52 -07:00
DEFINE_INTERFACE_METHOD("SetMemberOfFormation", ICmpUnitMotion, SetMemberOfFormation)
Migrate DEFINE_INTERFACE_METHOD_* to the ScriptFunction wrappers. The main benefits are more convenient code in the component interfaces TU and no limit on the # of arguments that can be passed. Differential Revision: https://code.wildfiregames.com/D3910 This was SVN commit r25350.
2021-05-01 01:01:30 -07:00
DEFINE_INTERFACE_METHOD("IsTargetRangeReachable", ICmpUnitMotion, IsTargetRangeReachable)
DEFINE_INTERFACE_METHOD("FaceTowardsPoint", ICmpUnitMotion, FaceTowardsPoint)
DEFINE_INTERFACE_METHOD("StopMoving", ICmpUnitMotion, StopMoving)
DEFINE_INTERFACE_METHOD("GetCurrentSpeed", ICmpUnitMotion, GetCurrentSpeed)
DEFINE_INTERFACE_METHOD("IsMoveRequested", ICmpUnitMotion, IsMoveRequested)
DEFINE_INTERFACE_METHOD("GetSpeed", ICmpUnitMotion, GetSpeed)
DEFINE_INTERFACE_METHOD("GetWalkSpeed", ICmpUnitMotion, GetWalkSpeed)
DEFINE_INTERFACE_METHOD("GetRunMultiplier", ICmpUnitMotion, GetRunMultiplier)
DEFINE_INTERFACE_METHOD("EstimateFuturePosition", ICmpUnitMotion, EstimateFuturePosition)
DEFINE_INTERFACE_METHOD("SetSpeedMultiplier", ICmpUnitMotion, SetSpeedMultiplier)
DEFINE_INTERFACE_METHOD("GetPassabilityClassName", ICmpUnitMotion, GetPassabilityClassName)
DEFINE_INTERFACE_METHOD("GetUnitClearance", ICmpUnitMotion, GetUnitClearance)
DEFINE_INTERFACE_METHOD("SetFacePointAfterMove", ICmpUnitMotion, SetFacePointAfterMove)
DEFINE_INTERFACE_METHOD("GetFacePointAfterMove", ICmpUnitMotion, GetFacePointAfterMove)
DEFINE_INTERFACE_METHOD("SetDebugOverlay", ICmpUnitMotion, SetDebugOverlay)
# Rewrite of the game's simulation system Giant merge from http://svn.wildfiregames.com/hg-source/file/5fb522019d5e Infrastructure is largely complete, gameplay is largely missing Disabled by default; use command-line flag "-sim2" (Second attempt at commit...) This was SVN commit r7259.
2010-01-09 11:20:14 -08:00
END_INTERFACE_WRAPPER(UnitMotion)
# Add experimental fighter planes. This was SVN commit r9605.
2011-06-09 12:44:40 -07:00
class CCmpUnitMotionScripted : public ICmpUnitMotion
{
public:
DEFAULT_SCRIPT_WRAPPER(UnitMotionScripted)
virtual bool MoveToPointRange(entity_pos_t x, entity_pos_t z, entity_pos_t minRange, entity_pos_t maxRange)
{
return m_Script.Call<bool>("MoveToPointRange", x, z, minRange, maxRange);
}
virtual bool MoveToTargetRange(entity_id_t target, entity_pos_t minRange, entity_pos_t maxRange)
{
return m_Script.Call<bool>("MoveToTargetRange", target, minRange, maxRange);
}
virtual void MoveToFormationOffset(entity_id_t target, entity_pos_t x, entity_pos_t z)
{
m_Script.CallVoid("MoveToFormationOffset", target, x, z);
}
Further Pushing tweaks: more customisable, longer ranges. This overall decreases the deathball effect from units walking to each other a bit. - Fix formations - this cleans up a UnitMotion hack for formations, making it possible to increase pushing ranges without breaking closely knit formations like testudo. - Make MINIMAL_PUSHING and the MOVE_EXTENSION configurable, and add a STATIC_EXTENSION as well. - Increase the pushing range significantly, making units sparser. Differential Revision: https://code.wildfiregames.com/D4098 This was SVN commit r25708.
2021-06-06 08:25:52 -07:00
virtual void SetMemberOfFormation(entity_id_t controller)
{
m_Script.CallVoid("SetMemberOfFormation", controller);
}
Improve ship pickup. Improve unitAI: don't move if the requester can reach us and we are close enough. This avoids an issue where ships moved more than necessary when picking up many units. Also improve requester UnitAI -> retry pickup if the target entity is Idle. Improve unitMotion: periodically recompute paths in "known bad path" mode to adapt to moving targets. Expose UnitMotion reachability to scripts and other code. This adds a test map for some common and some tricky pickup cases, using triggers. Based on a patch by: causative Reviewed By: Freagarach Fixes #3472 Differential Revision: https://code.wildfiregames.com/D665 This was SVN commit r23925.
2020-08-03 05:02:24 -07:00
virtual bool IsTargetRangeReachable(entity_id_t target, entity_pos_t minRange, entity_pos_t maxRange)
{
return m_Script.Call<bool>("IsTargetRangeReachable", target, minRange, maxRange);
}
# Add experimental fighter planes. This was SVN commit r9605.
2011-06-09 12:44:40 -07:00
virtual void FaceTowardsPoint(entity_pos_t x, entity_pos_t z)
{
m_Script.CallVoid("FaceTowardsPoint", x, z);
}
virtual void StopMoving()
{
m_Script.CallVoid("StopMoving");
}
Add support for const methods in components and make those that can be const const. Reviewed By: Itms Differential Revision: https://code.wildfiregames.com/D75 This was SVN commit r19156.
2017-01-19 18:25:19 -08:00
virtual fixed GetCurrentSpeed() const
Add animation override to VisualActor to fix carrying resource animations. Patch by Deiz. Fixes #1260, #1741. This was SVN commit r12949.
2012-12-06 11:46:13 -08:00
{
return m_Script.Call<fixed>("GetCurrentSpeed");
}
UnitMotion cleanup - remove dead code, add a common path for MoveTo functions, rename BeginPathing, move functions around for better readability. BeginPathing renamed to ComputePathToGoal, as that is what this function does. IsMoving renamed to IsMoveRequested, as the function returns true when the unit has a move request going on, not when it is actually moving across the map, which was misleading. UpdateMovementState's implementation moved closer to where it is used. PathIsShort and WAYPOINT_ADVANCE_MAX are currently unused, thus deleted. Differential Revision: https://code.wildfiregames.com/D2067 This was SVN commit r22568.
2019-07-28 03:51:12 -07:00
virtual bool IsMoveRequested() const
Fixed formations so switching formation in-place doesn't leave entities in FORMATIONMEMBER.WALKING and short walk orders bring units into proper formation. This was SVN commit r12563.
2012-08-31 01:20:36 -07:00
{
UnitMotion cleanup - remove dead code, add a common path for MoveTo functions, rename BeginPathing, move functions around for better readability. BeginPathing renamed to ComputePathToGoal, as that is what this function does. IsMoving renamed to IsMoveRequested, as the function returns true when the unit has a move request going on, not when it is actually moving across the map, which was misleading. UpdateMovementState's implementation moved closer to where it is used. PathIsShort and WAYPOINT_ADVANCE_MAX are currently unused, thus deleted. Differential Revision: https://code.wildfiregames.com/D2067 This was SVN commit r22568.
2019-07-28 03:51:12 -07:00
return m_Script.Call<bool>("IsMoveRequested");
Fixed formations so switching formation in-place doesn't leave entities in FORMATIONMEMBER.WALKING and short walk orders bring units into proper formation. This was SVN commit r12563.
2012-08-31 01:20:36 -07:00
}
Change Run Speed into a Run multiplier. This changes running speed into a running multiplier (of walk speed). The advantage is that it simplifies code since you can setup a default run multiplier at the template level and it'll work for all subsequent templates, and technologies cannot forget to change it. It makes specialised unit templates easier to maintain, too. Formations have a 100 run multiplier which effectively sets their maximal walking speed at 100 Reviewed By: bb, O2 JS Simulation Differential Revision: https://code.wildfiregames.com/D438 This was SVN commit r22197.
2019-04-19 03:04:50 -07:00
virtual fixed GetSpeed() const
# Add experimental fighter planes. This was SVN commit r9605.
2011-06-09 12:44:40 -07:00
{
Change Run Speed into a Run multiplier. This changes running speed into a running multiplier (of walk speed). The advantage is that it simplifies code since you can setup a default run multiplier at the template level and it'll work for all subsequent templates, and technologies cannot forget to change it. It makes specialised unit templates easier to maintain, too. Formations have a 100 run multiplier which effectively sets their maximal walking speed at 100 Reviewed By: bb, O2 JS Simulation Differential Revision: https://code.wildfiregames.com/D438 This was SVN commit r22197.
2019-04-19 03:04:50 -07:00
return m_Script.Call<fixed>("GetSpeed");
# Add experimental fighter planes. This was SVN commit r9605.
2011-06-09 12:44:40 -07:00
}
Change Run Speed into a Run multiplier. This changes running speed into a running multiplier (of walk speed). The advantage is that it simplifies code since you can setup a default run multiplier at the template level and it'll work for all subsequent templates, and technologies cannot forget to change it. It makes specialised unit templates easier to maintain, too. Formations have a 100 run multiplier which effectively sets their maximal walking speed at 100 Reviewed By: bb, O2 JS Simulation Differential Revision: https://code.wildfiregames.com/D438 This was SVN commit r22197.
2019-04-19 03:04:50 -07:00
virtual fixed GetWalkSpeed() const
# Add experimental fighter planes. This was SVN commit r9605.
2011-06-09 12:44:40 -07:00
{
Change Run Speed into a Run multiplier. This changes running speed into a running multiplier (of walk speed). The advantage is that it simplifies code since you can setup a default run multiplier at the template level and it'll work for all subsequent templates, and technologies cannot forget to change it. It makes specialised unit templates easier to maintain, too. Formations have a 100 run multiplier which effectively sets their maximal walking speed at 100 Reviewed By: bb, O2 JS Simulation Differential Revision: https://code.wildfiregames.com/D438 This was SVN commit r22197.
2019-04-19 03:04:50 -07:00
return m_Script.Call<fixed>("GetWalkSpeed");
# Add experimental fighter planes. This was SVN commit r9605.
2011-06-09 12:44:40 -07:00
}
UnitMotion - improve variable names and reuse a duplicated function (cleanup def47cb7ae) This: - cleans up a code duplication and clarifies the intent. - reorders things around for clarity - improves variable names. Commented By: elexis Differential Revision: https://code.wildfiregames.com/D1840 This was SVN commit r22277.
2019-05-13 09:47:51 -07:00
virtual fixed GetRunMultiplier() const
{
return m_Script.Call<fixed>("GetRunMultiplier");
}
virtual void SetSpeedMultiplier(fixed multiplier)
{
m_Script.CallVoid("SetSpeedMultiplier", multiplier);
}
virtual fixed GetSpeedMultiplier() const
{
return m_Script.Call<fixed>("GetSpeedMultiplier");
}
Fix missing const in f737831167 This was SVN commit r24707.
2021-01-19 10:59:46 -08:00
virtual CFixedVector2D EstimateFuturePosition(const fixed dt) const
Use UnitMotion to predict target position in Attack.js to prevent 'dancing' Attack.js can use UnitMotion to calculate the position of the unit in the future, accounting for odd movements such as zigzags, turnarouds and early stops (to the extent of the current order). This improves the resilience of units against the 'dancing' trick. The linear interpolation is kept as a failsafe and to avoid an edge case in the new prediction code. Patch by: bb Refs #5106 Differential Revision: https://code.wildfiregames.com/D3225 This was SVN commit r24701.
2021-01-19 07:59:03 -08:00
{
return m_Script.Call<CFixedVector2D>("EstimateFuturePosition", dt);
}
Fix #1833: animals spin around needlessly while roaming. Patch from mimo. This was SVN commit r13924.
2013-09-30 16:52:22 -07:00
virtual void SetFacePointAfterMove(bool facePointAfterMove)
{
m_Script.CallVoid("SetFacePointAfterMove", facePointAfterMove);
}
Set previous behaviour for SetFacePointAfterMove. Implement get method in cmpUnitMotion. Use it in UnitAI. This was SVN commit r23850.
2020-07-19 03:42:45 -07:00
virtual bool GetFacePointAfterMove() const
{
return m_Script.Call<bool>("GetFacePointAfterMove");
}
Add support for const methods in components and make those that can be const const. Reviewed By: Itms Differential Revision: https://code.wildfiregames.com/D75 This was SVN commit r19156.
2017-01-19 18:25:19 -08:00
virtual pass_class_t GetPassabilityClass() const
Implements building restrictions (by terrain, territory, category, and distance). See #41. Fixes #804, #287. Implements build limits. See #687. Implements autorotation for dock placement. Fixes unit spawning to consider terrain passability. See #893. Adds new passability criteria based on distance from shore. Updates build restrictions on some templates. Changes unit spawning search to 4 tiles away from foundation. Changes garrison/training spawn failure to nicer UI notification. This was SVN commit r9970.
2011-08-06 01:11:05 -07:00
{
New long-range pathfinder. Based on Philip's work located at http://git.wildfiregames.com/gitweb/?p=0ad.git;a=shortlog;h=refs/heads/projects/philip/pathfinder Includes code by wraitii, sanderd17 and kanetaka. An updated version of docs/pathfinder.pdf describing the changes in detail will be committed ASAP. Running update-workspaces is needed after this change. Fixes #1756. Fixes #930, #1259, #2908, #2960, #3097 Refs #1200, #1914, #1942, #2568, #2132, #2563 This was SVN commit r16751.
2015-06-12 11:58:24 -07:00
return m_Script.Call<pass_class_t>("GetPassabilityClass");
Implements building restrictions (by terrain, territory, category, and distance). See #41. Fixes #804, #287. Implements build limits. See #687. Implements autorotation for dock placement. Fixes unit spawning to consider terrain passability. See #893. Adds new passability criteria based on distance from shore. Updates build restrictions on some templates. Changes unit spawning search to 4 tiles away from foundation. Changes garrison/training spawn failure to nicer UI notification. This was SVN commit r9970.
2011-08-06 01:11:05 -07:00
}
Add support for const methods in components and make those that can be const const. Reviewed By: Itms Differential Revision: https://code.wildfiregames.com/D75 This was SVN commit r19156.
2017-01-19 18:25:19 -08:00
virtual std::string GetPassabilityClassName() const
Improve navigation for ship formations by setting the formation controller to the right passability class This was SVN commit r15149.
2014-05-18 00:59:43 -07:00
{
return m_Script.Call<std::string>("GetPassabilityClassName");
}
Add support for const methods in components and make those that can be const const. Reviewed By: Itms Differential Revision: https://code.wildfiregames.com/D75 This was SVN commit r19156.
2017-01-19 18:25:19 -08:00
virtual entity_pos_t GetUnitClearance() const
# Add experimental fighter planes. This was SVN commit r9605.
2011-06-09 12:44:40 -07:00
{
Use the terrain-only grid for terrain edges in the short pathfinder algorithm. This grid is updated on each terrain change, whereas the passability grid is updated once a turn. This caused OOS on rejoin, fixes #3292. However, using the terrain-only grid reveals one discrepancy between the short pathfinder (which uses unit radii) and the long one (which uses unit clearances). So I implemented the change proposed by sanderd17 in #3294, which is removing unit radius and using only the pathfinder clearance. Refs #3294 Now some tweaking has to be done in the templates, so that units get a passability class suited to their apparent size. In the meantime the unit motion is quite bugged. This was SVN commit r16867.
2015-07-18 01:37:49 -07:00
return m_Script.Call<entity_pos_t>("GetUnitClearance");
# Add experimental fighter planes. This was SVN commit r9605.
2011-06-09 12:44:40 -07:00
}
virtual void SetDebugOverlay(bool enabled)
{
m_Script.CallVoid("SetDebugOverlay", enabled);
}
};
REGISTER_COMPONENT_SCRIPT_WRAPPER(UnitMotionScripted)
Reference in a new issue Copy permalink