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

removed some redundant (and misplaced) functions

Browse source
This commit is contained in:
Marc Zinnschlag 2012-01-24 10:45:40 +01:00
parent 26c328e73f
commit 4b6cd582a7
3 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/openmw/mwrender/npcanimation.cpp
View file

@ -269,22 +269,6 @@ void NpcAnimation::runAnimation(float timepassed){
handleAnimationTransforms(); handleAnimationTransforms();
Ogre::Vector3 current = insert->_getWorldAABB().getCenter(); Ogre::Vector3 current = insert->_getWorldAABB().getCenter();
//This is the attempt at npc physics
//mEnvironment.mWorld->setObjectPhysicsPosition(insert->getName(), current);
/*if(base->hasSkeleton())
{
Ogre::Quaternion boneQuat = rotate;
Ogre::Vector3 boneTrans = trans;
mEnvironment.mWorld->setObjectPhysicsPosition(insert->getName(), boneTrans + insert->getPosition());
//mEnvironment.mWorld->setObjectPhysicsRotation(insert->getName(), boneQuat * insert->getOrientation());
}*/
std::vector<std::vector<Nif::NiTriShapeCopy>*>::iterator shapepartsiter = shapeparts.begin(); std::vector<std::vector<Nif::NiTriShapeCopy>*>::iterator shapepartsiter = shapeparts.begin();
std::vector<Ogre::Entity*>::iterator entitypartsiter = entityparts.begin(); std::vector<Ogre::Entity*>::iterator entitypartsiter = entityparts.begin();
while(shapepartsiter != shapeparts.end()) while(shapepartsiter != shapeparts.end())
@ -301,7 +285,7 @@ void NpcAnimation::runAnimation(float timepassed){
handleShapes(shapes, theentity, theentity->getSkeleton()); handleShapes(shapes, theentity, theentity->getSkeleton());
shapepartsiter++; shapepartsiter++;
entitypartsiter++; entitypartsiter++;
} }
} }
} }

6
apps/openmw/mwworld/world.cpp
View file

@ -684,12 +684,6 @@ namespace MWWorld
{ {
mRendering.skipAnimation (ptr); mRendering.skipAnimation (ptr);
} }
void World::setObjectPhysicsRotation(const std::string& handle, Ogre::Quaternion quat){
mPhysics->rotateObject(handle, quat);
}
void World::setObjectPhysicsPosition(const std::string& handle, Ogre::Vector3 vec){
mPhysics->moveObject(handle, vec);
}
void World::update (float duration) void World::update (float duration)
{ {

2
apps/openmw/mwworld/world.hpp
View file

@ -222,8 +222,6 @@ namespace MWWorld
void skipAnimation (const MWWorld::Ptr& ptr); void skipAnimation (const MWWorld::Ptr& ptr);
///< Skip the animation for the given MW-reference for one frame. Calls to this function for ///< Skip the animation for the given MW-reference for one frame. Calls to this function for
/// references that are currently not in the rendered scene should be ignored. /// references that are currently not in the rendered scene should be ignored.
void setObjectPhysicsRotation(const std::string& handle,Ogre::Quaternion quat);
void setObjectPhysicsPosition(const std::string& handle,Ogre::Vector3 vector);
void update (float duration); void update (float duration);
}; };