archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-13 23:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

implemented CutsceneObject; little fixes

Browse Source
This commit is contained in:
aap
2019-06-12 21:17:02 +02:00
parent a9517c01af
commit 9703ef9b59
12 changed files with 137 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/animation/AnimBlendClumpData.cpp
View File

@ -9,7 +9,7 @@
CAnimBlendClumpData::CAnimBlendClumpData(void)
{
numFrames = 0;
pedPosition = nil;
velocity = nil;
frames = nil;
link.Init();
}

2
src/animation/AnimBlendClumpData.h
View File

@ -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;

14
src/animation/FrameUpdate.cpp
View File

@ -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;