mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-22 10:32:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #101861 from TokageItLab/deltip

Browse source 
Remove dead variable `end_bone_tip_radius` from SpringBoneSimulator
This commit is contained in:
Thaddeus Crews 2025-01-21 11:55:26 -06:00
commit 08eb2f1a15
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scene/3d/spring_bone_simulator_3d.cpp
View file

@ -1525,7 +1525,7 @@ void SpringBoneSimulator3D::_init_joints(Skeleton3D *p_skeleton, SpringBone3DSet
setting->joints[i]->verlet->prev_tail = setting->joints[i]->verlet->current_tail;
setting->joints[i]->verlet->forward_vector = axis.normalized();
setting->joints[i]->verlet->length = axis.length();
setting->joints[i]->verlet->prev_rot = Quaternion(0, 0, 0, 1);
setting->joints[i]->verlet->current_rot = Quaternion(0, 0, 0, 1);
} else if (setting->extend_end_bone && setting->end_bone_length > 0) {
Vector3 axis = get_end_bone_axis(setting->end_bone, setting->end_bone_direction);
if (axis.is_zero_approx()) {
@ -1536,7 +1536,7 @@ void SpringBoneSimulator3D::_init_joints(Skeleton3D *p_skeleton, SpringBone3DSet
setting->joints[i]->verlet->length = setting->end_bone_length;
setting->joints[i]->verlet->current_tail = setting->cached_center.xform(p_skeleton->get_bone_global_pose(setting->joints[i]->bone).xform(axis * setting->end_bone_length));
setting->joints[i]->verlet->prev_tail = setting->joints[i]->verlet->current_tail;
setting->joints[i]->verlet->prev_rot = Quaternion(0, 0, 0, 1);
setting->joints[i]->verlet->current_rot = Quaternion(0, 0, 0, 1);
}
}
setting->simulation_dirty = false;
@ -1602,8 +1602,8 @@ void SpringBoneSimulator3D::_process_joints(double p_delta, Skeleton3D *p_skelet
// Convert position to rotation.
Vector3 from = current_rot.xform(verlet->forward_vector);
Vector3 to = p_inverted_center_transform.basis.xform(next_tail - current_origin).normalized();
Quaternion from_to = get_from_to_rotation(from, to, verlet->prev_rot);
verlet->prev_rot = from_to;
Quaternion from_to = get_from_to_rotation(from, to, verlet->current_rot);
verlet->current_rot = from_to;
// Apply rotation.
from_to *= current_rot;

3
scene/3d/spring_bone_simulator_3d.h
View file

@ -72,7 +72,7 @@ public:
Vector3 prev_tail;
Vector3 current_tail;
Vector3 forward_vector;
Quaternion prev_rot;
Quaternion current_rot;
float length = 0.0;
};
@ -104,7 +104,6 @@ public:
bool extend_end_bone = false;
BoneDirection end_bone_direction = BONE_DIRECTION_FROM_PARENT;
float end_bone_length = 0.0;
float end_bone_tip_radius = 0.02;
CenterFrom center_from = CENTER_FROM_WORLD_ORIGIN;
NodePath center_node;