godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge pull request #105706 from TokageItLab/fix-fixer

Browse Source 
Make silhouette fixer to use arc `Quaternion` constructor instead of `looking_at()`
This commit is contained in:
Thaddeus Crews
2025-05-19 08:01:38 -05:00
parent 6c2d288ef1 d2cf48700e
commit f1ba8eeae5
1 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp
View File

@@ -367,31 +367,15 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
Vector3 prof_dir = prof_tail - prof_head; Vector3 prof_dir = prof_tail - prof_head;
Vector3 src_dir = src_tail - src_head; Vector3 src_dir = src_tail - src_head;
if (Math::is_zero_approx(prof_dir.length_squared()) || Math::is_zero_approx(src_dir.length_squared())) {
continue;
}
prof_dir.normalize();
src_dir.normalize();
// Rotate rest. // Rotate rest.
if (Math::abs(Math::rad_to_deg(src_dir.angle_to(prof_dir))) > float(p_options["retarget/rest_fixer/fix_silhouette/threshold"])) { if (Math::abs(Math::rad_to_deg(src_dir.angle_to(prof_dir))) > float(p_options["retarget/rest_fixer/fix_silhouette/threshold"])) {
// Get rotation difference. Basis diff_b = Basis(Quaternion(src_dir, prof_dir));
Vector3 up_vec; // Need to rotate other than roll axis.
switch (Vector3(std::abs(src_dir.x), std::abs(src_dir.y), std::abs(src_dir.z)).min_axis_index()) {
case Vector3::AXIS_X: {
up_vec = Vector3(1, 0, 0);
} break;
case Vector3::AXIS_Y: {
up_vec = Vector3(0, 1, 0);
} break;
case Vector3::AXIS_Z: {
up_vec = Vector3(0, 0, 1);
} break;
}
Basis src_b;
src_b = src_b.looking_at(src_dir, up_vec);
Basis prof_b;
prof_b = src_b.looking_at(prof_dir, up_vec);
if (prof_b.is_equal_approx(Basis())) {
continue; // May not need to rotate.
}
Basis diff_b = prof_b * src_b.inverse();
// Apply rotation difference as global transform to skeleton. // Apply rotation difference as global transform to skeleton.
Basis src_pg; Basis src_pg;
int src_parent = src_skeleton->get_bone_parent(src_idx); int src_parent = src_skeleton->get_bone_parent(src_idx);