From c60cb7bab1e85fcc33be2f6bb0178adc0216c867 Mon Sep 17 00:00:00 2001 From: Traesh Date: Sun, 12 Sep 2021 17:50:13 +0200 Subject: Core/AreaTrigger Switch polygon vertices from Template to SpellMisc (#26827) --- .../game/Entities/AreaTrigger/AreaTrigger.cpp | 21 ++++++++++------- src/server/game/Entities/AreaTrigger/AreaTrigger.h | 2 ++ .../Entities/AreaTrigger/AreaTriggerTemplate.cpp | 26 ++++++++++++++-------- .../Entities/AreaTrigger/AreaTriggerTemplate.h | 8 ++++--- src/server/game/Entities/Object/Object.cpp | 8 +++---- 5 files changed, 41 insertions(+), 24 deletions(-) (limited to 'src/server/game/Entities') diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp index 046d194efb0..870bf676b7a 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp +++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp @@ -38,7 +38,7 @@ #include "Unit.h" #include "UpdateData.h" -AreaTrigger::AreaTrigger() : WorldObject(false), MapObject(), _aurEff(nullptr), +AreaTrigger::AreaTrigger() : WorldObject(false), MapObject(), _aurEff(nullptr), _maxSearchRadius(0.0f), _duration(0), _totalDuration(0), _timeSinceCreated(0), _previousCheckOrientation(std::numeric_limits::infinity()), _isRemoved(false), _reachedDestination(true), _lastSplineIndex(0), _movementTime(0), _areaTriggerMiscTemplate(nullptr), _areaTriggerTemplate(nullptr) @@ -113,6 +113,11 @@ bool AreaTrigger::Create(uint32 spellMiscId, Unit* caster, Unit* target, SpellIn SetObjectScale(1.0f); + if (GetTemplate()->IsPolygon()) + _maxSearchRadius = GetMiscTemplate()->GetPolygonMaxSearchRadius(); + else + _maxSearchRadius = GetTemplate()->MaxSearchRadius; + auto areaTriggerData = m_values.ModifyValue(&AreaTrigger::m_areaTriggerData); SetUpdateFieldValue(areaTriggerData.ModifyValue(&UF::AreaTriggerData::Caster), caster->GetGUID()); SetUpdateFieldValue(areaTriggerData.ModifyValue(&UF::AreaTriggerData::CreatingEffectGUID), castId); @@ -122,7 +127,7 @@ bool AreaTrigger::Create(uint32 spellMiscId, Unit* caster, Unit* target, SpellIn SetUpdateFieldValue(areaTriggerData.ModifyValue(&UF::AreaTriggerData::SpellVisual).ModifyValue(&UF::SpellCastVisual::SpellXSpellVisualID), spellVisual.SpellXSpellVisualID); SetUpdateFieldValue(areaTriggerData.ModifyValue(&UF::AreaTriggerData::SpellVisual).ModifyValue(&UF::SpellCastVisual::ScriptVisualID), spellVisual.ScriptVisualID); SetUpdateFieldValue(areaTriggerData.ModifyValue(&UF::AreaTriggerData::TimeToTargetScale), GetMiscTemplate()->TimeToTargetScale != 0 ? GetMiscTemplate()->TimeToTargetScale : *m_areaTriggerData->Duration); - SetUpdateFieldValue(areaTriggerData.ModifyValue(&UF::AreaTriggerData::BoundsRadius2D), GetTemplate()->MaxSearchRadius); + SetUpdateFieldValue(areaTriggerData.ModifyValue(&UF::AreaTriggerData::BoundsRadius2D), GetMaxSearchRadius()); SetUpdateFieldValue(areaTriggerData.ModifyValue(&UF::AreaTriggerData::DecalPropertiesID), GetMiscTemplate()->DecalPropertiesId); if (GetMiscTemplate()->ExtraScale.Data.Structured.StartTimeOffset) @@ -360,12 +365,12 @@ void AreaTrigger::SearchUnits(std::vector& targetList, float radius, bool if (IsServerSide()) { Trinity::PlayerListSearcher searcher(this, targetList, check); - Cell::VisitWorldObjects(this, searcher, GetTemplate()->MaxSearchRadius); + Cell::VisitWorldObjects(this, searcher, GetMaxSearchRadius()); } else { Trinity::UnitListSearcher searcher(this, targetList, check); - Cell::VisitAllObjects(this, searcher, GetTemplate()->MaxSearchRadius); + Cell::VisitAllObjects(this, searcher, GetMaxSearchRadius()); } } @@ -387,7 +392,7 @@ void AreaTrigger::SearchUnitInSphere(std::vector& targetList) void AreaTrigger::SearchUnitInBox(std::vector& targetList) { - SearchUnits(targetList, GetTemplate()->MaxSearchRadius, false); + SearchUnits(targetList, GetMaxSearchRadius(), false); Position const& boxCenter = GetPosition(); float extentsX = GetTemplate()->BoxDatas.Extents[0]; @@ -402,7 +407,7 @@ void AreaTrigger::SearchUnitInBox(std::vector& targetList) void AreaTrigger::SearchUnitInPolygon(std::vector& targetList) { - SearchUnits(targetList, GetTemplate()->MaxSearchRadius, false); + SearchUnits(targetList, GetMaxSearchRadius(), false); float height = GetTemplate()->PolygonDatas.Height; float minZ = GetPositionZ() - height; @@ -418,7 +423,7 @@ void AreaTrigger::SearchUnitInPolygon(std::vector& targetList) void AreaTrigger::SearchUnitInCylinder(std::vector& targetList) { - SearchUnits(targetList, GetTemplate()->MaxSearchRadius, false); + SearchUnits(targetList, GetMaxSearchRadius(), false); float height = GetTemplate()->CylinderDatas.Height; float minZ = GetPositionZ() - height; @@ -516,7 +521,7 @@ void AreaTrigger::UpdatePolygonOrientation() if (G3D::fuzzyEq(_previousCheckOrientation, newOrientation)) return; - _polygonVertices.assign(GetTemplate()->PolygonVertices.begin(), GetTemplate()->PolygonVertices.end()); + _polygonVertices.assign(GetMiscTemplate()->PolygonVertices.begin(), GetMiscTemplate()->PolygonVertices.end()); float angleSin = std::sin(newOrientation); float angleCos = std::cos(newOrientation); diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.h b/src/server/game/Entities/AreaTrigger/AreaTrigger.h index e00f8842ea6..5e60736be94 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTrigger.h +++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.h @@ -99,6 +99,7 @@ class TC_GAME_API AreaTrigger : public WorldObject, public GridObject const& offsets, uint32 timeToTarget); @@ -144,6 +145,7 @@ class TC_GAME_API AreaTrigger : public WorldObject, public GridObject const& vertice : PolygonVertices) - { - float pointDist = center.GetExactDist2d(vertice); - - if (pointDist > MaxSearchRadius) - MaxSearchRadius = pointDist; - } - break; } case AREATRIGGER_TYPE_CYLINDER: @@ -118,3 +110,19 @@ bool AreaTriggerMiscTemplate::HasSplines() const { return SplinePoints.size() >= 2; } + +float AreaTriggerMiscTemplate::GetPolygonMaxSearchRadius() const +{ + Position center(0.0f, 0.0f); + float maxSearchRadius = 0.0f; + + for (TaggedPosition const& vertice : PolygonVertices) + { + float pointDist = center.GetExactDist2d(vertice); + + if (pointDist > maxSearchRadius) + maxSearchRadius = pointDist; + } + + return maxSearchRadius; +} diff --git a/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h b/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h index 389f0e73b89..9de9356f273 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h +++ b/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h @@ -150,8 +150,6 @@ public: uint32 Flags; uint32 ScriptId; float MaxSearchRadius; - std::vector> PolygonVertices; - std::vector> PolygonVerticesTarget; std::vector Actions; union @@ -201,7 +199,8 @@ public: AreaTriggerMiscTemplate(); ~AreaTriggerMiscTemplate(); - bool HasSplines() const; + bool HasSplines() const; + float GetPolygonMaxSearchRadius() const; uint32 MiscId; uint32 AreaTriggerEntry; @@ -224,6 +223,9 @@ public: AreaTriggerOrbitInfo OrbitInfo; AreaTriggerTemplate const* Template; + + std::vector> PolygonVertices; + std::vector> PolygonVerticesTarget; std::vector SplinePoints; }; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index becde162ffb..5ed83090c45 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -564,15 +564,15 @@ void Object::BuildMovementUpdate(ByteBuffer* data, CreateObjectBits flags) const if (hasAreaTriggerPolygon) { - *data << int32(areaTriggerTemplate->PolygonVertices.size()); - *data << int32(areaTriggerTemplate->PolygonVerticesTarget.size()); + *data << int32(areaTriggerMiscTemplate->PolygonVertices.size()); + *data << int32(areaTriggerMiscTemplate->PolygonVerticesTarget.size()); *data << float(areaTriggerTemplate->PolygonDatas.Height); *data << float(areaTriggerTemplate->PolygonDatas.HeightTarget); - for (TaggedPosition const& vertice : areaTriggerTemplate->PolygonVertices) + for (TaggedPosition const& vertice : areaTriggerMiscTemplate->PolygonVertices) *data << vertice; - for (TaggedPosition const& vertice : areaTriggerTemplate->PolygonVerticesTarget) + for (TaggedPosition const& vertice : areaTriggerMiscTemplate->PolygonVerticesTarget) *data << vertice; } -- cgit v1.2.3