Use center of gameobject model as collision height.

vmangos · Nov 16, 2023 · d3e7026 · d3e7026
1 parent 9cb972d
commit d3e7026
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/src/game/Objects/GameObject.cpp b/src/game/Objects/GameObject.cpp
@@ -2541,6 +2541,14 @@ void GameObject::GetClosestChairSlotPosition(float userX, float userY, float& ou
     outY = GetPositionY();
 }
 
+float GameObject::GetCollisionHeight() const
+{
+    // use the center of the model
+    if (GameObjectDisplayInfoAddon const* displayInfo = sGameObjectDisplayInfoAddonStorage.LookupEntry<GameObjectDisplayInfoAddon>(GetDisplayId()))
+        return (displayInfo->max_z + displayInfo->min_z) * 0.5f * GetObjectScale();
+    return 1.0f;
+}
+
 bool GameObject::IsAtInteractDistance(Position const& pos, float radius) const
 {
     if (GameObjectDisplayInfoAddon const* displayInfo = sGameObjectDisplayInfoAddonStorage.LookupEntry<GameObjectDisplayInfoAddon>(GetDisplayId()))

diff --git a/src/game/Objects/GameObject.h b/src/game/Objects/GameObject.h
@@ -250,6 +250,7 @@ class GameObject : public SpellCaster
         uint32 GetFactionTemplateId() const final { return GetGOInfo()->faction; }
         uint32 GetLevel() const final ;
 
+        float GetCollisionHeight() const final;
         bool IsAtInteractDistance(Position const& pos, float radius) const;
         bool IsAtInteractDistance(Player const* player, uint32 maxRange = 0) const;
 

diff --git a/src/game/Objects/Object.cpp b/src/game/Objects/Object.cpp
@@ -1617,15 +1617,15 @@ bool WorldObject::IsWithinLOSInMap(WorldObject const* obj, bool checkDynLos) con
         return true;
     float ox, oy, oz;
     obj->GetPosition(ox, oy, oz);
-    float targetHeight = obj->IsUnit() ? obj->ToUnit()->GetCollisionHeight() : 2.f;
+    float targetHeight = obj->GetCollisionHeight();
     return (IsWithinLOS(ox, oy, oz, checkDynLos, targetHeight));
 }
 
 bool WorldObject::IsWithinLOSAtPosition(float ownX, float ownY, float ownZ, float targetX, float targetY, float targetZ, bool checkDynLos, float targetHeight) const
 {
     if (IsInWorld())
     {
-        float height = IsUnit() ? ToUnit()->GetCollisionHeight() : 2.f;
+        float height = GetCollisionHeight();
         return GetMap()->isInLineOfSight(ownX, ownY, ownZ + height, targetX, targetY, targetZ + targetHeight, checkDynLos);
     }
 
@@ -2005,7 +2005,7 @@ void WorldObject::MovePositionToFirstCollision(Position& pos, float dist, float
 
     GenericTransport* transport = GetTransport();
 
-    float halfHeight = IsUnit() ? static_cast<Unit*>(this)->GetCollisionHeight() : 0.0f;
+    float halfHeight = GetCollisionHeight();
     if (IsUnit())
     {
         PathFinder path(static_cast<Unit*>(this));

diff --git a/src/game/Objects/Object.h b/src/game/Objects/Object.h
@@ -723,6 +723,7 @@ class WorldObject : public Object
             // angle to face `obj` to `this` using distance includes size of `obj`
             GetNearPoint(obj, x, y, z, obj->GetObjectBoundingRadius(), distance2d, GetAngle(obj));
         }
+        virtual float GetCollisionHeight() const { return 1.0f; }
         virtual float GetObjectBoundingRadius() const { return DEFAULT_WORLD_OBJECT_SIZE; }
         virtual float GetCombatReach() const { return 0.f; }
 

diff --git a/src/game/Objects/Unit.h b/src/game/Objects/Unit.h
@@ -553,7 +553,7 @@ class Unit : public SpellCaster
         void ResetTransformScale();
         float GetNativeScale() const;
         void SetNativeScale(float scale);
-        float GetCollisionHeight() const { return m_modelCollisionHeight * m_nativeScaleOverride; }
+        float GetCollisionHeight() const final { return m_modelCollisionHeight * m_nativeScaleOverride; }
         float GetMinSwimDepth() const { return GetCollisionHeight() * 0.75f; } // client switches to swim animation at this depth
         static float GetScaleForDisplayId(uint32 displayId);
         void UpdateModelData(); // at any changes to scale and/or displayId