Remove unused pointer to IncrementalCompileOperation

apps/opencs/view/render/cell.cpp

@@ -107,7 +107,7 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
 
             if (esmLand.getLandData (ESM::Land::DATA_VHGT))
             {
-                mTerrain.reset(new Terrain::TerrainGrid(mCellNode, mCellNode, data.getResourceSystem().get(), NULL, new TerrainStorage(mData), Mask_Terrain));
+                mTerrain.reset(new Terrain::TerrainGrid(mCellNode, mCellNode, data.getResourceSystem().get(), new TerrainStorage(mData), Mask_Terrain));
                 mTerrain->loadCell(esmLand.mX,
                                    esmLand.mY);
 

apps/openmw/mwrender/objects.hpp

@@ -15,11 +15,6 @@ namespace osg
     class Group;
 }
 
-namespace osgUtil
-{
-    class IncrementalCompileOperation;
-}
-
 namespace Resource
 {
     class ResourceSystem;

apps/openmw/mwrender/renderingmanager.cpp

@@ -215,10 +215,9 @@ namespace MWRender
 
 
         mTerrainStorage = new TerrainStorage(mResourceSystem, Settings::Manager::getString("normal map pattern", "Shaders"), Settings::Manager::getString("normal height map pattern", "Shaders"),
-                                            Settings::Manager::getBool("auto use terrain normal maps", "Shaders"),
+                                            Settings::Manager::getBool("auto use terrain normal maps", "Shaders"), Settings::Manager::getString("terrain specular map pattern", "Shaders"),
-                                            Settings::Manager::getString("terrain specular map pattern", "Shaders"), Settings::Manager::getBool("auto use terrain specular maps", "Shaders"));
+                                             Settings::Manager::getBool("auto use terrain specular maps", "Shaders"));
-        mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mRootNode, mResourceSystem, mViewer->getIncrementalCompileOperation(),
+        mTerrain.reset(new Terrain::TerrainGrid(sceneRoot, mRootNode, mResourceSystem, mTerrainStorage, Mask_Terrain, Mask_PreCompile));
-                                                mTerrainStorage, Mask_Terrain, Mask_PreCompile));
 
         mCamera.reset(new Camera(mViewer->getCamera()));
 

components/terrain/terraingrid.cpp

@@ -9,8 +9,8 @@
 namespace Terrain
 {
 
-TerrainGrid::TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, int preCompileMask)
+TerrainGrid::TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask)
-    : Terrain::World(parent, compileRoot, resourceSystem, ico, storage, nodeMask, preCompileMask)
+    : Terrain::World(parent, compileRoot, resourceSystem, storage, nodeMask, preCompileMask)
     , mNumSplits(4)
 {
 }

components/terrain/terraingrid.hpp

@@ -19,7 +19,7 @@ namespace Terrain
     class TerrainGrid : public Terrain::World
     {
     public:
-        TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico, Storage* storage, int nodeMask, int preCompileMask=~0);
+        TerrainGrid(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask=~0);
         ~TerrainGrid();
 
         /// Load a terrain cell and store it in cache for later use.

components/terrain/world.cpp

@@ -3,8 +3,6 @@
 #include <osg/Group>
 #include <osg/Material>
 
-#include <osgUtil/IncrementalCompileOperation>
-
 #include <components/resource/resourcesystem.hpp>
 
 #include "storage.hpp"
@@ -15,12 +13,10 @@
 namespace Terrain
 {
 
-World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico,
+World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask)
-             Storage* storage, int nodeMask, int preCompileMask)
     : mStorage(storage)
     , mParent(parent)
     , mResourceSystem(resourceSystem)
-    , mIncrementalCompileOperation(ico)
 {
     mTerrainRoot = new osg::Group;
     mTerrainRoot->setNodeMask(nodeMask);

components/terrain/world.hpp

@@ -15,11 +15,6 @@ namespace osg
     class Node;
 }
 
-namespace osgUtil
-{
-    class IncrementalCompileOperation;
-}
-
 namespace Resource
 {
     class ResourceSystem;
@@ -42,8 +37,8 @@ namespace Terrain
         /// @note takes ownership of \a storage
         /// @param storage Storage instance to get terrain data from (heights, normals, colors, textures..)
         /// @param nodeMask mask for the terrain root
-        World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, osgUtil::IncrementalCompileOperation* ico,
+        /// @param preCompileMask mask for pre compiling textures
-              Storage* storage, int nodeMask, int preCompileMask);
+        World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSystem* resourceSystem, Storage* storage, int nodeMask, int preCompileMask);
         virtual ~World();
 
         /// Apply the scene manager's texture filtering settings to all cached textures.
@@ -69,8 +64,6 @@ namespace Terrain
 
         Resource::ResourceSystem* mResourceSystem;
 
-        osg::ref_ptr<osgUtil::IncrementalCompileOperation> mIncrementalCompileOperation;
-
         std::auto_ptr<TextureManager> mTextureManager;
         std::auto_ptr<ChunkManager> mChunkManager;
     };