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

Merge pull request #53118 from BimDav/physicsbody_to_kinematic

Browse Source 
Reload kinematic shapes when changing PhysicsBody mode to Kinematic
This commit is contained in:
Camille Mohr-Daurat 2021-09-27 08:53:36 -07:00 committed by GitHub
commit 27417c065d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/bullet/rigid_body_bullet.cpp
View File

@ -303,6 +303,7 @@ RigidBodyBullet::~RigidBodyBullet() {
void RigidBodyBullet::init_kinematic_utilities() { void RigidBodyBullet::init_kinematic_utilities() {
kinematic_utilities = memnew(KinematicUtilities(this)); kinematic_utilities = memnew(KinematicUtilities(this));
reload_kinematic_shapes();
} }
void RigidBodyBullet::destroy_kinematic_utilities() { void RigidBodyBullet::destroy_kinematic_utilities() {

2
modules/bullet/space_bullet.cpp
View File

@ -947,7 +947,6 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform3D &p
if (!p_body->get_kinematic_utilities()) { if (!p_body->get_kinematic_utilities()) {
p_body->init_kinematic_utilities(); p_body->init_kinematic_utilities();
p_body->reload_kinematic_shapes();
} }
btVector3 initial_recover_motion(0, 0, 0); btVector3 initial_recover_motion(0, 0, 0);
@ -1089,7 +1088,6 @@ int SpaceBullet::test_ray_separation(RigidBodyBullet *p_body, const Transform3D
if (!p_body->get_kinematic_utilities()) { if (!p_body->get_kinematic_utilities()) {
p_body->init_kinematic_utilities(); p_body->init_kinematic_utilities();
p_body->reload_kinematic_shapes();
} }
btVector3 recover_motion(0, 0, 0); btVector3 recover_motion(0, 0, 0);