🐛 Terrain: Removed faulty resource group "{}-TerrainObjects"

RigsOfRods · Feb 21, 2024 · 7c1cffb · 7c1cffb
1 parent d16751d
commit 7c1cffb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/source/main/terrain/TerrainObjectManager.cpp b/source/main/terrain/TerrainObjectManager.cpp
@@ -65,11 +65,6 @@ inline float getTerrainHeight(Real x, Real z, void* unused = 0)
 TerrainObjectManager::TerrainObjectManager(Terrain* terrainManager) :
     terrainManager(terrainManager)
 {
-
-    // terrain custom group
-    m_resource_group = terrainManager->GetDef().name + "-TerrnObjects";
-    Ogre::ResourceGroupManager::getSingleton().createResourceGroup(m_resource_group);
-
     m_procedural_manager = new ProceduralManager();
 }
 
@@ -89,8 +84,6 @@ TerrainObjectManager::~TerrainObjectManager()
 #endif //USE_PAGED
 
     App::GetGfxScene()->GetSceneManager()->destroyAllEntities();
-
-    Ogre::ResourceGroupManager::getSingleton().destroyResourceGroup(m_resource_group);
 }
 
 void GenerateGridAndPutToScene(Ogre::Vector3 position)
@@ -573,7 +566,7 @@ bool TerrainObjectManager::LoadTerrainObject(const Ogre::String& name, const Ogr
     if (odef->header.mesh_name != "none")
     {
         Str<100> ebuf; ebuf << m_entity_counter++ << "-" << odef->header.mesh_name;
-        mo = new MeshObject(odef->header.mesh_name, m_resource_group, ebuf.ToCStr(), tenode);
+        mo = new MeshObject(odef->header.mesh_name, terrainManager->getTerrainFileResourceGroup(), ebuf.ToCStr(), tenode);
         if (mo->getEntity())
         {
             mo->getEntity()->setCastShadows(odef->header.cast_shadows);

diff --git a/source/main/terrain/TerrainObjectManager.h b/source/main/terrain/TerrainObjectManager.h
@@ -164,7 +164,6 @@ class TerrainObjectManager
     Terrain*           terrainManager;
     ProceduralManagerPtr      m_procedural_manager;
     int                       m_entity_counter = 0;
-    std::string               m_resource_group;
 
 #ifdef USE_PAGED
     std::vector<Forests::PagedGeometry*> m_paged_geometry;