From 1457a0de78464a68e9b56e0ccf33189f5e0afc33 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 9 Feb 2016 19:04:59 +0100
Subject: [PATCH] Use the UnrefQueue to delete BulletShapeInstances

---
 apps/openmw/mwphysics/physicssystem.cpp   | 14 ++++++++++++++
 apps/openmw/mwphysics/physicssystem.hpp   |  9 +++++++--
 apps/openmw/mwrender/renderingmanager.cpp |  5 +++++
 apps/openmw/mwrender/renderingmanager.hpp |  1 +
 apps/openmw/mwworld/scene.cpp             |  2 ++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 48b3426b8..9f1cfc682 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -22,6 +22,7 @@
 
 #include <components/esm/loadgmst.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
+#include <components/sceneutil/unrefqueue.hpp>
 
 #include <components/nifosg/particle.hpp> // FindRecIndexVisitor
 
@@ -533,6 +534,11 @@ namespace MWPhysics
             setOrigin(btVector3(pos[0], pos[1], pos[2]));
         }
 
+        const Resource::BulletShapeInstance* getShapeInstance() const
+        {
+            return mShapeInstance.get();
+        }
+
         void setScale(float scale)
         {
             mShapeInstance->getCollisionShape()->setLocalScaling(btVector3(scale,scale,scale));
@@ -690,6 +696,11 @@ namespace MWPhysics
         delete mBroadphase;
     }
 
+    void PhysicsSystem::setUnrefQueue(SceneUtil::UnrefQueue *unrefQueue)
+    {
+        mUnrefQueue = unrefQueue;
+    }
+
     Resource::BulletShapeManager *PhysicsSystem::getShapeManager()
     {
         return mShapeManager.get();
@@ -1109,6 +1120,9 @@ namespace MWPhysics
         {
             mCollisionWorld->removeCollisionObject(found->second->getCollisionObject());
 
+            if (mUnrefQueue.get())
+                mUnrefQueue->push(found->second->getShapeInstance());
+
             mAnimatedObjects.erase(found->second);
 
             delete found->second;
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index a866717c7..110b59268 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -25,11 +25,12 @@ namespace MWRender
 namespace Resource
 {
     class BulletShapeManager;
+    class ResourceSystem;
 }
 
-namespace Resource
+namespace SceneUtil
 {
-    class ResourceSystem;
+    class UnrefQueue;
 }
 
 class btCollisionWorld;
@@ -53,6 +54,8 @@ namespace MWPhysics
             PhysicsSystem (Resource::ResourceSystem* resourceSystem, osg::ref_ptr<osg::Group> parentNode);
             ~PhysicsSystem ();
 
+            void setUnrefQueue(SceneUtil::UnrefQueue* unrefQueue);
+
             Resource::BulletShapeManager* getShapeManager();
 
             void enableWater(float height);
@@ -165,6 +168,8 @@ namespace MWPhysics
 
             void updateWater();
 
+            osg::ref_ptr<SceneUtil::UnrefQueue> mUnrefQueue;
+
             btBroadphaseInterface* mBroadphase;
             btDefaultCollisionConfiguration* mCollisionConfiguration;
             btCollisionDispatcher* mDispatcher;
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 5a9cd59fc..be3caaeb4 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -263,6 +263,11 @@ namespace MWRender
         return mWorkQueue.get();
     }
 
+    SceneUtil::UnrefQueue *RenderingManager::getUnrefQueue()
+    {
+        return mUnrefQueue.get();
+    }
+
     void RenderingManager::preloadCommonAssets()
     {
         osg::ref_ptr<PreloadCommonAssetsWorkItem> workItem (new PreloadCommonAssetsWorkItem(mResourceSystem));
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 3d6a4ac3a..4c850de12 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -72,6 +72,7 @@ namespace MWRender
         Resource::ResourceSystem* getResourceSystem();
 
         SceneUtil::WorkQueue* getWorkQueue();
+        SceneUtil::UnrefQueue* getUnrefQueue();
 
         void preloadCommonAssets();
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 46d75daaf..b0e384493 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -466,6 +466,8 @@ namespace MWWorld
         mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager()));
         mPreloader->setWorkQueue(mRendering.getWorkQueue());
 
+        mPhysics->setUnrefQueue(rendering.getUnrefQueue());
+
         float cacheExpiryDelay = Settings::Manager::getFloat("cache expiry delay", "Cells");
         rendering.getResourceSystem()->setExpiryDelay(cacheExpiryDelay);
         mPreloader->setExpiryDelay(cacheExpiryDelay);