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

Create a separate scenemanager for each CharacterPreview instance

Browse source
This commit is contained in:
Jordan Milne 2013-01-09 01:44:15 -04:00
parent 39d27b87c9
commit 857bb42297
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -67,7 +67,7 @@ namespace MWGui
setCoord(0, 342, 498, 258); setCoord(0, 342, 498, 258);
MWBase::Environment::get().getWorld ()->setupExternalRendering (mPreview); mPreview.setup();
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer(); MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
openContainer(player); openContainer(player);

2
apps/openmw/mwgui/race.cpp
View file

@ -106,7 +106,7 @@ void RaceDialog::open()
updateSpellPowers(); updateSpellPowers();
mPreview = new MWRender::RaceSelectionPreview(); mPreview = new MWRender::RaceSelectionPreview();
MWBase::Environment::get().getWorld ()->setupExternalRendering (*mPreview); mPreview->setup();
mPreview->update (0); mPreview->update (0);
const ESM::NPC proto = mPreview->getPrototype(); const ESM::NPC proto = mPreview->getPrototype();

13
apps/openmw/mwrender/characterpreview.cpp
View file

@ -2,6 +2,7 @@
#include <OgreSceneManager.h> #include <OgreSceneManager.h>
#include <OgreRoot.h>
#include <OgreHardwarePixelBuffer.h> #include <OgreHardwarePixelBuffer.h>
#include <libs/openengine/ogre/selectionbuffer.hpp> #include <libs/openengine/ogre/selectionbuffer.hpp>
@ -35,13 +36,18 @@ namespace MWRender
} }
void CharacterPreview::setup (Ogre::SceneManager *sceneManager) void CharacterPreview::setup ()
{ {
mSceneMgr = sceneManager; mSceneMgr = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC);
mCamera = mSceneMgr->createCamera (mName); mCamera = mSceneMgr->createCamera (mName);
mCamera->setAspectRatio (float(mSizeX) / float(mSizeY)); mCamera->setAspectRatio (float(mSizeX) / float(mSizeY));
mNode = static_cast<Ogre::SceneNode*>(mSceneMgr->getRootSceneNode()->getChild("mwRoot"))->createChildSceneNode (); Ogre::SceneNode* renderRoot = mSceneMgr->getRootSceneNode()->createChildSceneNode("renderRoot");
//we do this with mwRoot in renderingManager, do it here too.
renderRoot->pitch(Ogre::Degree(-90));
mNode = renderRoot->createChildSceneNode();
mAnimation = new NpcAnimation(mCharacter, mNode, mAnimation = new NpcAnimation(mCharacter, mNode,
MWWorld::Class::get(mCharacter).getInventoryStore (mCharacter), RV_PlayerPreview); MWWorld::Class::get(mCharacter).getInventoryStore (mCharacter), RV_PlayerPreview);
@ -79,6 +85,7 @@ namespace MWRender
//Ogre::TextureManager::getSingleton().remove(mName); //Ogre::TextureManager::getSingleton().remove(mName);
mSceneMgr->destroyCamera (mName); mSceneMgr->destroyCamera (mName);
delete mAnimation; delete mAnimation;
Ogre::Root::getSingleton().destroySceneManager(mSceneMgr);
} }
void CharacterPreview::rebuild() void CharacterPreview::rebuild()

4
apps/openmw/mwrender/characterpreview.hpp
View file

@ -23,14 +23,14 @@ namespace MWRender
class NpcAnimation; class NpcAnimation;
class CharacterPreview : public ExternalRendering class CharacterPreview
{ {
public: public:
CharacterPreview(MWWorld::Ptr character, int sizeX, int sizeY, const std::string& name, CharacterPreview(MWWorld::Ptr character, int sizeX, int sizeY, const std::string& name,
Ogre::Vector3 position, Ogre::Vector3 lookAt); Ogre::Vector3 position, Ogre::Vector3 lookAt);
virtual ~CharacterPreview(); virtual ~CharacterPreview();
virtual void setup (Ogre::SceneManager *sceneManager); virtual void setup ();
virtual void onSetup(); virtual void onSetup();
virtual void rebuild(); virtual void rebuild();