mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-11 01:13:23 +00:00
Code Issues Projects Releases Wiki Activity

Don't use MWRender namespace in common terrain components

Browse Source
This commit is contained in:
bzzt 2019-02-20 13:37:00 +00:00 committed by Capostrophic
parent 5ffb40e8ba
commit 5bce3cbc68
6 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/terrain/cellborder.cpp
View File

@ -7,7 +7,7 @@
#include "world.hpp"
#include "../esm/loadland.hpp"
namespace MWRender
namespace Terrain
{
CellBorder::CellBorder(Terrain::World *world, osg::Group *root, int borderMask):

3
components/terrain/cellborder.hpp
View File

@ -7,10 +7,7 @@
namespace Terrain
{
class World;
}
namespace MWRender
{
/**
* @Brief Handles the debug cell borders.
*/

2
components/terrain/terraingrid.cpp
View File

@ -84,7 +84,7 @@ void TerrainGrid::loadCell(int x, int y)
void TerrainGrid::unloadCell(int x, int y)
{
MWRender::CellBorder::CellGrid::iterator it = mGrid.find(std::make_pair(x,y));
CellBorder::CellGrid::iterator it = mGrid.find(std::make_pair(x,y));
if (it == mGrid.end())
return;

2
components/terrain/terraingrid.hpp
View File

@ -33,7 +33,7 @@ namespace Terrain
// split each ESM::Cell into mNumSplits*mNumSplits terrain chunks
unsigned int mNumSplits;
MWRender::CellBorder::CellGrid mGrid;
CellBorder::CellGrid mGrid;
};
}

2
components/terrain/world.cpp
View File

@ -47,7 +47,7 @@ World::World(osg::Group* parent, osg::Group* compileRoot, Resource::ResourceSyst
mTextureManager.reset(new TextureManager(mResourceSystem->getSceneManager()));
mChunkManager.reset(new ChunkManager(mStorage, mResourceSystem->getSceneManager(), mTextureManager.get(), mCompositeMapRenderer));
mCellBorder.reset(new MWRender::CellBorder(this,mTerrainRoot.get(),borderMask));
mCellBorder.reset(new CellBorder(this,mTerrainRoot.get(),borderMask));
mResourceSystem->addResourceManager(mChunkManager.get());
mResourceSystem->addResourceManager(mTextureManager.get());

2
components/terrain/world.hpp
View File

@ -116,7 +116,7 @@ namespace Terrain
std::unique_ptr<TextureManager> mTextureManager;
std::unique_ptr<ChunkManager> mChunkManager;
std::unique_ptr<MWRender::CellBorder> mCellBorder;
std::unique_ptr<CellBorder> mCellBorder;
bool mBorderVisible;