godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Merge pull request #48327 from Blackiris/fix-create-skeleton-physical-bones-3.x

Browse Source
This commit is contained in:
Rémi Verschelde
2022-03-21 11:26:56 +01:00
committed by GitHub
parent f59f30dfcb 480543f681
commit 39ad3a02be
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
editor/plugins/skeleton_editor_plugin.cpp
View File

@@ -97,7 +97,9 @@ void SkeletonEditor::create_physical_skeleton() {
} }
PhysicalBone *SkeletonEditor::create_physical_bone(int bone_id, int bone_child_id, const Vector<BoneInfo> &bones_infos) { PhysicalBone *SkeletonEditor::create_physical_bone(int bone_id, int bone_child_id, const Vector<BoneInfo> &bones_infos) {
real_t half_height(skeleton->get_bone_rest(bone_child_id).origin.length() * 0.5); const Transform child_rest = skeleton->get_bone_rest(bone_child_id);
real_t half_height(child_rest.origin.length() * 0.5);
real_t radius(half_height * 0.2); real_t radius(half_height * 0.2);
CapsuleShape *bone_shape_capsule = memnew(CapsuleShape); CapsuleShape *bone_shape_capsule = memnew(CapsuleShape);
@@ -108,11 +110,16 @@ PhysicalBone *SkeletonEditor::create_physical_bone(int bone_id, int bone_child_i
bone_shape->set_shape(bone_shape_capsule); bone_shape->set_shape(bone_shape_capsule);
Transform capsule_transform; Transform capsule_transform;
capsule_transform.basis = Basis(Vector3(1, 0, 0), Vector3(0, 0, 1), Vector3(0, -1, 0));
bone_shape->set_transform(capsule_transform); bone_shape->set_transform(capsule_transform);
Vector3 up = Vector3(0, 1, 0);
if (up.cross(child_rest.origin).is_equal_approx(Vector3())) {
up = Vector3(0, 0, 1);
}
Transform body_transform; Transform body_transform;
body_transform.origin = Vector3(0, 0, -half_height); body_transform.set_look_at(Vector3(0, 0, 0), child_rest.origin, up);
body_transform.origin = body_transform.basis.xform(Vector3(0, 0, -half_height));
Transform joint_transform; Transform joint_transform;
joint_transform.origin = Vector3(0, 0, half_height); joint_transform.origin = Vector3(0, 0, half_height);