diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-31 12:04:33 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-31 12:04:33 +0100 |
| commit | 1518bb716e1eef1b12cb147c005b53a626af2c3e (patch) | |
| tree | a6644f460255c6eed91ac4ec3bcd5d97e2ab5eb1 /scene/3d | |
| parent | 71a6aba3d77cd6f400135082264513f08581bd4c (diff) | |
| parent | 913f57f695e8b62612cb1e872b4ce1dc5d9ef057 (diff) | |
Merge pull request #67282 from CheesecakeCG/fix-pb-start-sim
Fix Skeleton3D falsely assuming all physical bones will be children of their first bone
Diffstat (limited to 'scene/3d')
| -rw-r--r-- | scene/3d/skeleton_3d.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/scene/3d/skeleton_3d.cpp b/scene/3d/skeleton_3d.cpp index 85b2c5154b..a1f962c690 100644 --- a/scene/3d/skeleton_3d.cpp +++ b/scene/3d/skeleton_3d.cpp @@ -888,10 +888,14 @@ void _pb_start_simulation(const Skeleton3D *p_skeleton, Node *p_node, const Vect PhysicalBone3D *pb = Object::cast_to<PhysicalBone3D>(p_node); if (pb) { - for (int i = p_sim_bones.size() - 1; 0 <= i; --i) { - if (p_sim_bones[i] == pb->get_bone_id() || p_skeleton->is_bone_parent_of(pb->get_bone_id(), p_sim_bones[i])) { - pb->set_simulate_physics(true); - break; + if (p_sim_bones.is_empty()) { // If no bones is specified, activate ragdoll on full body. + pb->set_simulate_physics(true); + } else { + for (int i = p_sim_bones.size() - 1; 0 <= i; --i) { + if (p_sim_bones[i] == pb->get_bone_id() || p_skeleton->is_bone_parent_of(pb->get_bone_id(), p_sim_bones[i])) { + pb->set_simulate_physics(true); + break; + } } } } @@ -901,9 +905,7 @@ void Skeleton3D::physical_bones_start_simulation_on(const TypedArray<StringName> set_physics_process_internal(false); Vector<int> sim_bones; - if (p_bones.size() <= 0) { - sim_bones.push_back(0); // If no bones is specified, activate ragdoll on full body. - } else { + if (p_bones.size() > 0) { sim_bones.resize(p_bones.size()); int c = 0; for (int i = sim_bones.size() - 1; 0 <= i; --i) { |