mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

some code cleanup

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-11-06 13:08:25 +01:00
parent d661d4f6d6
commit 6d5333be05
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/openmw/mwrender/renderingmanager.cpp
View File

@ -242,13 +242,7 @@ void RenderingManager::addObject (const MWWorld::Ptr& ptr){
void RenderingManager::removeObject (const MWWorld::Ptr& ptr) void RenderingManager::removeObject (const MWWorld::Ptr& ptr)
{ {
if (!mObjects.deleteObject (ptr)) if (!mObjects.deleteObject (ptr))
{ mActors.deleteObject (ptr);
/// \todo delete non-object MW-references
}
if (!mActors.deleteObject (ptr))
{
/// \todo delete non-object MW-references
}
} }
void RenderingManager::moveObject (const MWWorld::Ptr& ptr, const Ogre::Vector3& position) void RenderingManager::moveObject (const MWWorld::Ptr& ptr, const Ogre::Vector3& position)
@ -292,9 +286,11 @@ bool RenderingManager::rotateObject( const MWWorld::Ptr &ptr, Ogre::Vector3 &rot
} }
else if (adjust) else if (adjust)
{ {
/// \note Stored and passed in radians // Stored and passed in radians
float *f = ptr.getRefData().getPosition().rot; float *f = ptr.getRefData().getPosition().rot;
rot.x += f[0], rot.y += f[1], rot.z += f[2]; rot.x += f[0];
rot.y += f[1];
rot.z += f[2];
} }
return force; return force;
} }
@ -365,7 +361,7 @@ void RenderingManager::update (float duration, bool paused)
float *fpos = data.getPosition().pos; float *fpos = data.getPosition().pos;
/// \note only for LocalMap::updatePlayer() // only for LocalMap::updatePlayer()
Ogre::Vector3 pos(fpos[0], -fpos[2], -fpos[1]); Ogre::Vector3 pos(fpos[0], -fpos[2], -fpos[1]);
Ogre::SceneNode *node = data.getBaseNode(); Ogre::SceneNode *node = data.getBaseNode();