소스 검색

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

Properly pass safe margin on initialization.
Rémi Verschelde 5 년 전
부모
커밋
9d97169928
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      scene/3d/physics_body_3d.cpp
  2. 1 1
      servers/physics_3d/body_3d_sw.cpp

+ 1 - 1
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");
 }
 

+ 1 - 1
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;