libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TWINE: unified animation code

Browse Source
This commit is contained in:
Martin Gerhardy 2020-12-12 12:36:42 +01:00
parent 123d8a163c
commit cbbfea5a33
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
engines/twine/animations.cpp
View File

@ -154,7 +154,7 @@ bool Animations::setModelAnimation(int32 animState, const uint8 *animPtr, uint8
if (!Model::isAnimated(bodyPtr)) {
return false;
}
int32 numOfPointInAnim = getNumBoneframes(animPtr);
int32 numOfBonesInAnim = getNumBoneframes(animPtr);
const uint8 *keyFramePtr = getKeyFrameData(animState, animPtr);
const int32 keyFrameLength = getKeyFrameLength(animState, animPtr);
@ -171,8 +171,8 @@ bool Animations::setModelAnimation(int32 animState, const uint8 *animPtr, uint8
uint8 *bonesBase = verticesBase + 2 + numVertices * 6;
const int32 numBones = READ_LE_INT16(bonesBase);
if (numOfPointInAnim > numBones) {
numOfPointInAnim = numBones;
if (numOfBonesInAnim > numBones) {
numOfBonesInAnim = numBones;
}
const int32 deltaTime = _engine->lbaTime - remainingFrameTime;
@ -186,18 +186,16 @@ bool Animations::setModelAnimation(int32 animState, const uint8 *animPtr, uint8
uint8 *bonesPtr = bonesBase + 8 + 2;
if (deltaTime >= keyFrameLength) {
const int32 *sourcePtr = (const int32 *)(keyFramePtr + 8);
int32 *destPtr = (int32 *)bonesPtr; // keyframe
do {
*(destPtr++) = *(sourcePtr++);
*(destPtr++) = *(sourcePtr++);
destPtr = (int32 *)(((int8 *)destPtr) + 30);
} while (--numOfPointInAnim);
const uint8 *ptrToData = keyFramePtr + 8;
for (int32 i = 0; i < numOfBonesInAnim; ++i) {
for (int32 j = 0; j < 8; j++) {
*bonesPtr++ = *ptrToData++;
}
bonesPtr += 30;
}
animTimerDataPtr->ptr = keyFramePtr;
animTimerDataPtr->time = _engine->lbaTime;
return true;
}
@ -208,8 +206,8 @@ bool Animations::setModelAnimation(int32 animState, const uint8 *animPtr, uint8
bonesPtr += 38;
if (--numOfPointInAnim) {
int16 tmpNumOfPoints = numOfPointInAnim;
if (numOfBonesInAnim > 0) {
int16 tmpNumOfPoints = numOfBonesInAnim - 1;
do {
const int16 animOpcode = getAnimMode(&bonesPtr, &keyFramePtr, &lastKeyFramePtr);