3 files changed, 22 insertions, 8 deletions
diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp
index 59a7c988ee8..129c1a41878 100644
--- a/src/common/Collision/DynamicTree.cpp
+++ b/src/common/Collision/DynamicTree.cpp
@@ -36,7 +36,7 @@ int CHECK_TREE_PERIOD = 200;
 } // namespace
 
 template<> struct PositionTrait< GameObjectModel> {
-    static void getPosition(GameObjectModel const& g, G3D::Vector3& p) { p = g.getPosition(); }
+    static void getPosition(GameObjectModel const& g, G3D::Vector3& p) { p = g.GetPosition(); }
 };
 
 template<> struct BoundsTrait< GameObjectModel> {
diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h
index 2ea99f61e20..f82c1f6860c 100644
--- a/src/common/Collision/Models/GameObjectModel.h
+++ b/src/common/Collision/Models/GameObjectModel.h
@@ -21,15 +21,11 @@
 #include "Define.h"
 #include <G3D/AABox.h>
 #include <G3D/Matrix3.h>
+#include <G3D/Quat.h>
 #include <G3D/Ray.h>
 #include <G3D/Vector3.h>
 #include <memory>
 
-namespace G3D
-{
-class Quat;
-}
-
 namespace VMAP
 {
     class WorldModel;
@@ -53,25 +49,33 @@ public:
     virtual bool IsInPhase(PhaseShift const& /*phaseShift*/) const = 0;
     virtual G3D::Vector3 GetPosition() const = 0;
     virtual G3D::Quat GetRotation() const = 0;
+    virtual int64 GetPackedRotation() const = 0;
     virtual float GetScale() const = 0;
     virtual void DebugVisualizeCorner(G3D::Vector3 const& /*corner*/) const = 0;
 };
 
 class TC_COMMON_API GameObjectModel /*, public Intersectable*/
 {
-    GameObjectModel() : iCollisionEnabled(false), iLosBlockingDisabled(false), iInvScale(0), iScale(0), iModel(nullptr) { }
+    GameObjectModel() : iCollisionEnabled(false), iLosBlockingDisabled(false), iIncludeInNavMesh(false), iInvScale(0), iScale(0), iModel(nullptr) { }
 public:
     const G3D::AABox& getBounds() const { return iBound; }
 
     ~GameObjectModel();
 
-    const G3D::Vector3& getPosition() const { return iPos;}
+    uint32 GetDisplayId() const { return owner->GetDisplayId(); }
+    G3D::Vector3 const& GetPosition() const { return iPos; }
+    G3D::Quat GetRotation() const { return owner->GetRotation(); }
+    G3D::Matrix3 const& GetInvRot() const { return iInvRot; }
+    int64 GetPackedRotation() const { return owner->GetPackedRotation(); }
+    float GetScale() const { return iScale; }
 
     /* Enables/disables collision */
     void EnableCollision(bool enable) { iCollisionEnabled = enable; }
     bool IsCollisionEnabled() const { return iCollisionEnabled; }
     void DisableLosBlocking(bool enable) { iLosBlockingDisabled = enable; }
     bool IsLosBlockingDisabled() const { return iLosBlockingDisabled; }
+    void IncludeInNavMesh(bool enable) { iIncludeInNavMesh = enable; }
+    bool IsIncludedInNavMesh() const { return iIncludeInNavMesh; }
     bool IsMapObject() const;
     uint8 GetNameSetId() const { return owner->GetNameSetId(); }
 
@@ -83,11 +87,14 @@ public:
 
     bool UpdatePosition();
 
+    std::shared_ptr<VMAP::WorldModel const> GetWorldModel() const { return iModel; }
+
 private:
     bool initialize(std::unique_ptr<GameObjectModelOwnerBase> modelOwner, std::string const& dataPath);
 
     bool iCollisionEnabled;     ///< Is model ignored in all checks
     bool iLosBlockingDisabled;  ///< Is model ignored during line of sight checks (but is always included in location/height checks)
+    bool iIncludeInNavMesh;     ///< Is model included when generating navigation mesh
     G3D::AABox iBound;
     G3D::Matrix3 iInvRot;
     G3D::Vector3 iPos;
diff --git a/src/common/Collision/RegularGrid.h b/src/common/Collision/RegularGrid.h
index 459388d2662..94f97b2cb5a 100644
--- a/src/common/Collision/RegularGrid.h
+++ b/src/common/Collision/RegularGrid.h
@@ -210,6 +210,13 @@ public:
         if (Node* node = nodes[cell.x][cell.y].get())
             node->intersectRay(ray, intersectCallback, max_dist);
     }
+
+    std::span<T const* const> getObjects(int x, int y) const
+    {
+        if (Node* n = nodes[x][y].get())
+            return n->getObjects();
+        return {};
+    }
 };
 
 #undef CELL_SIZE