From bc89e1cdb0da10e53cc9fa4a97565c05bb4c052e Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 1 Apr 2018 13:52:36 +0200 Subject: Core/Position: Refactor GetAngle -> GetAbsoluteAngle because code clarity is good. (cherry picked from commit 4692e10ca2ffed5ba2a0336e9c93962b0fad9eaa) --- src/server/game/AI/CreatureAI.cpp | 2 +- src/server/game/AI/PlayerAI/PlayerAI.cpp | 2 +- src/server/game/Entities/AreaTrigger/AreaTrigger.cpp | 2 +- src/server/game/Entities/Object/Object.cpp | 6 +++--- src/server/game/Entities/Object/Position.cpp | 13 +++++-------- src/server/game/Entities/Object/Position.h | 20 ++++++++++---------- src/server/game/Entities/Player/CinematicMgr.cpp | 2 +- src/server/game/Entities/Unit/Unit.cpp | 19 +++---------------- src/server/game/Entities/Unit/Unit.h | 1 - src/server/game/Movement/MotionMaster.cpp | 6 +++--- .../MovementGenerators/FleeingMovementGenerator.cpp | 2 +- .../MovementGenerators/TargetedMovementGenerator.cpp | 2 +- src/server/game/Movement/Spline/MoveSplineInit.cpp | 2 +- src/server/game/Spells/Spell.cpp | 12 ++++++------ src/server/game/Spells/Spell.h | 3 +-- src/server/game/Spells/SpellEffects.cpp | 4 ++-- 16 files changed, 40 insertions(+), 58 deletions(-) (limited to 'src/server/game') diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 4ef70b18529..e41d104c380 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -162,7 +162,7 @@ void CreatureAI::TriggerAlert(Unit const* who) const // Face the unit (stealthed player) and set distracted state for 5 seconds me->GetMotionMaster()->MoveDistract(5 * IN_MILLISECONDS); me->StopMoving(); - me->SetFacingTo(me->GetAngle(who)); + me->SetFacingTo(me->GetAbsoluteAngle(who)); } void CreatureAI::EnterEvadeMode(EvadeReason why) diff --git a/src/server/game/AI/PlayerAI/PlayerAI.cpp b/src/server/game/AI/PlayerAI/PlayerAI.cpp index edd59878942..fb359ea6cb2 100644 --- a/src/server/game/AI/PlayerAI/PlayerAI.cpp +++ b/src/server/game/AI/PlayerAI/PlayerAI.cpp @@ -1278,7 +1278,7 @@ void SimpleCharmedPlayerAI::UpdateAI(const uint32 diff) if (me->IsStopped() && !me->HasUnitState(UNIT_STATE_CANNOT_TURN)) { - float targetAngle = me->GetAngle(target); + float targetAngle = me->GetAbsoluteAngle(target); if (_forceFacing || fabs(me->GetOrientation() - targetAngle) > 0.4f) { me->SetFacingTo(targetAngle); diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp index 195837c8ebb..7e22c4d3a58 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp +++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp @@ -910,7 +910,7 @@ void AreaTrigger::UpdateSplinePosition(uint32 diff) if (GetTemplate() && GetTemplate()->HasFlag(AREATRIGGER_FLAG_HAS_FACE_MOVEMENT_DIR)) { G3D::Vector3 const& nextPoint = _spline->getPoint(lastPositionIndex + 1); - orientation = GetAngle(nextPoint.x, nextPoint.y); + orientation = GetAbsoluteAngle(nextPoint.x, nextPoint.y); } GetMap()->AreaTriggerRelocation(this, currentPosition.x, currentPosition.y, currentPosition.z, orientation); diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 85a925a5dc3..aec9708e403 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1102,7 +1102,7 @@ Position WorldObject::GetHitSpherePointFor(Position const& dest) const G3D::Vector3 vObj(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ()); G3D::Vector3 contactPoint = vThis + (vObj - vThis).directionOrZero() * std::min(dest.GetExactDist(GetPosition()), GetCombatReach()); - return Position(contactPoint.x, contactPoint.y, contactPoint.z, GetAngle(contactPoint.x, contactPoint.y)); + return Position(contactPoint.x, contactPoint.y, contactPoint.z, GetAbsoluteAngle(contactPoint.x, contactPoint.y)); } bool WorldObject::IsWithinLOS(float ox, float oy, float oz, LineOfSightChecks checks, VMAP::ModelIgnoreFlags ignoreFlags) const @@ -1259,7 +1259,7 @@ bool WorldObject::IsInBetween(Position const& pos1, Position const& pos2, float if (!size) size = GetCombatReach() / 2; - float angle = pos1.GetAngle(pos2); + float angle = pos1.GetAbsoluteAngle(pos2); // not using sqrt() for performance return (size * size) >= GetExactDist2dSq(pos1.GetPositionX() + std::cos(angle) * dist, pos1.GetPositionY() + std::sin(angle) * dist); @@ -3047,7 +3047,7 @@ Position WorldObject::GetRandomNearPosition(float radius) void WorldObject::GetContactPoint(WorldObject const* obj, float& x, float& y, float& z, float distance2d /*= CONTACT_DISTANCE*/) const { // angle to face `obj` to `this` using distance includes size of `obj` - GetNearPoint(obj, x, y, z, obj->GetCombatReach(), distance2d, GetAngle(obj)); + GetNearPoint(obj, x, y, z, obj->GetCombatReach(), distance2d, GetAbsoluteAngle(obj)); } void WorldObject::MovePosition(Position &pos, float dist, float angle) diff --git a/src/server/game/Entities/Object/Position.cpp b/src/server/game/Entities/Object/Position.cpp index af6e3d035e1..3e469434dff 100644 --- a/src/server/game/Entities/Object/Position.cpp +++ b/src/server/game/Entities/Object/Position.cpp @@ -115,7 +115,7 @@ bool Position::IsWithinDoubleVerticalCylinder(Position const* center, float radi return IsInDist2d(center, radius) && std::abs(verticalDelta) <= height; } -bool Position::HasInArc(float arc, Position const* obj, float border, Optional orientation) const +bool Position::HasInArc(float arc, Position const* obj, float border) const { // always have self in arc if (obj == this) @@ -124,11 +124,8 @@ bool Position::HasInArc(float arc, Position const* obj, float border, Optional float(M_PI)) angle -= 2.0f * float(M_PI); @@ -137,13 +134,13 @@ bool Position::HasInArc(float arc, Position const* obj, float border, Optional= lborder) && (angle <= rborder)); } -bool Position::HasInLine(Position const* pos, float objSize, float width, Optional orientation) const +bool Position::HasInLine(Position const* pos, float objSize, float width) const { - if (!HasInArc(float(M_PI), pos, 2.0f, orientation)) + if (!HasInArc(float(M_PI), pos, 2.0f)) return false; width += objSize; - float angle = GetAngle(pos) - (orientation.is_initialized() ? *orientation : GetOrientation()); + float angle = GetRelativeAngle(pos); return std::fabs(std::sin(angle)) * GetExactDist2d(pos->GetPositionX(), pos->GetPositionY()) < width; } diff --git a/src/server/game/Entities/Object/Position.h b/src/server/game/Entities/Object/Position.h index 6940da13885..271f19e563f 100644 --- a/src/server/game/Entities/Object/Position.h +++ b/src/server/game/Entities/Object/Position.h @@ -19,7 +19,6 @@ #define Trinity_game_Position_h__ #include "Define.h" -#include "Optional.h" #include #include @@ -124,19 +123,20 @@ public: void GetPositionOffsetTo(Position const & endPos, Position & retOffset) const; Position GetPositionWithOffset(Position const& offset) const; - float GetAngle(float x, float y) const + float GetAbsoluteAngle(float x, float y) const { float dx = m_positionX - x; float dy = m_positionY - y; return NormalizeOrientation(std::atan2(dy, dx)); } - float GetAngle(Position const& pos) const { return GetAngle(pos.m_positionX, pos.m_positionY); } - float GetAngle(Position const* pos) const { return GetAngle(*pos); } + float GetAbsoluteAngle(Position const& pos) const { return GetAbsoluteAngle(pos.m_positionX, pos.m_positionY); } + float GetAbsoluteAngle(Position const* pos) const { return GetAbsoluteAngle(*pos); } + float ToAbsoluteAngle(float relAngle) const { return NormalizeOrientation(relAngle + m_orientation); } - float GetAbsoluteAngle(float relAngle) const { return NormalizeOrientation(relAngle + m_orientation); } - float GetRelativeAngle(float absAngle) const { return NormalizeOrientation(absAngle - m_orientation); } - float GetRelativeAngle(float x, float y) const { return GetRelativeAngle(GetAngle(x, y)); } - float GetRelativeAngle(Position const* pos) const { return GetRelativeAngle(GetAngle(pos)); } + float ToRelativeAngle(float absAngle) const { return NormalizeOrientation(absAngle - m_orientation); } + float GetRelativeAngle(float x, float y) const { return ToRelativeAngle(GetAbsoluteAngle(x, y)); } + float GetRelativeAngle(Position const& pos) const { return ToRelativeAngle(GetAbsoluteAngle(pos)); } + float GetRelativeAngle(Position const* pos) const { return ToRelativeAngle(GetAbsoluteAngle(pos)); } void GetSinCos(float x, float y, float &vsin, float &vcos) const; @@ -152,8 +152,8 @@ public: // dist2d < radius && abs(dz) < height bool IsWithinDoubleVerticalCylinder(Position const* center, float radius, float height) const; - bool HasInArc(float arcangle, Position const* pos, float border = 2.0f, Optional orientation = {}) const; - bool HasInLine(Position const* pos, float objSize, float width, Optional orientation = {}) const; + bool HasInArc(float arcangle, Position const* pos, float border = 2.0f) const; + bool HasInLine(Position const* pos, float objSize, float width) const; std::string ToString() const; // constrain arbitrary radian orientation to interval [0,2*PI) diff --git a/src/server/game/Entities/Player/CinematicMgr.cpp b/src/server/game/Entities/Player/CinematicMgr.cpp index a67b6876afb..1081f248781 100644 --- a/src/server/game/Entities/Player/CinematicMgr.cpp +++ b/src/server/game/Entities/Player/CinematicMgr.cpp @@ -121,7 +121,7 @@ void CinematicMgr::UpdateCinematicLocation(uint32 /*diff*/) lastPosition.Relocate(cam.locations); lastTimestamp = cam.timeStamp; } - float angle = lastPosition.GetAngle(&nextPosition); + float angle = lastPosition.GetAbsoluteAngle(&nextPosition); angle -= lastPosition.GetOrientation(); if (angle < 0) angle += 2 * float(M_PI); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 10edd2ef852..90e06ba69af 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -590,19 +590,6 @@ bool Unit::IsWithinBoundaryRadius(const Unit* obj) const return IsInDist(obj, objBoundaryRadius); } -void Unit::GetRandomContactPoint(Unit const* obj, float &x, float &y, float &z, float distance2dMin, float distance2dMax) const -{ - float combat_reach = GetCombatReach(); - if (combat_reach < 0.1f) // sometimes bugged for players - combat_reach = DEFAULT_PLAYER_COMBAT_REACH; - - uint32 attacker_number = uint32(getAttackers().size()); - if (attacker_number > 0) - --attacker_number; - GetNearPoint(obj, x, y, z, obj->GetCombatReach(), distance2dMin+(distance2dMax-distance2dMin) * (float)rand_norm(), - GetAngle(obj) + (attacker_number ? (static_cast(M_PI/2) - static_cast(M_PI) * (float)rand_norm()) * float(attacker_number) / combat_reach * 0.3f : 0)); -} - void Unit::SetVisibleAura(AuraApplication* aurApp) { m_visibleAuras.insert(aurApp); @@ -11727,7 +11714,7 @@ void Unit::JumpTo(WorldObject* obj, float speedZ, bool withOrientation) float x, y, z; obj->GetContactPoint(this, x, y, z); float speedXY = GetExactDist2d(x, y) * 10.0f / speedZ; - GetMotionMaster()->MoveJump(x, y, z, GetAngle(obj), speedXY, speedZ, EVENT_JUMP, withOrientation); + GetMotionMaster()->MoveJump(x, y, z, GetAbsoluteAngle(obj), speedXY, speedZ, EVENT_JUMP, withOrientation); } void Unit::HandleSpellClick(Unit* clicker, int8 seatId /*= -1*/) @@ -12302,7 +12289,7 @@ bool CharmInfo::IsReturning() void Unit::SetInFront(WorldObject const* target) { if (!HasUnitState(UNIT_STATE_CANNOT_TURN)) - SetOrientation(GetAngle(target)); + SetOrientation(GetAbsoluteAngle(target)); } void Unit::SetFacingTo(float ori, bool force) @@ -12328,7 +12315,7 @@ void Unit::SetFacingToObject(WorldObject const* object, bool force) /// @todo figure out under what conditions creature will move towards object instead of facing it where it currently is. Movement::MoveSplineInit init(this); init.MoveTo(GetPositionX(), GetPositionY(), GetPositionZ(), false); - init.SetFacing(GetAngle(object)); // when on transport, GetAngle will still return global coordinates (and angle) that needs transforming + init.SetFacing(GetAbsoluteAngle(object)); // when on transport, GetAbsoluteAngle will still return global coordinates (and angle) that needs transforming init.Launch(); } diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 696c63bcacf..335ccbc0cb6 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -797,7 +797,6 @@ class TC_GAME_API Unit : public WorldObject float GetMeleeRange(Unit const* target) const; virtual SpellSchoolMask GetMeleeDamageSchoolMask(WeaponAttackType attackType = BASE_ATTACK) const = 0; bool IsWithinBoundaryRadius(const Unit* obj) const; - void GetRandomContactPoint(Unit const* target, float& x, float& y, float& z, float distance2dMin, float distance2dMax) const; uint32 m_extraAttacks; bool m_canDualWield; diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index d7be55b03e7..a4f9e955644 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -337,7 +337,7 @@ void MotionMaster::MoveCloserAndStop(uint32 id, Unit* target, float distance) float distanceToTravel = _owner->GetExactDist2d(target) - distance; if (distanceToTravel > 0.0f) { - float angle = _owner->GetAngle(target); + float angle = _owner->GetAbsoluteAngle(target); float destx = _owner->GetPositionX() + distanceToTravel * std::cos(angle); float desty = _owner->GetPositionY() + distanceToTravel * std::sin(angle); MovePoint(id, destx, desty, target->GetPositionZ()); @@ -432,7 +432,7 @@ void MotionMaster::MoveKnockbackFrom(float srcX, float srcY, float speedXY, floa float dist = 2 * moveTimeHalf * speedXY; float max_height = -Movement::computeFallElevation(moveTimeHalf, false, -speedZ); - _owner->GetNearPoint(_owner, x, y, z, _owner->GetCombatReach(), dist, _owner->GetAngle(srcX, srcY) + float(M_PI)); + _owner->GetNearPoint(_owner, x, y, z, _owner->GetCombatReach(), dist, _owner->GetAbsoluteAngle(srcX, srcY) + float(M_PI)); Movement::MoveSplineInit init(_owner); init.MoveTo(x, y, z); @@ -497,7 +497,7 @@ void MotionMaster::MoveCirclePath(float x, float y, float z, float radius, bool { float step = 2 * float(M_PI) / stepCount * (clockwise ? -1.0f : 1.0f); Position const& pos = { x, y, z, 0.0f }; - float angle = pos.GetAngle(_owner->GetPositionX(), _owner->GetPositionY()); + float angle = pos.GetAbsoluteAngle(_owner->GetPositionX(), _owner->GetPositionY()); Movement::MoveSplineInit init(_owner); diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp index d4bc99da9ec..d142913268f 100644 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -147,7 +147,7 @@ void FleeingMovementGenerator::GetPoint(T* owner, Position &position) { casterDistance = fleeTarget->GetDistance(owner); if (casterDistance > 0.2f) - casterAngle = fleeTarget->GetAngle(owner); + casterAngle = fleeTarget->GetAbsoluteAngle(owner); else casterAngle = frand(0.0f, 2.0f * float(M_PI)); } diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index 7452b9a93a4..67cc7e69465 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -134,7 +134,7 @@ void TargetedMovementGenerator::SetTargetLocation(T* owner, bool updateDes if (hoverDiff) size = size > hoverDiff ? std::sqrt(size * size - hoverDiff * hoverDiff) : 0.0f; - GetTarget()->GetNearPoint(owner, x, y, z, size, CONTACT_DISTANCE, GetTarget()->GetAngle(owner)); + GetTarget()->GetNearPoint(owner, x, y, z, size, CONTACT_DISTANCE, GetTarget()->GetAbsoluteAngle(owner)); } else { diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index a5d6a7c86f3..efe2b820de7 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -203,7 +203,7 @@ namespace Movement void MoveSplineInit::SetFacing(Unit const* target) { - args.facing.angle = unit->GetAngle(target); + args.facing.angle = unit->GetAbsoluteAngle(target); args.facing.target = target->GetGUID(); args.facing.type = MONSTER_MOVE_FACING_TARGET; } diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 728986b05ed..edcfcdd7a74 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -8342,15 +8342,15 @@ bool WorldObjectSpellTrajTargetCheck::operator()(WorldObject* target) const WorldObjectSpellLineTargetCheck::WorldObjectSpellLineTargetCheck(Position const* srcPosition, Position const* dstPosition, float lineWidth, float range, WorldObject* caster, SpellInfo const* spellInfo, SpellTargetCheckTypes selectionType, ConditionContainer const* condList, SpellTargetObjectTypes objectType) - : WorldObjectSpellAreaTargetCheck(range, caster, caster, caster, spellInfo, selectionType, condList, objectType), _srcPosition(srcPosition), _dstPosition(dstPosition), _lineWidth(lineWidth) { } + : WorldObjectSpellAreaTargetCheck(range, caster, caster, caster, spellInfo, selectionType, condList, objectType), _position(*srcPosition), _lineWidth(lineWidth) +{ + if (dstPosition && *srcPosition != *dstPosition) + _position.SetOrientation(srcPosition->GetAbsoluteAngle(dstPosition)); +} bool WorldObjectSpellLineTargetCheck::operator()(WorldObject* target) const { - float angle = _caster->GetOrientation(); - if (*_srcPosition != *_dstPosition) - angle = _srcPosition->GetAngle(_dstPosition); - - if (!_caster->HasInLine(target, target->GetCombatReach(), _lineWidth, angle)) + if (!_position.HasInLine(target, target->GetCombatReach(), _lineWidth)) return false; return WorldObjectSpellTargetCheck::operator ()(target); diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 50b20f2f0b8..7bf1c5ace9e 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -1023,8 +1023,7 @@ namespace Trinity struct TC_GAME_API WorldObjectSpellLineTargetCheck : public WorldObjectSpellAreaTargetCheck { - Position const* _srcPosition; - Position const* _dstPosition; + Position _position; float _lineWidth; WorldObjectSpellLineTargetCheck(Position const* srcPosition, Position const* dstPosition, float lineWidth, float range, WorldObject* caster, SpellInfo const* spellInfo, SpellTargetCheckTypes selectionType, ConditionContainer const* condList, SpellTargetObjectTypes objectType); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index a3507d6aeaa..d646405b360 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2221,7 +2221,7 @@ void Spell::EffectDistract() unitTarget->GetMotionMaster()->MoveDistract(damage * IN_MILLISECONDS); unitTarget->StopMoving(); - unitTarget->SetFacingTo(unitTarget->GetAngle(destTarget)); + unitTarget->SetFacingTo(unitTarget->GetAbsoluteAngle(destTarget)); } void Spell::EffectPickPocket() @@ -5072,7 +5072,7 @@ void Spell::SummonGuardian(SpellEffectInfo const* effect, uint32 entry, SummonPr summon->SetFaction(unitCaster->GetFaction()); if (summon->HasUnitTypeMask(UNIT_MASK_MINION) && m_targets.HasDst()) - ((Minion*)summon)->SetFollowAngle(unitCaster->GetAngle(summon)); + ((Minion*)summon)->SetFollowAngle(unitCaster->GetAbsoluteAngle(summon)); if (summon->GetEntry() == 27893) { -- cgit v1.2.3