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

Made recommended changes

Browse source
This commit is contained in:
Jason Hooks 2011-11-01 13:46:57 -04:00
parent f1bc5b0ab6
commit 3d43a4cd33
4 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,15 +2,12 @@
using namespace MWRender; using namespace MWRender;
void Objects::insertBegin (ESM::CellRef &ref, bool static_){ void Objects::insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_){
} }
void Objects::insertMesh(const std::string &mesh){ void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh){
} }
void Objects::insertLight(float r, float g, float b, float radius){ void Objects::insertLight (const MWWorld::Ptr& ptr, float r, float g, float b, float radius){
} }
void Objects::insertObjectPhysics(){
}

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

@ -1,18 +1,20 @@
#include "components/esm_store/cell_store.hpp" #include "components/esm_store/cell_store.hpp"
#include "../mwworld/refdata.hpp" #include "../mwworld/refdata.hpp"
#include "../mwworld/ptr.hpp"
namespace MWRender{ namespace MWRender{
class Objects{ class Objects{
private:
OEngine::Render::OgreRenderer &rend;
public: public:
Objects(){} Objects(OEngine::Render::OgreRenderer& _rend): rend(_rend){}
~Objects(){} ~Objects(){}
void insertBegin (ESM::CellRef &ref, bool static_ = false); void insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_);
void insertMesh(const std::string &mesh); void insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh);
void insertLight (const MWWorld::Ptr& ptr, float r, float g, float b, float radius);
/// insert a light related to the most recent insertBegin call. /// insert a light related to the most recent insertBegin call.
void insertLight(float r, float g, float b, float radius);
void insertObjectPhysics();
}; };
} }

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

@ -77,8 +77,8 @@ MWRender::Objects& RenderingManager::getObjects(){
MWRender::Creatures& RenderingManager::getCreatures(){ MWRender::Creatures& RenderingManager::getCreatures(){
return creatures; return creatures;
} }
MWRender::Player* RenderingManager::getPlayer(){ MWRender::Player& RenderingManager::getPlayer(){
return mPlayer; return (*mPlayer);
} }

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

@ -43,7 +43,7 @@ namespace MWRender
virtual MWRender::Npcs& getNPCs(); virtual MWRender::Npcs& getNPCs();
virtual MWRender::Creatures& getCreatures(); virtual MWRender::Creatures& getCreatures();
virtual MWRender::Objects& getObjects(); virtual MWRender::Objects& getObjects();
virtual MWRender::Player* getPlayer(); virtual MWRender::Player& getPlayer();
}; };
class RenderingManager: private RenderingInterface { class RenderingManager: private RenderingInterface {
@ -71,7 +71,7 @@ class RenderingManager: private RenderingInterface {
virtual MWRender::Npcs& getNPCs(); virtual MWRender::Npcs& getNPCs();
virtual MWRender::Creatures& getCreatures(); virtual MWRender::Creatures& getCreatures();
virtual MWRender::Objects& getObjects(); virtual MWRender::Objects& getObjects();
virtual MWRender::Player* getPlayer(); virtual MWRender::Player& getPlayer();
bool toggleRenderMode(int mode); bool toggleRenderMode(int mode);
void removeCell (MWWorld::Ptr::CellStore *store); // TODO do we want this? void removeCell (MWWorld::Ptr::CellStore *store); // TODO do we want this?