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

Merge pull request #39084 from madmiraal/backport-37314

Browse Source 
[3.2] Better damping implementation for Bullet rigid bodies
This commit is contained in:
Rémi Verschelde
2020-07-02 13:26:03 +02:00
committed by GitHub
parent 3247ac4b0e 5d8b0649be
commit 44a516986d
6 changed files with 80 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/bullet/space_bullet.cpp
View File

@@ -353,6 +353,8 @@ SpaceBullet::SpaceBullet() :
godotFilterCallback(NULL),
gravityDirection(0, -1, 0),
gravityMagnitude(10),
linear_damp(0.0),
angular_damp(0.0),
contactDebugCount(0),
delta_time(0.) {
@@ -390,8 +392,11 @@ void SpaceBullet::set_param(PhysicsServer::AreaParameter p_param, const Variant
update_gravity();
break;
case PhysicsServer::AREA_PARAM_LINEAR_DAMP:
linear_damp = p_value;
break;
case PhysicsServer::AREA_PARAM_ANGULAR_DAMP:
break; // No damp
angular_damp = p_value;
break;
case PhysicsServer::AREA_PARAM_PRIORITY:
// Priority is always 0, the lower
break;
@@ -412,8 +417,9 @@ Variant SpaceBullet::get_param(PhysicsServer::AreaParameter p_param) {
case PhysicsServer::AREA_PARAM_GRAVITY_VECTOR:
return gravityDirection;
case PhysicsServer::AREA_PARAM_LINEAR_DAMP:
return linear_damp;
case PhysicsServer::AREA_PARAM_ANGULAR_DAMP:
return 0; // No damp
return angular_damp;
case PhysicsServer::AREA_PARAM_PRIORITY:
return 0; // Priority is always 0, the lower
case PhysicsServer::AREA_PARAM_GRAVITY_IS_POINT: