mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-04-13 01:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from reduz/fix-default-kb3d-safe-margin

Browse Source 
Properly pass safe margin on initialization.
This commit is contained in:
Rémi Verschelde 2020-07-14 19:36:51 +02:00 committed by GitHub
commit 9d97169928
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
scene/3d
physics_body_3d.cpp
servers/physics_3d
body_3d_sw.cpp

2
scene/3d/physics_body_3d.cpp

@ -1241,12 +1241,12 @@ void KinematicBody3D::_direct_state_changed(Object *p_state) {
KinematicBody3D::KinematicBody3D() :
PhysicsBody3D(PhysicsServer3D::BODY_MODE_KINEMATIC) {
margin = 0.001;
locked_axis = 0;
on_floor = false;
on_ceiling = false;
on_wall = false;
set_safe_margin(0.001);
PhysicsServer3D::get_singleton()->body_set_force_integration_callback(get_rid(), this, "_direct_state_changed");
}

2
servers/physics_3d/body_3d_sw.cpp

@ -750,7 +750,7 @@ Body3DSW::Body3DSW() :
active = true;
mass = 1;
kinematic_safe_margin = 0.01;
kinematic_safe_margin = 0.001;
//_inv_inertia=Transform();
_inv_mass = 1;
bounce = 0;