mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 12:53:53 +00:00
Code Issues Releases Wiki Activity

Make insertBegin internal

Browse source
This commit is contained in:
Chris Robinson 2013-08-07 03:51:57 -07:00
parent 2b2101958d
commit 076e7d8e16
18 changed files with 28 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwclass/apparatus.cpp
View file

@ -25,9 +25,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

4
apps/openmw/mwclass/armor.cpp
View file

@ -30,9 +30,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

4
apps/openmw/mwclass/book.cpp
View file

@ -23,9 +23,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

4
apps/openmw/mwclass/clothing.cpp
View file

@ -27,9 +27,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

4
apps/openmw/mwclass/container.cpp
View file

@ -61,9 +61,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

4
apps/openmw/mwclass/door.cpp
View file

@ -29,9 +29,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

4
apps/openmw/mwclass/ingredient.cpp
View file

@ -36,9 +36,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

16
apps/openmw/mwclass/light.cpp
View file

@ -26,18 +26,10 @@ namespace MWClass
{
void Light::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
{
MWWorld::LiveCellRef<ESM::Light> *ref =
ptr.get<ESM::Light>();
assert (ref->mBase != NULL);
const std::string &model = ref->mBase->mModel;
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
if(!model.empty())
objects.insertMesh(ptr, "meshes\\" + model);
else
objects.insertMesh(ptr, "");
const std::string model = getModel(ptr);
if(!model.empty()) {
renderingInterface.getObjects().insertModel(ptr, model);
}
}
void Light::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const

4
apps/openmw/mwclass/lockpick.cpp
View file

@ -26,9 +26,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

4
apps/openmw/mwclass/misc.cpp
View file

@ -42,9 +42,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

4
apps/openmw/mwclass/potion.cpp
View file

@ -28,9 +28,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

4
apps/openmw/mwclass/probe.cpp
View file

@ -26,9 +26,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

4
apps/openmw/mwclass/repair.cpp
View file

@ -25,9 +25,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

4
apps/openmw/mwclass/static.cpp
View file

@ -15,9 +15,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

4
apps/openmw/mwclass/weapon.cpp
View file

@ -33,9 +33,7 @@ namespace MWClass
{
const std::string model = getModel(ptr);
if (!model.empty()) {
MWRender::Objects& objects = renderingInterface.getObjects();
objects.insertBegin(ptr);
objects.insertMesh(ptr, model);
renderingInterface.getObjects().insertModel(ptr, model);
}
}

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

@ -27,6 +27,8 @@ namespace MWRender
CellSceneNodeMap mCellSceneNodes;
PtrAnimationMap mAllActors;
void insertBegin(const MWWorld::Ptr &ptr);
public:
Actors(OEngine::Render::OgreRenderer& _rend, MWRender::RenderingManager* rendering)
: mRend(_rend)
@ -36,7 +38,7 @@ namespace MWRender
~Actors();
void setRootNode(Ogre::SceneNode* root);
void insertBegin (const MWWorld::Ptr& ptr);
void insertNPC(const MWWorld::Ptr& ptr, MWWorld::InventoryStore& inv);
void insertCreature (const MWWorld::Ptr& ptr);
void insertActivator (const MWWorld::Ptr& ptr);

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

@ -29,7 +29,7 @@ void Objects::setRootNode(Ogre::SceneNode* root)
mRootNode = root;
}
void Objects::insertBegin (const MWWorld::Ptr& ptr)
void Objects::insertBegin(const MWWorld::Ptr& ptr)
{
Ogre::SceneNode* root = mRootNode;
Ogre::SceneNode* cellnode;
@ -69,16 +69,15 @@ void Objects::insertBegin (const MWWorld::Ptr& ptr)
ptr.getRefData().setBaseNode(insert);
}
void Objects::insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh)
void Objects::insertModel(const MWWorld::Ptr &ptr, const std::string &mesh)
{
Ogre::SceneNode* insert = ptr.getRefData().getBaseNode();
assert(insert);
insertBegin(ptr);
std::auto_ptr<ObjectAnimation> anim(new ObjectAnimation(ptr, mesh));
Ogre::AxisAlignedBox bounds = anim->getWorldBounds();
Ogre::Vector3 extents = bounds.getSize();
extents *= insert->getScale();
extents *= ptr.getRefData().getBaseNode()->getScale();
float size = std::max(std::max(extents.x, extents.y), extents.z);
bool small = (size < Settings::Manager::getInt("small object size", "Viewing distance")) &&

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

@ -31,14 +31,15 @@ class Objects{
static int uniqueID;
void insertBegin(const MWWorld::Ptr& ptr);
public:
Objects(OEngine::Render::OgreRenderer &renderer)
: mRenderer(renderer)
, mRootNode(NULL)
{}
~Objects(){}
void insertBegin (const MWWorld::Ptr& ptr);
void insertMesh (const MWWorld::Ptr& ptr, const std::string& mesh);
void insertModel(const MWWorld::Ptr& ptr, const std::string &model);
void enableLights();
void disableLights();