mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-21 07:31:21 +02:00
Code Issues Projects Releases Wiki Activity

Now the anim is expanded to the whole length for non cycled anims. To demonstrate we have growing reed ...

Browse Source
This commit is contained in:
Titus Tscharntke
2011-07-17 17:16:16 +00:00
parent 6437d79aa4
commit b215f88a29
1 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/shared_lib/sources/graphics/interpolation.cpp
View File

@@ -102,9 +102,22 @@ void InterpolationData::updateVertices(float t, bool cycle) {
const Vec3f *meshVertices= mesh->getVertices(); const Vec3f *meshVertices= mesh->getVertices();
//misc vars //misc vars
uint32 prevFrame= min<uint32>(static_cast<uint32>(t*frameCount), frameCount-1); uint32 prevFrame;
uint32 nextFrame= cycle? (prevFrame+1) % frameCount: min(prevFrame+1, frameCount-1); uint32 nextFrame;
float localT= t*frameCount - prevFrame; float localT;
if(cycle == true) {
prevFrame= min<uint32>(static_cast<uint32>(t*frameCount), frameCount-1);
nextFrame= (prevFrame+1) % frameCount;
localT= t*frameCount - prevFrame;
}
else {
prevFrame= min<uint32> (static_cast<uint32> (t * (frameCount-1)), frameCount - 2);
nextFrame= min(prevFrame + 1, frameCount - 1);
localT= t * (frameCount-1) - prevFrame;
//printf(" prevFrame=%d nextFrame=%d localT=%f\n",prevFrame,nextFrame,localT);
}
uint32 prevFrameBase= prevFrame*vertexCount; uint32 prevFrameBase= prevFrame*vertexCount;
uint32 nextFrameBase= nextFrame*vertexCount; uint32 nextFrameBase= nextFrame*vertexCount;
@@ -145,9 +158,22 @@ void InterpolationData::updateNormals(float t, bool cycle){
const Vec3f *meshNormals= mesh->getNormals(); const Vec3f *meshNormals= mesh->getNormals();
//misc vars //misc vars
uint32 prevFrame= min<uint32>(static_cast<uint32>(t*frameCount), frameCount-1); uint32 prevFrame;
uint32 nextFrame= cycle? (prevFrame+1) % frameCount: min(prevFrame+1, frameCount-1); uint32 nextFrame;
float localT= t*frameCount - prevFrame; float localT;
if(cycle == true) {
prevFrame= min<uint32>(static_cast<uint32>(t*frameCount), frameCount-1);
nextFrame= (prevFrame+1) % frameCount;
localT= t*frameCount - prevFrame;
}
else {
prevFrame= min<uint32> (static_cast<uint32> (t * (frameCount-1)), frameCount - 2);
nextFrame= min(prevFrame + 1, frameCount - 1);
localT= t * (frameCount-1) - prevFrame;
//printf(" prevFrame=%d nextFrame=%d localT=%f\n",prevFrame,nextFrame,localT);
}
uint32 prevFrameBase= prevFrame*vertexCount; uint32 prevFrameBase= prevFrame*vertexCount;
uint32 nextFrameBase= nextFrame*vertexCount; uint32 nextFrameBase= nextFrame*vertexCount;