libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TWINE: model helper functions

Browse Source
This commit is contained in:
Martin Gerhardy 2020-12-13 17:57:03 +01:00
parent 628df7be6e
commit 7050c8225f
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/twine/animations.cpp
View File

@ -127,7 +127,7 @@ int32 Animations::getAnimMode(uint8 *ptr, const uint8 *keyFramePtr) {
return opcode;
}
bool Animations::setModelAnimation(int32 keyframeIdx, const uint8 *animPtr, uint8 *bodyPtr, AnimTimerDataStruct *animTimerDataPtr) {
bool Animations::setModelAnimation(int32 keyframeIdx, const uint8 *animPtr, uint8 *const bodyPtr, AnimTimerDataStruct *animTimerDataPtr) {
if (!Model::isAnimated(bodyPtr)) {
return false;
}
@ -161,12 +161,11 @@ bool Animations::setModelAnimation(int32 keyframeIdx, const uint8 *animPtr, uint
if (deltaTime >= keyFrameLength) {
for (int32 i = 0; i < numOfBonesInAnim; ++i) {
const BoneFrame &boneframe = keyFrame->boneframes[i];
uint8 *bonesPtr = Model::getBonesStateData(bodyPtr, 0);
uint8 *bonesPtr = Model::getBonesStateData(bodyPtr, i);
WRITE_LE_UINT16(bonesPtr + 0, boneframe.type);
WRITE_LE_INT16(bonesPtr + 2, boneframe.x);
WRITE_LE_INT16(bonesPtr + 4, boneframe.y);
WRITE_LE_INT16(bonesPtr + 6, boneframe.z);
bonesPtr += 38;
}
animTimerDataPtr->ptr = keyFramePtr;
@ -213,7 +212,7 @@ bool Animations::setModelAnimation(int32 keyframeIdx, const uint8 *animPtr, uint
return false;
}
void Animations::setAnimAtKeyframe(int32 keyframeIdx, const uint8 *animPtr, uint8 *bodyPtr, AnimTimerDataStruct *animTimerDataPtr) {
void Animations::setAnimAtKeyframe(int32 keyframeIdx, const uint8 *animPtr, uint8 *const bodyPtr, AnimTimerDataStruct *animTimerDataPtr) {
if (!Model::isAnimated(bodyPtr)) {
return;
}
@ -238,7 +237,6 @@ void Animations::setAnimAtKeyframe(int32 keyframeIdx, const uint8 *animPtr, uint
animTimerDataPtr->time = _engine->lbaTime;
const int16 numBones = Model::getNumBones(bodyPtr);
uint8 *bonesPtr = Model::getBonesStateData(bodyPtr, 0);
int16 numOfBonesInAnim = animData.getNumBoneframes();
if (numOfBonesInAnim > numBones) {
@ -247,11 +245,11 @@ void Animations::setAnimAtKeyframe(int32 keyframeIdx, const uint8 *animPtr, uint
for (int32 i = 0; i < numOfBonesInAnim; ++i) {
const BoneFrame &boneframe = keyFrame->boneframes[i];
uint8 *bonesPtr = Model::getBonesStateData(bodyPtr, i);
WRITE_LE_UINT16(bonesPtr + 0, boneframe.type);
WRITE_LE_INT16(bonesPtr + 2, boneframe.x);
WRITE_LE_INT16(bonesPtr + 4, boneframe.y);
WRITE_LE_INT16(bonesPtr + 6, boneframe.z);
bonesPtr += 38;
}
return;
@ -271,7 +269,7 @@ void Animations::stockAnimation(const uint8 *bodyPtr, AnimTimerDataStruct *animT
uint8 *bonesPtr = animBufferPos + 8;
for (int32 i = 0; i < numBones; ++i) {
// these are 4 int16 values
// these are 4 int16 values, type, x, y and z
for (int32 j = 0; j < 8; j++) {
*bonesPtr++ = *ptrToData++;
}

4
engines/twine/animations.h
View File

@ -77,7 +77,7 @@ public:
* @param bodyPtr Body model poitner
* @param animTimerDataPtr Animation time data
*/
void setAnimAtKeyframe(int32 keyframeIdx, const uint8 *animPtr, uint8 *bodyPtr, AnimTimerDataStruct *animTimerDataPtr);
void setAnimAtKeyframe(int32 keyframeIdx, const uint8 *animPtr, uint8 *const bodyPtr, AnimTimerDataStruct *animTimerDataPtr);
const uint8* getKeyFrameData(int32 frameIdx, const uint8 *animPtr);
@ -100,7 +100,7 @@ public:
* @param bodyPtr Body model poitner
* @param animTimerDataPtr Animation time data
*/
bool setModelAnimation(int32 keyframeIdx, const uint8 *animPtr, uint8 *bodyPtr, AnimTimerDataStruct *animTimerDataPtr);
bool setModelAnimation(int32 keyframeIdx, const uint8 *animPtr, uint8 *const bodyPtr, AnimTimerDataStruct *animTimerDataPtr);
/**
* Get entity anim index (This is taken from File3D entities)