Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use ceil() and set the delta appropriately if time1 is after team2

Browse source
This commit is contained in:
smallmodel 2024-07-25 21:43:19 +02:00
parent bf4780bbdb
commit 31d254cb9f
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
code/skeletor/skeletor.cpp
View file

@ -102,8 +102,8 @@ SkelVec3 skelAnimDataGameHeader_s::GetDeltaOverTime(float time1, float time2)
deltaWeight1 = time1 / frameTime;
deltaWeight2 = time2 / frameTime;
frameNum1 = (int)(deltaWeight1 + 1.0);
frameNum2 = (int)(deltaWeight2 + 1.0);
frameNum1 = ceil(deltaWeight1);
frameNum2 = ceil(deltaWeight2);
d = frameNum1 - deltaWeight1;
s = 1.0 - (frameNum2 - deltaWeight2);
@ -115,14 +115,15 @@ SkelVec3 skelAnimDataGameHeader_s::GetDeltaOverTime(float time1, float time2)
for (currFrame = frameNum1 + 1; currFrame < frameNum2; currFrame++) {
delta += m_frame[currFrame % numFrames].delta;
}
delta.x += m_frame[frameNum2 % numFrames].delta.x * s;
delta.y += m_frame[frameNum2 % numFrames].delta.y * s;
delta.z += m_frame[frameNum2 % numFrames].delta.z * s;
} else {
s = s - (1.0 - d);
delta = m_frame[frameNum2 % numFrames].delta;
}
delta.x += m_frame[frameNum2 % numFrames].delta.x * s;
delta.y += m_frame[frameNum2 % numFrames].delta.y * s;
delta.z += m_frame[frameNum2 % numFrames].delta.z * s;
if (delta.x > -0.001f && delta.x < 0.001f) {
delta.x = 0;
}
@ -148,25 +149,26 @@ float skelAnimDataGameHeader_s::GetAngularDeltaOverTime(float time1, float time2
deltaWeight1 = time1 / frameTime;
deltaWeight2 = time2 / frameTime;
frameNum1 = (int)(deltaWeight1 + 1.0);
frameNum2 = (int)(deltaWeight2 + 1.0);
frameNum1 = ceil(deltaWeight1);
frameNum2 = ceil(deltaWeight2);
d = frameNum1 - deltaWeight1;
s = 1.0 - (frameNum2 - deltaWeight2);
delta = 0;
if (frameNum2 > frameNum1) {
if (frameNum1 < frameNum2) {
delta = m_frame[frameNum1 % numFrames].angleDelta;
for (currFrame = frameNum1 + 1; currFrame < frameNum2; currFrame++) {
delta += m_frame[currFrame % numFrames].angleDelta;
}
delta += m_frame[frameNum2 % numFrames].angleDelta * s;
} else {
s = s - (1.0 - d);
delta = m_frame[frameNum2 % numFrames].angleDelta;
}
delta += m_frame[frameNum2 % numFrames].angleDelta * s;
if (delta > -0.001f && delta < 0.001f) {
delta = 0;
}