From dad56a224d318fb9fd255ef94c8d1e805c211986 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 8 Apr 2018 00:04:20 +0200 Subject: Core/GameObjects: Skip gameobjects with M2 models when searching for area info (perf optimization, they dont have any area info) --- src/common/Collision/Models/GameObjectModel.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/common/Collision/Models/GameObjectModel.h') diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h index e6211cd0243..287f93f87ca 100644 --- a/src/common/Collision/Models/GameObjectModel.h +++ b/src/common/Collision/Models/GameObjectModel.h @@ -54,7 +54,7 @@ public: class TC_COMMON_API GameObjectModel /*, public Intersectable*/ { - GameObjectModel() : _collisionEnabled(false), iInvScale(0), iScale(0), iModel(nullptr) { } + GameObjectModel() : _collisionEnabled(false), iInvScale(0), iScale(0), iModel(nullptr), isWmo(false) { } public: std::string name; @@ -67,6 +67,7 @@ public: /* Enables/disables collision */ void enableCollision(bool enable) { _collisionEnabled = enable; } bool isCollisionEnabled() const { return _collisionEnabled; } + bool isMapObject() const { return isWmo; } bool intersectRay(G3D::Ray const& ray, float& maxDist, bool stopAtFirstHit, PhaseShift const& phaseShift) const; void intersectPoint(G3D::Vector3 const& point, VMAP::AreaInfo& info, PhaseShift const& phaseShift) const; @@ -86,6 +87,7 @@ private: float iScale; VMAP::WorldModel* iModel; std::unique_ptr owner; + bool isWmo; }; TC_COMMON_API void LoadGameObjectModelList(std::string const& dataPath); -- cgit v1.2.3