forked from teamnwah/openmw-tes3coop
Moved SkyManager creation
This commit is contained in:
parent
c52ae6825f
commit
d0f922ec5d
3 changed files with 5 additions and 7 deletions
|
@ -4,10 +4,9 @@ namespace MWRender {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
RenderingManager::RenderingManager (SkyManager *skyManager) :
|
RenderingManager::RenderingManager (Ogre::RenderWindow* window, Ogre::Camera* cam, const boost::filesystem2::path& resDir)
|
||||||
mSkyManager(skyManager)
|
|
||||||
{
|
{
|
||||||
|
mSkyManager = MWRender::SkyManager::create(window, cam, resDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
RenderingManager::~RenderingManager ()
|
RenderingManager::~RenderingManager ()
|
||||||
|
|
|
@ -7,13 +7,14 @@
|
||||||
#include "../mwworld/ptr.hpp"
|
#include "../mwworld/ptr.hpp"
|
||||||
#include <openengine/ogre/renderer.hpp>
|
#include <openengine/ogre/renderer.hpp>
|
||||||
#include <openengine/bullet/physic.hpp>
|
#include <openengine/bullet/physic.hpp>
|
||||||
|
#include <boost/filesystem.hpp>
|
||||||
|
|
||||||
namespace MWRender
|
namespace MWRender
|
||||||
{
|
{
|
||||||
|
|
||||||
class RenderingManager {
|
class RenderingManager {
|
||||||
public:
|
public:
|
||||||
RenderingManager(SkyManager *skyManager);
|
RenderingManager(Ogre::RenderWindow* window, Ogre::Camera* cam, const boost::filesystem2::path& resDir);
|
||||||
~RenderingManager();
|
~RenderingManager();
|
||||||
|
|
||||||
void removeCell (MWWorld::Ptr::CellStore *store); // TODO do we want this?
|
void removeCell (MWWorld::Ptr::CellStore *store); // TODO do we want this?
|
||||||
|
|
|
@ -207,9 +207,7 @@ namespace MWWorld
|
||||||
mPhysEngine = physEng;
|
mPhysEngine = physEng;
|
||||||
|
|
||||||
mWorldScene = new Scene(environment, this, mScene, mPhysics);
|
mWorldScene = new Scene(environment, this, mScene, mPhysics);
|
||||||
mRenderingManager = new MWRender::RenderingManager(
|
mRenderingManager = new MWRender::RenderingManager(renderer.getWindow(), mScene.getCamera(), resDir);
|
||||||
MWRender::SkyManager::create(renderer.getWindow(), mScene.getCamera(), resDir)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
World::~World()
|
World::~World()
|
||||||
|
|
Loading…
Reference in a new issue