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

Compile error fix;RenderingInterface separated; buildStaticGeometry argument changed

Browse source
This commit is contained in:
Jason Hooks 2011-11-07 23:35:39 -05:00
parent c11b3a57c1
commit 469086747e
6 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/CMakeLists.txt
View file

@ -16,7 +16,7 @@ set(GAME_HEADER
source_group(game FILES ${GAME} ${GAME_HEADER}) source_group(game FILES ${GAME} ${GAME_HEADER})
add_openmw_dir (mwrender add_openmw_dir (mwrender
renderingmanager debugging cellimp interior exterior sky player npcs creatures objects renderingmanager debugging cellimp interior exterior sky player npcs creatures objects renderinginterface
) )
add_openmw_dir (mwinput add_openmw_dir (mwinput

9
apps/openmw/mwrender/objects.cpp
View file

@ -2,8 +2,9 @@
#include <OgreSceneNode.h> #include <OgreSceneNode.h>
#include <components/nifogre/ogre_nif_loader.hpp> #include <components/nifogre/ogre_nif_loader.hpp>
using namespace MWRender;
using namespace Ogre; using namespace Ogre;
using namespace MWRender;
bool Objects::lightConst = false; bool Objects::lightConst = false;
float Objects::lightConstValue = 0.0f; float Objects::lightConstValue = 0.0f;
@ -159,10 +160,10 @@ void Objects::removeCell(const MWWorld::Ptr& ptr){
sg = 0; sg = 0;
} }
} }
void Objects::buildStaticGeometry(const MWWorld::Ptr& ptr){ void Objects::buildStaticGeometry(ESMS::CellStore<MWWorld::RefData>& cell){
if(mSG.find(ptr.getCell()) != mSG.end()) if(mSG.find(&cell) != mSG.end())
{ {
Ogre::StaticGeometry* sg = mSG[ptr.getCell()]; Ogre::StaticGeometry* sg = mSG[&cell];
sg->build(); sg->build();
} }
} }

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

@ -5,8 +5,8 @@
#include <openengine/ogre/renderer.hpp> #include <openengine/ogre/renderer.hpp>
namespace MWRender{ namespace MWRender{
class Objects{ class Objects{
private:
OEngine::Render::OgreRenderer &mRend; OEngine::Render::OgreRenderer &mRend;
std::map<MWWorld::Ptr::CellStore *, Ogre::SceneNode *> mCellSceneNodes; std::map<MWWorld::Ptr::CellStore *, Ogre::SceneNode *> mCellSceneNodes;
std::map<MWWorld::Ptr::CellStore *, Ogre::StaticGeometry*> mSG; std::map<MWWorld::Ptr::CellStore *, Ogre::StaticGeometry*> mSG;
@ -34,7 +34,7 @@ public:
void insertLight (const MWWorld::Ptr& ptr, float r, float g, float b, float radius); void insertLight (const MWWorld::Ptr& ptr, float r, float g, float b, float radius);
void deleteObject (const std::string& handle); void deleteObject (const std::string& handle);
void removeCell(const MWWorld::Ptr& ptr); void removeCell(const MWWorld::Ptr& ptr);
void buildStaticGeometry(const MWWorld::Ptr& ptr); void buildStaticGeometry(ESMS::CellStore<MWWorld::RefData> &cell);
/// insert a light related to the most recent insertBegin call. /// insert a light related to the most recent insertBegin call.

12
apps/openmw/mwrender/renderinginterface.hpp Normal file
View file

@ -0,0 +1,12 @@
#include "objects.hpp"
#include "npcs.hpp"
#include "creatures.hpp"
namespace MWRender{
class RenderingInterface{
public:
virtual MWRender::Npcs& getNPCs() = 0;
virtual MWRender::Creatures& getCreatures() = 0;
virtual MWRender::Objects& getObjects() = 0;
virtual MWRender::Player& getPlayer() = 0;
};
}

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

@ -1,5 +1,4 @@
#include "renderingmanager.hpp" #include "renderingmanager.hpp"
#include "objects.hpp"
#include <assert.h> #include <assert.h>

14
apps/openmw/mwrender/renderingmanager.hpp
View file

@ -4,6 +4,7 @@
#include "sky.hpp" #include "sky.hpp"
#include "debugging.hpp" #include "debugging.hpp"
#include "renderinginterface.hpp"
#include <utility> #include <utility>
#include <openengine/ogre/renderer.hpp> #include <openengine/ogre/renderer.hpp>
@ -15,9 +16,8 @@
#include "../mwworld/ptr.hpp" #include "../mwworld/ptr.hpp"
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include "objects.hpp"
#include "npcs.hpp"
#include "creatures.hpp"
namespace Ogre namespace Ogre
{ {
@ -38,13 +38,7 @@ namespace MWWorld
namespace MWRender namespace MWRender
{ {
class Player; class Player;
class RenderingInterface{
public:
virtual MWRender::Npcs& getNPCs();
virtual MWRender::Creatures& getCreatures();
virtual MWRender::Objects& getObjects();
virtual MWRender::Player& getPlayer();
};
class RenderingManager: private RenderingInterface { class RenderingManager: private RenderingInterface {