godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Skeleton3D falsely assuming all physical bones will be children of their first bone 

(cherry picked from commit 913f57f695)
This commit is contained in:
hare_ware 2022-10-31 06:59:42 -04:00 committed by Rémi Verschelde
parent de6b5f992b
commit 4150749698
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scene/3d/skeleton.cpp
View File

@ -707,10 +707,14 @@ void _pb_start_simulation(const Skeleton *p_skeleton, Node *p_node, const Vector
PhysicalBone *pb = Object::cast_to<PhysicalBone>(p_node); PhysicalBone *pb = Object::cast_to<PhysicalBone>(p_node);
if (pb) { if (pb) {
bool sim = false; bool sim = false;
for (int i = p_sim_bones.size() - 1; 0 <= i; --i) { if (p_sim_bones.empty()) { // If no bones is specified, activate ragdoll on full body.
if (p_sim_bones[i] == pb->get_bone_id() || p_skeleton->is_bone_parent_of(pb->get_bone_id(), p_sim_bones[i])) { sim = true;
sim = true; } else {
break; 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])) {
sim = true;
break;
}
} }
} }
@ -725,9 +729,7 @@ void _pb_start_simulation(const Skeleton *p_skeleton, Node *p_node, const Vector
void Skeleton::physical_bones_start_simulation_on(const Array &p_bones) { void Skeleton::physical_bones_start_simulation_on(const Array &p_bones) {
Vector<int> sim_bones; Vector<int> sim_bones;
if (p_bones.size() <= 0) { if (p_bones.size() > 0) {
sim_bones.push_back(0); // if no bones is specified, activate ragdoll on full body
} else {
sim_bones.resize(p_bones.size()); sim_bones.resize(p_bones.size());
int c = 0; int c = 0;
for (int i = sim_bones.size() - 1; 0 <= i; --i) { for (int i = sim_bones.size() - 1; 0 <= i; --i) {