blender
/
blender
138
428
Fork 616
Code Issues 6.2k Pull Requests 789 Projects 19 Wiki Activity

Fix #119703: Incorrect conversion of identity quaternion to axis angle #119762

Merged
Brecht Van Lommel merged 15 commits from mod_moder/blender:fix_119703 into blender-v4.2-release 2024-06-06 19:26:53 +02:00
Conversation 4 Commits 15 Files Changed 2 +23 -2
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenlib/BLI_math_quaternion.hh
View File

@ -630,8 +630,11 @@ AxisAngleBase<T, AngleT> to_axis_angle(const QuaternionBase<T> &quat)
T sin_half_angle = math::length(axis); T sin_half_angle = math::length(axis);
/* Prevent division by zero for axis conversion. */ /* Prevent division by zero for axis conversion. */
if (sin_half_angle < T(0.0005)) { if (sin_half_angle < T(0.0005)) {
sin_half_angle = T(1); using AngleAxisT = typename AxisAngleBase<T, AngleT>::vec3_type;
axis[1] = T(1); const AngleAxisT identity_axis = AxisAngleBase<T, AngleT>::identity().axis();
BLI_assert(abs(cos_half_angle) > 0.0005);
AxisAngleBase<T, AngleT> identity(identity_axis * sign(cos_half_angle), AngleT(0));
return identity;
} }
/* Normalize the axis. */ /* Normalize the axis. */
axis /= sin_half_angle; axis /= sin_half_angle;

18
source/blender/blenlib/tests/BLI_math_rotation_test.cc
View File

@ -879,4 +879,22 @@ TEST(math_rotation, DualQuaternionTransform)
} }
} }
TEST(math_axis_angle, AxisAngleFromQuaternion)
{
{
const math::AxisAngle axis_angle({0.0f, 1.0f, 0.0f}, math::AngleRadian(0));
const math::Quaternion quaternion(1.0f, {0.0f, 0.0f, 0.0f});
const math::AxisAngle from_quaternion = math::to_axis_angle(quaternion);
EXPECT_V3_NEAR(axis_angle.axis(), from_quaternion.axis(), 1e-6);
EXPECT_NEAR(axis_angle.angle().radian(), from_quaternion.angle().radian(), 1e-6);
}
{
const math::AxisAngle axis_angle({0.0f, -1.0f, 0.0f}, math::AngleRadian(0));
const math::Quaternion quaternion(-1.0f, {0.0f, 0.0f, 0.0f});
const math::AxisAngle from_quaternion = math::to_axis_angle(quaternion);
EXPECT_V3_NEAR(axis_angle.axis(), from_quaternion.axis(), 1e-6);
EXPECT_NEAR(axis_angle.angle().radian(), from_quaternion.angle().radian(), 1e-6);
}
}
} // namespace blender::math::tests } // namespace blender::math::tests