diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-07-04 22:56:00 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-07-05 04:43:39 +0200 |
| commit | 0a1d2c7813fdb7bc588543262ab124cc94cc47f4 (patch) | |
| tree | a9319cdaae7b8ad6c89f0856096eba0262a2701f /src/common/Collision/Models/GameObjectModel.h | |
| parent | 8d9e1e663e2e62d91365f61f373c3a1466607c69 (diff) | |
Core/Vmaps: Replace manual reference counting with shared_ptr and slightly reduce memory use by deduplicating model name strings
(cherry picked from commit ff4fc1ad4e91e3da9cd8c011f30473a19a3d47bd)
Diffstat (limited to 'src/common/Collision/Models/GameObjectModel.h')
| -rw-r--r-- | src/common/Collision/Models/GameObjectModel.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h index f875d9e3197..1cfe27a050e 100644 --- a/src/common/Collision/Models/GameObjectModel.h +++ b/src/common/Collision/Models/GameObjectModel.h @@ -18,12 +18,11 @@ #ifndef _GAMEOBJECT_MODEL_H #define _GAMEOBJECT_MODEL_H -#include <G3D/Matrix3.h> -#include <G3D/Vector3.h> +#include "Define.h" #include <G3D/AABox.h> +#include <G3D/Matrix3.h> #include <G3D/Ray.h> - -#include "Define.h" +#include <G3D/Vector3.h> #include <memory> namespace G3D @@ -91,7 +90,7 @@ private: G3D::Vector3 iPos; float iInvScale; float iScale; - VMAP::WorldModel* iModel; + std::shared_ptr<VMAP::WorldModel> iModel; std::unique_ptr<GameObjectModelOwnerBase> owner; }; |