teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Singleton wrapper for Ogre OverlaySystem.

Browse source
This commit is contained in:
cc9cii 2014-10-14 13:21:43 +11:00
parent 57b337d368
commit 994420aa57
3 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/opencs/view/render/overlaysystem.hpp Normal file
View file

@ -0,0 +1,36 @@
#ifndef OPENCS_VIEW_OVERLAYSYSTEM_H
#define OPENCS_VIEW_OVERLAYSYSTEM_H
#include <OgreOverlaySystem.h>
namespace CSVRender
{
class OverlaySystem
{
Ogre::OverlaySystem *mOverlaySystem;
OverlaySystem() {
mOverlaySystem = new Ogre::OverlaySystem();
}
~OverlaySystem() {
delete mOverlaySystem;
}
OverlaySystem(OverlaySystem const&);
void operator=(OverlaySystem const&);
public:
static OverlaySystem &instance() {
static OverlaySystem mInstance;
return mInstance;
}
Ogre::OverlaySystem *get() {
return mOverlaySystem;
}
};
}
#endif // OPENCS_VIEW_OVERLAYSYSTEM_H

7
apps/opencs/view/render/scenewidget.cpp
View file

@ -11,18 +11,16 @@
#include <OgreCamera.h>
#include <OgreSceneNode.h>
#include <OgreViewport.h>
#include <OgreOverlaySystem.h>
#include "../widget/scenetoolmode.hpp"
#include "../../model/settings/usersettings.hpp"
#include "navigation.hpp"
#include "lighting.hpp"
#include "overlaysystem.hpp"
namespace CSVRender
{
Ogre::OverlaySystem *SceneWidget::mOverlaySystem = NULL;
SceneWidget::SceneWidget(QWidget *parent)
: QWidget(parent)
, mCamera(NULL)
@ -62,8 +60,7 @@ namespace CSVRender
setLighting (&mLightingDay);
if(!mOverlaySystem)
mOverlaySystem = new Ogre::OverlaySystem();
mOverlaySystem = OverlaySystem::instance().get();
mSceneMgr->addRenderQueueListener(mOverlaySystem);
QTimer *timer = new QTimer (this);

2
apps/opencs/view/render/scenewidget.hpp
View file

@ -97,7 +97,7 @@ namespace CSVRender
Ogre::SceneManager* mSceneMgr;
Ogre::RenderWindow* mWindow;
Ogre::Viewport *mViewport;
static Ogre::OverlaySystem *mOverlaySystem;
Ogre::OverlaySystem *mOverlaySystem;
Navigation *mNavigation;
Lighting *mLighting;