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/ModelInstance.cpp | |
| 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/ModelInstance.cpp')
| -rw-r--r-- | src/common/Collision/Models/ModelInstance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/Collision/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp index 6838babcbe2..2205d10833a 100644 --- a/src/common/Collision/Models/ModelInstance.cpp +++ b/src/common/Collision/Models/ModelInstance.cpp @@ -24,7 +24,7 @@ using G3D::Ray; namespace VMAP { - ModelInstance::ModelInstance(ModelSpawn const& spawn, WorldModel* model) : ModelMinimalData(spawn), iModel(model) + ModelInstance::ModelInstance(ModelSpawn const& spawn, std::shared_ptr<WorldModel> model) : ModelMinimalData(spawn), iModel(std::move(model)) { iInvRot = G3D::Matrix3::fromEulerAnglesZYX(G3D::pif() * spawn.iRot.y / 180.f, G3D::pif() * spawn.iRot.x / 180.f, G3D::pif() * spawn.iRot.z / 180.f).inverse(); iInvScale = 1.f / iScale; |