natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Animated.h and Model.cpp: fix animations, still needs fixing interpolation

Browse Source
This commit is contained in:
Skarn
2021-11-27 22:35:59 +03:00
parent b2e0a70ccd
commit 618d2f4e8d
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/noggit/Animated.h
View File

@@ -41,10 +41,10 @@ namespace Animation
{
//! \todo Check if this is really correct.
return glm::quat(
static_cast<float>((value.w > 0 ? value.w - 32767 : value.w + 32767) / 32767.0f),
static_cast<float>((value.x > 0 ? value.x - 32767 : value.x + 32767) / 32767.0f),
static_cast<float>((value.y > 0 ? value.y - 32767 : value.y + 32767) / 32767.0f),
static_cast<float>((value.z > 0 ? value.z - 32767 : value.z + 32767) / 32767.0f),
static_cast<float>((value.w > 0 ? value.w - 32767 : value.w + 32767) / 32767.0f));
static_cast<float>((value.z > 0 ? value.z - 32767 : value.z + 32767) / 32767.0f));
}
template<>
@@ -147,6 +147,7 @@ namespace Animation
}
else
{
TimestampType t1 = timestampVector[pos];
TimestampType t2 = timestampVector[pos + 1];
const float percentage = (time - t1) / static_cast<float>(t2 - t1);

21
src/noggit/Model.cpp
View File

@@ -1400,7 +1400,8 @@ void Bone::calcMatrix(glm::mat4x4 const& model_view
if (calc) return;
glm::mat4x4 m = glm::mat4x4(1);
glm::quat q = glm::quat();
glm::mat4x4 mr = glm::mat4x4(1);
if ( flags.transformed
|| flags.billboard
|| flags.cylindrical_billboard_lock_x
@@ -1410,6 +1411,7 @@ void Bone::calcMatrix(glm::mat4x4 const& model_view
{
m = glm::translate(m, pivot);
if (trans.uses(anim))
{
m = glm::translate(m, trans.getValue (anim, time, animtime));
@@ -1417,8 +1419,17 @@ void Bone::calcMatrix(glm::mat4x4 const& model_view
if (rot.uses(anim))
{
q = rot.getValue(anim, time, animtime);
m = m * glm::eulerAngleXYZ(glm::radians(q.x), glm::radians(q.z),glm::radians(q.y) );
glm::quat ref = glm::quat_cast(glm::mat4x4(1));
glm::quat q = rot.getValue(anim, time, animtime);
glm::vec3 rot_euler = glm::eulerAngles(q);
glm::vec3 test_rot_vec = glm::vec3(rot_euler[2],
-(rot_euler[1] + glm::radians(180.f)),
-(rot_euler[0] + glm::radians(180.f)));
mr = glm::eulerAngleXYZ(test_rot_vec.x, test_rot_vec.y, test_rot_vec.z);
m = m * mr;
}
if (scale.uses(anim))
@@ -1457,11 +1468,11 @@ void Bone::calcMatrix(glm::mat4x4 const& model_view
{
if (parent >= 0)
{
mrot = allbones[parent].mrot * glm::toMat4(q);
mrot = allbones[parent].mrot * mr;
}
else
{
mrot = glm::toMat4(q);
mrot = mr;
}
}
else