josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/AreaTriggers: Handle AREATRIGGER_FLAG_HAS_DYNAMIC_SHAPE for disks (#29156)

Browse Source
This commit is contained in:
Traesh
2023-07-18 18:42:57 +02:00
committed by GitHub
parent 7d8bc543f9
commit 5be076b240
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
+16 -3
View File
@@ -562,16 +562,29 @@ void AreaTrigger::SearchUnitInCylinder(std::vector<Unit*>& targetList)
void AreaTrigger::SearchUnitInDisk(std::vector<Unit*>& targetList)
{
SearchUnits(targetList, GetMaxSearchRadius(), false);
float innerRadius = _shape.DiskDatas.InnerRadius;
float outerRadius = _shape.DiskDatas.OuterRadius;
float height = _shape.DiskDatas.Height;
if (GetTemplate() && GetTemplate()->HasFlag(AREATRIGGER_FLAG_HAS_DYNAMIC_SHAPE))
{
float progress = GetProgress();
if (GetCreateProperties()->MorphCurveId)
progress = sDB2Manager.GetCurveValueAt(GetCreateProperties()->MorphCurveId, progress);
innerRadius = G3D::lerp(_shape.DiskDatas.InnerRadius, _shape.DiskDatas.InnerRadiusTarget, progress);
outerRadius = G3D::lerp(_shape.DiskDatas.OuterRadius, _shape.DiskDatas.OuterRadiusTarget, progress);
height = G3D::lerp(_shape.DiskDatas.Height, _shape.DiskDatas.HeightTarget, progress);
}
SearchUnits(targetList, outerRadius, false);
float minZ = GetPositionZ() - height;
float maxZ = GetPositionZ() + height;
targetList.erase(std::remove_if(targetList.begin(), targetList.end(), [this, innerRadius, minZ, maxZ](Unit const* unit) -> bool
{
return unit->IsInDist2d(this, innerRadius) || unit->GetPositionZ() < minZ || unit->GetPositionZ() > maxZ;
return unit->IsInDist2d(this, innerRadius) || unit->GetPositionZ() < minZ || unit->GetPositionZ() > maxZ;
}), targetList.end());
}
src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h
+1 -1
View File
@@ -31,7 +31,7 @@
enum AreaTriggerFlags
{
AREATRIGGER_FLAG_HAS_ABSOLUTE_ORIENTATION = 0x00001, // NYI
AREATRIGGER_FLAG_HAS_DYNAMIC_SHAPE = 0x00002, // Implemented for Spheres
AREATRIGGER_FLAG_HAS_DYNAMIC_SHAPE = 0x00002, // Implemented for Spheres & Disks
AREATRIGGER_FLAG_HAS_ATTACHED = 0x00004,
AREATRIGGER_FLAG_HAS_FACE_MOVEMENT_DIR = 0x00008,
AREATRIGGER_FLAG_HAS_FOLLOWS_TERRAIN = 0x00010, // NYI