Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #110987 from TokageItLab/smod-physics-interpolate

Browse source 
Make extended SkeletonModifiers retrieve interpolated global transform
This commit is contained in:
Thaddeus Crews 2025-09-30 20:10:30 -05:00
commit 5f2593c9a2
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scene/3d/look_at_modifier_3d.cpp
View file

@ -513,10 +513,10 @@ void LookAtModifier3D::_process_modification(double p_delta) {
Transform3D bone_rest_space; Transform3D bone_rest_space;
int parent_bone = skeleton->get_bone_parent(bone); int parent_bone = skeleton->get_bone_parent(bone);
if (parent_bone < 0) { if (parent_bone < 0) {
bone_rest_space = skeleton->get_global_transform(); bone_rest_space = skeleton->get_global_transform_interpolated();
bone_rest_space.translate_local(skeleton->get_bone_rest(bone).origin); bone_rest_space.translate_local(skeleton->get_bone_rest(bone).origin);
} else { } else {
bone_rest_space = skeleton->get_global_transform() * skeleton->get_bone_global_pose(parent_bone); bone_rest_space = skeleton->get_global_transform_interpolated() * skeleton->get_bone_global_pose(parent_bone);
bone_rest_space.translate_local(skeleton->get_bone_rest(bone).origin); bone_rest_space.translate_local(skeleton->get_bone_rest(bone).origin);
} }
@ -530,18 +530,18 @@ void LookAtModifier3D::_process_modification(double p_delta) {
} else { } else {
Transform3D origin_tr; Transform3D origin_tr;
if (origin_from == ORIGIN_FROM_SPECIFIC_BONE && origin_bone >= 0 && origin_bone < skeleton->get_bone_count()) { if (origin_from == ORIGIN_FROM_SPECIFIC_BONE && origin_bone >= 0 && origin_bone < skeleton->get_bone_count()) {
origin_tr = skeleton->get_global_transform() * skeleton->get_bone_global_pose(origin_bone); origin_tr = skeleton->get_global_transform_interpolated() * skeleton->get_bone_global_pose(origin_bone);
} else if (origin_from == ORIGIN_FROM_EXTERNAL_NODE) { } else if (origin_from == ORIGIN_FROM_EXTERNAL_NODE) {
Node3D *origin_src = Object::cast_to<Node3D>(get_node_or_null(origin_external_node)); Node3D *origin_src = Object::cast_to<Node3D>(get_node_or_null(origin_external_node));
if (origin_src) { if (origin_src) {
origin_tr = origin_src->get_global_transform(); origin_tr = origin_src->get_global_transform_interpolated();
} else { } else {
origin_tr = bone_rest_space; origin_tr = bone_rest_space;
} }
} else { } else {
origin_tr = bone_rest_space; 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_transform_interpolated().origin - origin_tr.translated_local(origin_offset).origin);
forward_vector_nrm = forward_vector.normalized(); forward_vector_nrm = forward_vector.normalized();
if (forward_vector_nrm.abs().is_equal_approx(get_vector_from_axis(primary_rotation_axis))) { if (forward_vector_nrm.abs().is_equal_approx(get_vector_from_axis(primary_rotation_axis))) {
destination = skeleton->get_bone_pose_rotation(bone); destination = skeleton->get_bone_pose_rotation(bone);

4
scene/3d/spring_bone_simulator_3d.cpp
View file

@ -1660,7 +1660,7 @@ void SpringBoneSimulator3D::reset() {
void SpringBoneSimulator3D::_init_joints(Skeleton3D *p_skeleton, SpringBone3DSetting *setting) { void SpringBoneSimulator3D::_init_joints(Skeleton3D *p_skeleton, SpringBone3DSetting *setting) {
if (setting->center_from == CENTER_FROM_WORLD_ORIGIN) { if (setting->center_from == CENTER_FROM_WORLD_ORIGIN) {
setting->cached_center = p_skeleton->get_global_transform(); setting->cached_center = p_skeleton->get_global_transform_interpolated();
} else if (setting->center_from == CENTER_FROM_NODE) { } else if (setting->center_from == CENTER_FROM_NODE) {
if (setting->center_node == NodePath()) { if (setting->center_node == NodePath()) {
setting->cached_center = Transform3D(); setting->cached_center = Transform3D();
@ -1669,7 +1669,7 @@ void SpringBoneSimulator3D::_init_joints(Skeleton3D *p_skeleton, SpringBone3DSet
if (!nd) { if (!nd) {
setting->cached_center = Transform3D(); setting->cached_center = Transform3D();
} else { } else {
setting->cached_center = nd->get_global_transform().affine_inverse() * p_skeleton->get_global_transform(); setting->cached_center = nd->get_global_transform_interpolated().affine_inverse() * p_skeleton->get_global_transform_interpolated();
} }
} }
} else { } else {