teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 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

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

@ -40,6 +40,7 @@ namespace MWRender{
shapeNumber = 0; shapeNumber = 0;
std::vector<Nif::NiTriShapeCopy>::iterator allshapesiter; std::vector<Nif::NiTriShapeCopy>::iterator allshapesiter;
for(allshapesiter = allshapes->begin(); allshapesiter != allshapes->end(); allshapesiter++) for(allshapesiter = allshapes->begin(); allshapesiter != allshapes->end(); allshapesiter++)
{ {
Nif::NiTriShapeCopy& copy = *allshapesiter; Nif::NiTriShapeCopy& copy = *allshapesiter;
@ -261,22 +262,10 @@ 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(); vbufNormal->unlock();
} }
} }
bool Animation::timeIndex( float time, std::vector<float> times, int & i, int & j, float & x ){ bool Animation::timeIndex( float time, std::vector<float> times, int & i, int & j, float & x ){
int count; int count;

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

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