From 3b9326d238f0dd2da0afd47e0a96dda8aa401e0b Mon Sep 17 00:00:00 2001
From: Kyle Cooley <kyleacooley@gmail.com>
Date: Sun, 20 Aug 2017 22:34:41 -0400
Subject: [PATCH] Clear terrain cache and reload terrain

---
 apps/opencs/view/render/cell.cpp    |  7 +++++++
 components/terrain/buffercache.cpp  | 12 ++++++++++++
 components/terrain/buffercache.hpp  |  2 ++
 components/terrain/chunkmanager.cpp |  7 +++++++
 components/terrain/chunkmanager.hpp |  2 ++
 components/terrain/world.cpp        |  6 ++++++
 components/terrain/world.hpp        |  3 +++
 7 files changed, 39 insertions(+)

diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index ebc383ff2..5aa534232 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -291,6 +291,13 @@ void CSVRender::Cell::reloadAssets()
         iter->second->reloadAssets();
     }
 
+    if (mTerrain)
+    {
+        mTerrain->unloadCell(mCoordinates.getX(), mCoordinates.getY());
+        mTerrain->clearCache();
+        mTerrain->loadCell(mCoordinates.getX(), mCoordinates.getY());
+    }
+
     mCellWater->reloadAssets();
 }
 
diff --git a/components/terrain/buffercache.cpp b/components/terrain/buffercache.cpp
index 470655539..361dd6c04 100644
--- a/components/terrain/buffercache.cpp
+++ b/components/terrain/buffercache.cpp
@@ -231,4 +231,16 @@ namespace Terrain
         return buffer;
     }
 
+    void BufferCache::clearCache()
+    {
+        {
+            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mIndexBufferMutex);
+            mIndexBufferMap.clear();
+        }
+        {
+            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mUvBufferMutex);
+            mUvBufferMap.clear();
+        }
+    }
+
 }
diff --git a/components/terrain/buffercache.hpp b/components/terrain/buffercache.hpp
index e8963354b..bfdf558bc 100644
--- a/components/terrain/buffercache.hpp
+++ b/components/terrain/buffercache.hpp
@@ -22,6 +22,8 @@ namespace Terrain
         /// @note Thread safe.
         osg::ref_ptr<osg::Vec2Array> getUVBuffer(unsigned int numVerts);
 
+        void clearCache();
+
         // TODO: add releaseGLObjects() for our vertex/element buffer objects
 
     private:
diff --git a/components/terrain/chunkmanager.cpp b/components/terrain/chunkmanager.cpp
index e4a7c2d68..ea71c726f 100644
--- a/components/terrain/chunkmanager.cpp
+++ b/components/terrain/chunkmanager.cpp
@@ -55,6 +55,13 @@ void ChunkManager::reportStats(unsigned int frameNumber, osg::Stats *stats) cons
     stats->setAttribute(frameNumber, "Terrain Chunk", mCache->getCacheSize());
 }
 
+void ChunkManager::clearCache()
+{
+    ResourceManager::clearCache();
+
+    mBufferCache.clearCache();
+}
+
 void ChunkManager::setCullingActive(bool active)
 {
     mCullingActive = active;
diff --git a/components/terrain/chunkmanager.hpp b/components/terrain/chunkmanager.hpp
index 553e06d97..2f92fa836 100644
--- a/components/terrain/chunkmanager.hpp
+++ b/components/terrain/chunkmanager.hpp
@@ -34,6 +34,8 @@ namespace Terrain
 
         virtual void reportStats(unsigned int frameNumber, osg::Stats* stats) const;
 
+        virtual void clearCache();
+
         void setCullingActive(bool active);
 
     private:
diff --git a/components/terrain/world.cpp b/components/terrain/world.cpp
index b7cc0ae01..9bbb585a8 100644
--- a/components/terrain/world.cpp
+++ b/components/terrain/world.cpp
@@ -70,6 +70,12 @@ float World::getHeightAt(const osg::Vec3f &worldPos)
     return mStorage->getHeightAt(worldPos);
 }
 
+void World::clearCache()
+{
+    mTextureManager->clearCache();
+    mChunkManager->clearCache();
+}
+
 void World::updateTextureFiltering()
 {
     mTextureManager->updateTextureFiltering();
diff --git a/components/terrain/world.hpp b/components/terrain/world.hpp
index d0576fbd3..2fb669494 100644
--- a/components/terrain/world.hpp
+++ b/components/terrain/world.hpp
@@ -67,6 +67,9 @@ namespace Terrain
         /// @note Thread safe.
         virtual void cacheCell(View* view, int x, int y) {}
 
+        /// Clears cached texture and chunk data.
+        virtual void clearCache();
+
         /// Load the cell into the scene graph.
         /// @note Not thread safe.
         /// @note May be ignored by derived implementations that don't organize the terrain into cells.