araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 03:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/Position: Change Position<->G3D::Vector3 conversion functions to be lambdas

Browse Source
This commit is contained in:
Shauren
2025-11-09 21:30:32 +01:00
parent 7172c9b615
commit 7c5edfcdda
8 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/GameObject/GameObject.cpp
View File

@@ -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());
}

6
src/server/game/Entities/Object/G3DPosition.hpp
View File

@@ -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

2
src/server/game/Movement/MovementGenerators/ChaseMovementGenerator.cpp
View File

@@ -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);

2
src/server/game/Movement/PathGenerator.cpp
View File

@@ -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));

2
src/server/game/Spells/Spell.cpp
View File

@@ -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;
}

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
View File

@@ -330,7 +330,7 @@ struct boss_razorscale : public BossAI
std::function<void(Movement::MoveSplineInit&)> initializer = [](Movement::MoveSplineInit& init)
{
Movement::PointsArray path(std::size(RazorscalePath));
std::transform(std::begin(RazorscalePath), std::end(RazorscalePath), path.begin(), [](Position pos) { return PositionToVector3(pos); });
std::ranges::transform(RazorscalePath, path.begin(), PositionToVector3);
init.MovebyPath(path, 0);
init.SetCyclic();
init.SetFly();

2
src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp
View File

@@ -2999,7 +2999,7 @@ struct at_anduin_wrynn_empowered_wicked_star : public at_anduin_wrynn_wicked_sta
at->MovePositionToFirstCollision(destPos, 100.0f, angle);
std::vector<G3D::Vector3> splinePoints;
splinePoints.push_back(PositionToVector3(at));
splinePoints.push_back(PositionToVector3(at->GetPosition()));
splinePoints.push_back(PositionToVector3(destPos));
at->InitSplines(splinePoints);

4
src/server/scripts/Spells/spell_priest.cpp
View File

@@ -1130,8 +1130,8 @@ struct areatrigger_pri_divine_star : AreaTriggerAI
Movement::PointsArray returnSplinePoints;
returnSplinePoints.push_back(PositionToVector3(at));
returnSplinePoints.push_back(PositionToVector3(caster));
returnSplinePoints.push_back(PositionToVector3(at->GetPosition()));
returnSplinePoints.push_back(PositionToVector3(caster->GetPosition()));
at->InitSplines(returnSplinePoints);