H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2024-12-22 14:16:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

public: fix misalignment in Studio_AnimPosition

Browse Source
This commit is contained in:
nillerusr 2022-08-23 17:32:37 +03:00
parent 3dbe2cdd32
commit e11a21ea19
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
public/bone_setup.cpp
View File

@ -5609,18 +5609,20 @@ bool Studio_AnimPosition( mstudioanimdesc_t *panim, float flCycle, Vector &vecPo
float flFrame = flCycle * (panim->numframes - 1); float flFrame = flCycle * (panim->numframes - 1);
for (int i = 0; i < panim->nummovements; i++) for (int i = 0; i < panim->nummovements; i++)
{ {
mstudiomovement_t *pmove = panim->pMovement( i ); mstudiomovement_t pmove;
// TODO(nillerusr): fix alignment on model loading
V_memcpy(&pmove, panim->pMovement( i ), sizeof(mstudiomovement_t));
if (pmove->endframe >= flFrame) if (pmove.endframe >= flFrame)
{ {
float f = (flFrame - prevframe) / (pmove->endframe - prevframe); float f = (flFrame - prevframe) / (pmove.endframe - prevframe);
float d = pmove.v0 * f + 0.5 * (pmove.v1 - pmove.v0) * f * f;
float d = pmove->v0 * f + 0.5 * (pmove->v1 - pmove->v0) * f * f; vecPos = vecPos + d * pmove.vector;
vecAngle.y = vecAngle.y * (1 - f) + pmove.angle * f;
vecPos = vecPos + d * pmove->vector;
vecAngle.y = vecAngle.y * (1 - f) + pmove->angle * f;
if (iLoops != 0) if (iLoops != 0)
{ {
mstudiomovement_t *pmoveAnim = panim->pMovement( panim->nummovements - 1 ); mstudiomovement_t *pmoveAnim = panim->pMovement( panim->nummovements - 1 );
@ -5631,9 +5633,9 @@ bool Studio_AnimPosition( mstudioanimdesc_t *panim, float flCycle, Vector &vecPo
} }
else else
{ {
prevframe = pmove->endframe; prevframe = pmove.endframe;
vecPos = pmove->position; vecPos = pmove.position;
vecAngle.y = pmove->angle; vecAngle.y = pmove.angle;
} }
} }