diff options
author | aap <aap@papnet.eu> | 2019-06-12 21:17:02 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-06-12 21:17:02 +0200 |
commit | 9703ef9b591430b86c272e0f042b1f50b6cb437c (patch) | |
tree | 4e27511538090c8872e80c68cc7f70186eeb01f4 /src/animation | |
parent | implemented CCutsceneHead and dependencies (diff) | |
download | re3-9703ef9b591430b86c272e0f042b1f50b6cb437c.tar re3-9703ef9b591430b86c272e0f042b1f50b6cb437c.tar.gz re3-9703ef9b591430b86c272e0f042b1f50b6cb437c.tar.bz2 re3-9703ef9b591430b86c272e0f042b1f50b6cb437c.tar.lz re3-9703ef9b591430b86c272e0f042b1f50b6cb437c.tar.xz re3-9703ef9b591430b86c272e0f042b1f50b6cb437c.tar.zst re3-9703ef9b591430b86c272e0f042b1f50b6cb437c.zip |
Diffstat (limited to 'src/animation')
-rw-r--r-- | src/animation/AnimBlendClumpData.cpp | 2 | ||||
-rw-r--r-- | src/animation/AnimBlendClumpData.h | 2 | ||||
-rw-r--r-- | src/animation/FrameUpdate.cpp | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/animation/AnimBlendClumpData.cpp b/src/animation/AnimBlendClumpData.cpp index 57985533..73e71246 100644 --- a/src/animation/AnimBlendClumpData.cpp +++ b/src/animation/AnimBlendClumpData.cpp @@ -9,7 +9,7 @@ CAnimBlendClumpData::CAnimBlendClumpData(void) { numFrames = 0; - pedPosition = nil; + velocity = nil; frames = nil; link.Init(); } diff --git a/src/animation/AnimBlendClumpData.h b/src/animation/AnimBlendClumpData.h index 955578f0..df2fbc56 100644 --- a/src/animation/AnimBlendClumpData.h +++ b/src/animation/AnimBlendClumpData.h @@ -38,7 +38,7 @@ public: #ifdef PED_SKIN int32 modelNumber; // doesn't seem to be used #endif - CVector *pedPosition; + CVector *velocity; // order of frames is determined by RW hierarchy AnimBlendFrameData *frames; diff --git a/src/animation/FrameUpdate.cpp b/src/animation/FrameUpdate.cpp index 1533897e..62300527 100644 --- a/src/animation/FrameUpdate.cpp +++ b/src/animation/FrameUpdate.cpp @@ -23,7 +23,7 @@ FrameUpdateCallBack(AnimBlendFrameData *frame, void *arg) AnimBlendFrameUpdateData *updateData = (AnimBlendFrameUpdateData*)arg; if(frame->flag & AnimBlendFrameData::VELOCITY_EXTRACTION && - gpAnimBlendClump->pedPosition){ + gpAnimBlendClump->velocity){ if(frame->flag & AnimBlendFrameData::VELOCITY_EXTRACTION_3D) FrameUpdateCallBackWith3dVelocityExtraction(frame, arg); else @@ -132,11 +132,11 @@ FrameUpdateCallBackWithVelocityExtraction(AnimBlendFrameData *frame, void *arg) } if((frame->flag & AnimBlendFrameData::IGNORE_TRANSLATION) == 0){ - gpAnimBlendClump->pedPosition->x = transx - curx; - gpAnimBlendClump->pedPosition->y = transy - cury; + gpAnimBlendClump->velocity->x = transx - curx; + gpAnimBlendClump->velocity->y = transy - cury; if(looped){ - gpAnimBlendClump->pedPosition->x += endx; - gpAnimBlendClump->pedPosition->y += endy; + gpAnimBlendClump->velocity->x += endx; + gpAnimBlendClump->velocity->y += endy; } mat->pos.x = pos.x - transx; mat->pos.y = pos.y - transy; @@ -211,9 +211,9 @@ FrameUpdateCallBackWith3dVelocityExtraction(AnimBlendFrameData *frame, void *arg } if((frame->flag & AnimBlendFrameData::IGNORE_TRANSLATION) == 0){ - *gpAnimBlendClump->pedPosition = trans - cur; + *gpAnimBlendClump->velocity = trans - cur; if(looped) - *gpAnimBlendClump->pedPosition += end; + *gpAnimBlendClump->velocity += end; mat->pos.x = (pos - trans).x + frame->resetPos.x; mat->pos.y = (pos - trans).y + frame->resetPos.y; mat->pos.z = (pos - trans).z + frame->resetPos.z; |