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

Properly pass safe margin on initialization. 

Fixes jitter.

(cherry picked from commit 13e0385702)
This commit is contained in:
Juan Linietsky 2020-07-14 10:19:58 -03:00 committed by Rémi Verschelde
parent 67313c681d
commit ceeb690476
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/3d/physics_body.cpp
View File

@ -1432,13 +1432,14 @@ void KinematicBody::_bind_methods() {
KinematicBody::KinematicBody() : KinematicBody::KinematicBody() :
PhysicsBody(PhysicsServer::BODY_MODE_KINEMATIC) { PhysicsBody(PhysicsServer::BODY_MODE_KINEMATIC) {
margin = 0.001;
locked_axis = 0; locked_axis = 0;
on_floor = false; on_floor = false;
on_ceiling = false; on_ceiling = false;
on_wall = false; on_wall = false;
set_safe_margin(0.001);
} }
KinematicBody::~KinematicBody() { KinematicBody::~KinematicBody() {
if (motion_cache.is_valid()) { if (motion_cache.is_valid()) {

2
servers/physics/body_sw.cpp
View File

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