From a64c9f5d0edc43dd53c01021a50d7ac97e12f6c8 Mon Sep 17 00:00:00 2001 From: Ovalord <1Don7H4v3@m41L.com> Date: Wed, 14 Feb 2018 10:48:01 +0100 Subject: [PATCH] Revert "Core/Movement:" This reverts commit 154d283d3a5c9048157a76009bf69308cb392c53. --- src/server/game/Entities/Unit/Unit.cpp | 34 +++---------------- src/server/game/Entities/Unit/Unit.h | 3 -- src/server/game/Movement/MotionMaster.cpp | 21 +++++++++--- .../game/Movement/Spline/MoveSpline.cpp | 25 +++----------- src/server/game/Movement/Spline/MoveSpline.h | 4 +-- .../game/Movement/Spline/MoveSplineInit.cpp | 13 +------ .../Movement/Spline/MovementPacketBuilder.cpp | 3 +- 7 files changed, 28 insertions(+), 75 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 2be5859e2d..cc843ab42b 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -486,38 +486,20 @@ void Unit::MonsterMoveWithSpeed(float x, float y, float z, float speed, bool gen init.Launch(); } -void Unit::UpdateSplineMovement(uint32 p_diff) +void Unit::UpdateSplineMovement(uint32 t_diff) { - uint32 const flightSplineSyncDelay = 5 * TimeConstants::IN_MILLISECONDS; - - bool arrived = movespline->Finalized(); if (movespline->Finalized()) return; - movespline->updateState(p_diff); - arrived = movespline->Finalized(); + movespline->updateState(t_diff); + bool arrived = movespline->Finalized(); if (arrived) DisableSpline(); - m_movesplineTimer.Update(p_diff); + m_movesplineTimer.Update(t_diff); if (m_movesplineTimer.Passed() || arrived) UpdateSplinePosition(); - - m_FlightSplineSyncTimer.Update(p_diff); - if (m_FlightSplineSyncTimer.Passed()) - { - float percent = 1.0f; - float totalTime = movespline->Duration(); - if (totalTime > 0.0f) - percent = (float)movespline->timePassed() / totalTime; - - // Synch flight movement for cylic movement - if (movespline->isCyclic() && IsFlying()) - SendFlightSplineSync(percent); - - m_FlightSplineSyncTimer.Reset(flightSplineSyncDelay); - } } void Unit::UpdateSplinePosition() @@ -9002,14 +8984,6 @@ void Unit::SetSpeedRate(UnitMoveType mtype, float rate) Movement::PacketSender(this, moveTypeToOpcode[mtype][0], moveTypeToOpcode[mtype][1], moveTypeToOpcode[mtype][2], &extra).Send(); } -void Unit::SendFlightSplineSync(float splineDist) -{ - WorldPacket data(SMSG_FLIGHT_SPLINE_SYNC, 11); - data << float(splineDist); - data.appendPackGUID(GetGUID()); - SendMessageToSet(&data, false); -} - void Unit::setDeathState(DeathState s) { // Death state needs to be updated before RemoveAllAurasOnDeath() is called, to prevent entering combat diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index af84d393e8..e645946c46 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1676,8 +1676,6 @@ class TC_GAME_API Unit : public WorldObject void SendClearTarget(); - void SendFlightSplineSync(float splineDist); - bool IsAlive() const { return (m_deathState == ALIVE); } bool isDying() const { return (m_deathState == JUST_DIED); } bool isDead() const { return (m_deathState == DEAD || m_deathState == CORPSE); } @@ -2340,7 +2338,6 @@ class TC_GAME_API Unit : public WorldObject uint32 m_state; // Even derived shouldn't modify uint32 m_CombatTimer; TimeTrackerSmall m_movesplineTimer; - TimeTrackerSmall m_FlightSplineSyncTimer; Diminishing m_Diminishing; // Manage all Units that are threatened by us diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 7065fd8612..0a0a0a9039 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -482,15 +482,26 @@ void MotionMaster::MoveCirclePath(float x, float y, float z, float radius, bool G3D::Vector3 point; point.x = x + radius * cosf(angle); point.y = y + radius * sinf(angle); - point.z = z; + + if (_owner->IsFlying()) + point.z = z; + else + point.z = _owner->GetMap()->GetHeight(_owner->GetPhases(), point.x, point.y, z); init.Path().push_back(point); } - init.SetFly(); // Cyclic movement is always flying - init.SetCyclic(); - init.SetUncompressed(); - init.SetAnimation(Movement::ToFly); + if (_owner->IsFlying()) + { + init.SetFly(); + init.SetCyclic(); + init.SetAnimation(Movement::ToFly); + } + else + { + init.SetWalk(true); + init.SetCyclic(); + } init.Launch(); } diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index 985976299e..574b11aabb 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -122,10 +122,10 @@ void MoveSpline::init_spline(const MoveSplineInitArgs& args) const SplineBase::EvaluationMode modes[2] = {SplineBase::ModeLinear, SplineBase::ModeCatmullrom}; if (args.flags.cyclic) { - // Cyclic movement always starts with Enter_Cycle flag. - // The first vertex is a fake circle point and needs to get - // removed once the first cycle is complete - uint32 cyclic_point = 1; + uint32 cyclic_point = 0; + // MoveSplineFlag::Enter_Cycle support dropped + //if (splineflags & SPLINEFLAG_ENTER_CYCLE) + //cyclic_point = 1; // shouldn't be modified, came from client spline.init_cyclic_spline(&args.path[0], args.path.size(), modes[args.flags.isSmooth()], cyclic_point); } else @@ -173,10 +173,6 @@ void MoveSpline::Initialize(MoveSplineInitArgs const& args) return; } - // Copy arguments for cyclic paths to recalculate the cycle after first loop - if (args.flags.cyclic) - initCycleArgs = args; - init_spline(args); // init parabolic / animation @@ -269,19 +265,6 @@ MoveSpline::UpdateResult MoveSpline::_updateState(int32& ms_time_diff) { if (spline.isCyclic()) { - // Recalculate new cycle without first vertex - if (!initCycleArgs.path.empty()) - { - // First we remove the vertex from the path... - initCycleArgs.path.erase(initCycleArgs.path.begin()); - - // ...now we recalculate a new path... - const SplineBase::EvaluationMode modes[2] = { SplineBase::ModeLinear, SplineBase::ModeCatmullrom }; - spline.init_cyclic_spline(&initCycleArgs.path[0], initCycleArgs.path.size(), modes[initCycleArgs.flags.isSmooth()], 0); - - // ... and clear the path to avoid endless loops - initCycleArgs.path.clear(); - } point_Idx = spline.first(); time_passed = time_passed % Duration(); result = Result_NextCycle; diff --git a/src/server/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h index 6fb9021441..f28f8a38e0 100644 --- a/src/server/game/Movement/Spline/MoveSpline.h +++ b/src/server/game/Movement/Spline/MoveSpline.h @@ -59,8 +59,6 @@ namespace Movement MoveSplineFlag splineflags; - MoveSplineInitArgs initCycleArgs; - int32 time_passed; // currently duration mods are unused, but its _currently_ //float duration_mod; @@ -82,10 +80,10 @@ namespace Movement int32 next_timestamp() const { return spline.length(point_Idx + 1); } int32 segment_time_elapsed() const { return next_timestamp() - time_passed; } int32 timeElapsed() const { return Duration() - time_passed; } + int32 timePassed() const { return time_passed; } public: int32 Duration() const { return spline.length(); } - int32 timePassed() const { return time_passed; } MySpline const& _Spline() const { return spline; } int32 _currentSplineIdx() const { return point_Idx; } void _Finalize(); diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index 5ec2979329..309a9e5b3d 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -85,18 +85,7 @@ namespace Movement return 0; // correct first vertex - if (!args.flags.cyclic) - args.path[0] = real_position; - else - args.path.insert(args.path.begin(), real_position); - - // Cyclic movement always uses catmullrom and enter_cycle movement flag - if (args.flags.cyclic) - { - args.flags.EnableCatmullRom(); - args.flags.enter_cycle = true; - } - + args.path[0] = real_position; args.initialOrientation = real_position.orientation; move_spline.onTransport = (unit->GetTransGUID() != 0); diff --git a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp index 94af81c1ec..381b41026f 100644 --- a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp +++ b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp @@ -127,7 +127,8 @@ namespace Movement void WriteUncompressedCyclicPath(Spline const& spline, ByteBuffer& data) { uint32 count = spline.getPointCount() - 3; - data << uint32(count); + data << uint32(count + 1); + data << spline.getPoint(1); // fake point, client will erase it from the spline after first cycle done data.append(&spline.getPoint(1), count); }