noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Add bone name/idx matching validation & virtual func to skel Modifier

Browse Source
This commit is contained in:
Silc Lizard (Tokage) Renew
2025-03-25 01:37:25 +09:00
parent 1b4ed4c038
commit 17d068963f
9 changed files with 85 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scene/3d/look_at_modifier_3d.cpp
View File

@@ -75,6 +75,20 @@ PackedStringArray LookAtModifier3D::get_configuration_warnings() const {
return warnings;
}
void LookAtModifier3D::_validate_bone_names() {
// Prior bone name.
if (!bone_name.is_empty()) {
set_bone_name(bone_name);
} else if (bone != -1) {
set_bone(bone);
}
if (!origin_bone_name.is_empty()) {
set_origin_bone_name(origin_bone_name);
} else if (origin_bone != -1) {
set_origin_bone(origin_bone);
}
}
void LookAtModifier3D::set_bone_name(const String &p_bone_name) {
bone_name = p_bone_name;
Skeleton3D *sk = get_skeleton();
@@ -529,7 +543,7 @@ void LookAtModifier3D::_process_modification(double p_delta) {
} else {
origin_tr = bone_rest_space;
}
forward_vector = bone_rest_space.orthonormalized().basis.xform_inv((target->get_global_position() - origin_tr.translated_local(origin_offset).origin));
forward_vector = bone_rest_space.orthonormalized().basis.xform_inv(target->get_global_position() - origin_tr.translated_local(origin_offset).origin);
forward_vector_nrm = forward_vector.normalized();
if (forward_vector_nrm.abs().is_equal_approx(get_vector_from_axis(primary_rotation_axis))) {
destination = skeleton->get_bone_pose_rotation(bone);