ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix quaternion slerp

Browse Source
This commit is contained in:
Benau
2018-07-05 11:16:45 +08:00
parent d6672b64c5
commit 0a020210e5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/karts/moveable.cpp
View File

@@ -173,6 +173,8 @@ void Moveable::updateGraphics(float dt, const Vec3& offset_xyz,
if (smoothRotation())
{
cur_rot = m_start_smoothing_postion.second;
if (dot(cur_rot, m_adjust_position.second) < 0.0f)
cur_rot = -cur_rot;
cur_rot = cur_rot.slerp(m_adjust_position.second, ratio);
}
}
@@ -187,6 +189,8 @@ void Moveable::updateGraphics(float dt, const Vec3& offset_xyz,
if (smoothRotation())
{
cur_rot.normalize();
if (dot(cur_rot, m_adjust_position.second) < 0.0f)
cur_rot = -cur_rot;
cur_rot = cur_rot.slerp(m_adjust_position.second, 1.0f - ratio);
}
}