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

unlocking change and stop change

Browse source
This commit is contained in:
Jason Hooks 2011-12-28 17:34:47 -05:00
parent baa3f51886
commit c8cca06b40
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwrender/animation.cpp
View file

@ -40,7 +40,8 @@ namespace MWRender{
shapeNumber = 0;
std::vector<Nif::NiTriShapeCopy>::iterator allshapesiter;
for(allshapesiter = allshapes->begin(); allshapesiter != allshapes->end(); allshapesiter++)
{
{
Nif::NiTriShapeCopy& copy = *allshapesiter;
std::vector<Ogre::Vector3> allvertices = copy.vertices;
@ -261,21 +262,9 @@ namespace MWRender{
}
}
}
for(allshapesiter = allshapes->begin(); allshapesiter != allshapes->end(); allshapesiter++)
{
Nif::NiTriShapeCopy copy = *allshapesiter;
Ogre::HardwareVertexBufferSharedPtr vbuf = creaturemodel->getMesh()->getSubMesh(copy.sname)->vertexData->vertexBufferBinding->getBuffer(0);
Ogre::HardwareVertexBufferSharedPtr vbufNormal = creaturemodel->getMesh()->getSubMesh(copy.sname)->vertexData->vertexBufferBinding->getBuffer(1);
vbuf->unlock();
vbuf->unlock();
vbufNormal->unlock();
}
}
}
bool Animation::timeIndex( float time, std::vector<float> times, int & i, int & j, float & x ){

7
apps/openmw/mwrender/creatureanimation.cpp
View file

@ -49,7 +49,12 @@ void CreatureAnimation::runAnimation(float timepassed){
//Handle the shapes dependent on animation transforms
time += timepassed;
if(time > transformations->begin()->getStopTime()){
animate = false;
std::cout << "Stopping the animation\n";
return;
}
handleAnimationTransforms();
handleShapes(shapes, base, base->getSkeleton());