mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 11:06:43 +00:00
Code Issues Releases Wiki Activity

Remove unused pointer to IncrementalCompileOperation

Browse source
This commit is contained in:
scrawl 2017-03-07 17:25:23 +01:00
parent c487df0abb
commit 14225a42c6
7 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/view/render/cell.cpp
View file

@ -107,7 +107,7 @@ CSVRender::Cell::Cell (CSMWorld::Data& data, osg::Group* rootNode, const std::st
if (esmLand.getLandData (ESM::Land::DATA_VHGT)) 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, mTerrain->loadCell(esmLand.mX,
esmLand.mY); esmLand.mY);

5
apps/openmw/mwrender/objects.hpp
View file

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

7
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -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"), 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())); mCamera.reset(new Camera(mViewer->getCamera()));

4
components/terrain/terraingrid.cpp
View file

@ -9,8 +9,8 @@
namespace Terrain 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) , mNumSplits(4)
{ {
} }

2
components/terrain/terraingrid.hpp
View file

@ -19,7 +19,7 @@ namespace Terrain
class TerrainGrid : public Terrain::World class TerrainGrid : public Terrain::World
{ {
public: 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(); ~TerrainGrid();
/// Load a terrain cell and store it in cache for later use. /// Load a terrain cell and store it in cache for later use.

6
components/terrain/world.cpp
View file

@ -3,8 +3,6 @@
#include <osg/Group> #include <osg/Group>
#include <osg/Material> #include <osg/Material>
#include <osgUtil/IncrementalCompileOperation>
#include <components/resource/resourcesystem.hpp> #include <components/resource/resourcesystem.hpp>
#include "storage.hpp" #include "storage.hpp"
@ -15,12 +13,10 @@
namespace Terrain 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) : mStorage(storage)
, mParent(parent) , mParent(parent)
, mResourceSystem(resourceSystem) , mResourceSystem(resourceSystem)
, mIncrementalCompileOperation(ico)
{ {
mTerrainRoot = new osg::Group; mTerrainRoot = new osg::Group;
mTerrainRoot->setNodeMask(nodeMask); mTerrainRoot->setNodeMask(nodeMask);

11
components/terrain/world.hpp
View file

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