aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp2
-rw-r--r--src/server/game/Entities/Object/G3DPosition.hpp6
-rw-r--r--src/server/game/Garrison/Garrison.h1
-rw-r--r--src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp2
-rw-r--r--src/server/game/Movement/PathGenerator.cpp2
-rw-r--r--src/server/game/Movement/Spline/MoveSpline.cpp10
-rw-r--r--src/server/game/Movement/Spline/MoveSplineInit.h31
-rw-r--r--src/server/game/Movement/Spline/MoveSplineInitArgs.h4
-rw-r--r--src/server/game/Spells/Spell.cpp2
9 files changed, 28 insertions, 32 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 3102dac861e..6481325ec04 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -322,7 +322,7 @@ public:
}
dst = dst * pathRotation;
- dst += PositionToVector3(&_owner.GetStationaryPosition());
+ dst += PositionToVector3(_owner.GetStationaryPosition());
_owner.GetMap()->GameObjectRelocation(&_owner, dst.x, dst.y, dst.z, _owner.GetOrientation());
}
diff --git a/src/server/game/Entities/Object/G3DPosition.hpp b/src/server/game/Entities/Object/G3DPosition.hpp
index f83a900bcd9..9b1229c3ba0 100644
--- a/src/server/game/Entities/Object/G3DPosition.hpp
+++ b/src/server/game/Entities/Object/G3DPosition.hpp
@@ -20,10 +20,8 @@
#include "Position.h"
#include <G3D/Vector3.h>
-#include "Errors.h"
-inline G3D::Vector3 PositionToVector3(Position const& p) { return { p.m_positionX, p.m_positionY, p.m_positionZ }; }
-inline G3D::Vector3 PositionToVector3(Position const* p) { ASSERT(p); return { p->m_positionX, p->m_positionY, p->m_positionZ }; }
-inline Position Vector3ToPosition(G3D::Vector3 const& v) { return { v.x, v.y, v.z }; }
+inline constexpr auto PositionToVector3 = [](Position const& p) -> G3D::Vector3 { return { p.m_positionX, p.m_positionY, p.m_positionZ }; };
+inline constexpr auto Vector3ToPosition = [](G3D::Vector3 const& v) -> Position { return { v.x, v.y, v.z }; };
#endif
diff --git a/src/server/game/Garrison/Garrison.h b/src/server/game/Garrison/Garrison.h
index 0fe57fb1e11..65c08e5ab10 100644
--- a/src/server/game/Garrison/Garrison.h
+++ b/src/server/game/Garrison/Garrison.h
@@ -23,6 +23,7 @@
#include "GarrisonPackets.h"
#include "Optional.h"
#include "QuaternionData.h"
+#include "SharedDefines.h"
#include <unordered_map>
class GameObject;
diff --git a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp
index 5575c9f6e0c..a954da2a85f 100644
--- a/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp
@@ -205,7 +205,7 @@ bool ChaseMovementGenerator::Update(Unit* owner, uint32 diff)
}
if (shortenPath)
- _path->ShortenPathUntilDist(PositionToVector3(target), maxTarget);
+ _path->ShortenPathUntilDist(PositionToVector3(target->GetPosition()), maxTarget);
if (cOwner)
cOwner->SetCannotReachTarget(false);
diff --git a/src/server/game/Movement/PathGenerator.cpp b/src/server/game/Movement/PathGenerator.cpp
index 8f44c3fcc29..04c4505f101 100644
--- a/src/server/game/Movement/PathGenerator.cpp
+++ b/src/server/game/Movement/PathGenerator.cpp
@@ -31,7 +31,7 @@
PathGenerator::PathGenerator(WorldObject const* owner) :
_polyLength(0), _type(PATHFIND_BLANK), _useStraightPath(false),
_forceDestination(false), _pointPathLimit(MAX_POINT_PATH_LENGTH), _useRaycast(false),
- _startPosition(PositionToVector3(owner)), _endPosition(G3D::Vector3::zero()), _source(owner), _navMesh(nullptr),
+ _startPosition(PositionToVector3(owner->GetPosition())), _endPosition(G3D::Vector3::zero()), _source(owner), _navMesh(nullptr),
_navMeshQuery(nullptr)
{
memset(_pathPolyRefs, 0, sizeof(_pathPolyRefs));
diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp
index 39118263388..a317b018ed6 100644
--- a/src/server/game/Movement/Spline/MoveSpline.cpp
+++ b/src/server/game/Movement/Spline/MoveSpline.cpp
@@ -37,7 +37,7 @@ Location MoveSpline::computePosition(int32 time_point, int32 point_index) const
c.orientation = initialOrientation;
spline.evaluate_percent(point_index, u, c);
- if (splineflags.Animation)
+ if (anim_tier)
;// MoveSplineFlag::Animation disables falling or parabolic movement
else if (splineflags.Parabolic)
computeParabolicElevation(time_point, c.z);
@@ -214,10 +214,10 @@ void MoveSpline::Initialize(MoveSplineInitArgs const& args)
// init parabolic / animation
// spline initialized, duration known and i able to compute parabolic acceleration
- if (args.flags.HasFlag(MoveSplineFlagEnum::Parabolic | MoveSplineFlagEnum::Animation | MoveSplineFlagEnum::FadeObject))
+ if (args.flags.HasFlag(MoveSplineFlagEnum::Parabolic | MoveSplineFlagEnum::FadeObject) || args.animTier)
{
int32 spline_duration = Duration();
- effect_start_time = spline_duration * args.effect_start_time_percent + args.effect_start_time.count();
+ effect_start_time = spline.length(spline.first() + args.effect_start_point);
if (effect_start_time > spline_duration)
effect_start_time = spline_duration;
@@ -255,7 +255,7 @@ bool MoveSplineInitArgs::Validate(Unit const* unit)
CHECK(path.size() > 1, unit->GetDebugInfo());
CHECK(velocity >= 0.01f, unit->GetDebugInfo());
- CHECK(effect_start_time_percent >= 0.f && effect_start_time_percent <= 1.f, unit->GetDebugInfo());
+ CHECK(effect_start_point < std::ssize(path), unit->GetDebugInfo());
CHECK(_checkPathLengths(), unit->GetGUID().ToString());
if (spellEffectExtra)
{
@@ -295,7 +295,7 @@ bool MoveSplineInitArgs::_checkPathLengths()
}
MoveSplineInitArgs::MoveSplineInitArgs() : path_Idx_offset(0), velocity(0.f),
-parabolic_amplitude(0.f), vertical_acceleration(0.0f), effect_start_time_percent(0.f), effect_start_time(0ms),
+parabolic_amplitude(0.f), vertical_acceleration(0.0f), effect_start_point(0),
splineId(0), initialOrientation(0.f),
walk(false), HasVelocity(false), TransformForTransport(true)
{
diff --git a/src/server/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h
index 5035bb38fb1..2461fc1b5d3 100644
--- a/src/server/game/Movement/Spline/MoveSplineInit.h
+++ b/src/server/game/Movement/Spline/MoveSplineInit.h
@@ -52,22 +52,22 @@ namespace Movement
*/
void Stop();
- /* Adds movement by parabolic trajectory
- * @param amplitude - the maximum height of parabola, value could be negative and positive
- * @param start_time - delay between movement starting time and beginning to move by parabolic trajectory
+ /** Adds movement by parabolic trajectory
+ * @param amplitude the maximum height of parabola, value could be negative and positive
+ * @param start_point point index on the path where parabolic movement starts
* can't be combined with final animation
*/
- void SetParabolic(float amplitude, float start_time);
- /* Adds movement by parabolic trajectory
- * @param vertical_acceleration - vertical acceleration
- * @param start_time - delay between movement starting time and beginning to move by parabolic trajectory
+ void SetParabolic(float amplitude, int32 start_point);
+ /** Adds movement by parabolic trajectory
+ * @param vertical_acceleration vertical acceleration
+ * @param start_point point index on the path where parabolic movement starts
* can't be combined with final animation
*/
- void SetParabolicVerticalAcceleration(float vertical_acceleration, float start_time);
+ void SetParabolicVerticalAcceleration(float vertical_acceleration, int32 start_point);
/* Plays animation after movement done
* can't be combined with parabolic movement
*/
- void SetAnimation(AnimTier anim, uint32 tierTransitionId = 0, Milliseconds transitionStartTime = 0ms);
+ void SetAnimation(AnimTier anim, uint32 tierTransitionId = 0, int32 transitionStartPoint = 0);
/* Adds final facing animation
* sets unit's facing to specified point/angle after all path done
@@ -184,26 +184,25 @@ namespace Movement
inline void MoveSplineInit::SetSteering() { args.flags.Steering = true; }
inline void MoveSplineInit::SetUnlimitedSpeed() { args.flags.UnlimitedSpeed = true; }
- inline void MoveSplineInit::SetParabolic(float amplitude, float start_time)
+ inline void MoveSplineInit::SetParabolic(float amplitude, int32 start_point)
{
- args.effect_start_time_percent = start_time;
+ args.effect_start_point = start_point;
args.parabolic_amplitude = amplitude;
args.vertical_acceleration = 0.0f;
args.flags.Parabolic = true;
}
- inline void MoveSplineInit::SetParabolicVerticalAcceleration(float vertical_acceleration, float start_time)
+ inline void MoveSplineInit::SetParabolicVerticalAcceleration(float vertical_acceleration, int32 start_point)
{
- args.effect_start_time_percent = start_time;
+ args.effect_start_point = start_point;
args.parabolic_amplitude = 0.0f;
args.vertical_acceleration = vertical_acceleration;
args.flags.Parabolic = true;
}
- inline void MoveSplineInit::SetAnimation(AnimTier anim, uint32 tierTransitionId /*= 0*/, Milliseconds transitionStartTime /*= 0ms*/)
+ inline void MoveSplineInit::SetAnimation(AnimTier anim, uint32 tierTransitionId /*= 0*/, int32 transitionStartPoint /*= 0*/)
{
- args.effect_start_time_percent = 0.f;
- args.effect_start_time = transitionStartTime;
+ args.effect_start_point = transitionStartPoint;
args.animTier.emplace();
args.animTier->TierTransitionId = tierTransitionId;
args.animTier->AnimTier = anim;
diff --git a/src/server/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h
index 46cd0779e21..724ae2ccee7 100644
--- a/src/server/game/Movement/Spline/MoveSplineInitArgs.h
+++ b/src/server/game/Movement/Spline/MoveSplineInitArgs.h
@@ -18,7 +18,6 @@
#ifndef TRINITYSERVER_MOVESPLINEINIT_ARGS_H
#define TRINITYSERVER_MOVESPLINEINIT_ARGS_H
-#include "Duration.h"
#include "MoveSplineFlag.h"
#include "MovementTypedefs.h"
#include "ObjectGuid.h"
@@ -80,8 +79,7 @@ namespace Movement
float velocity;
float parabolic_amplitude;
float vertical_acceleration;
- float effect_start_time_percent; // fraction of total spline duration
- Milliseconds effect_start_time; // absolute value
+ int32 effect_start_point;
uint32 splineId;
float initialOrientation;
Optional<SpellEffectExtraData> spellEffectExtra;
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 3904b81a472..50db01b3fec 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -6393,7 +6393,7 @@ SpellCastResult Spell::CheckCast(bool strict, int32* param1 /*= nullptr*/, int32
else if (m_preGeneratedPath->IsInvalidDestinationZ(target)) // Check position z, if not in a straight line
return SPELL_FAILED_NOPATH;
- m_preGeneratedPath->ShortenPathUntilDist(PositionToVector3(target), objSize); // move back
+ m_preGeneratedPath->ShortenPathUntilDist(PositionToVector3(target->GetPosition()), objSize); // move back
}
break;
}