Remove damping threshold and clamp damping to 0.

bjornbytes · May 25, 2024 · 7178ab0 · 7178ab0
1 parent f3cd4c5
commit 7178ab0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 28 deletions.
diff --git a/src/api/l_physics_collider.c b/src/api/l_physics_collider.c
@@ -442,35 +442,29 @@ static int l_lovrColliderSetAngularVelocity(lua_State* L) {
 
 static int l_lovrColliderGetLinearDamping(lua_State* L) {
   Collider* collider = luax_checkcollider(L, 1);
-  float damping, threshold;
-  lovrColliderGetLinearDamping(collider, &damping, &threshold);
+  float damping = lovrColliderGetLinearDamping(collider);
   lua_pushnumber(L, damping);
-  lua_pushnumber(L, threshold);
-  return 2;
+  return 1;
 }
 
 static int l_lovrColliderSetLinearDamping(lua_State* L) {
   Collider* collider = luax_checkcollider(L, 1);
   float damping = luax_checkfloat(L, 2);
-  float threshold = luax_optfloat(L, 3, 0.0f);
-  lovrColliderSetLinearDamping(collider, damping, threshold);
+  lovrColliderSetLinearDamping(collider, damping);
   return 0;
 }
 
 static int l_lovrColliderGetAngularDamping(lua_State* L) {
   Collider* collider = luax_checkcollider(L, 1);
-  float damping, threshold;
-  lovrColliderGetAngularDamping(collider, &damping, &threshold);
+  float damping = lovrColliderGetAngularDamping(collider);
   lua_pushnumber(L, damping);
-  lua_pushnumber(L, threshold);
-  return 2;
+  return 1;
 }
 
 static int l_lovrColliderSetAngularDamping(lua_State* L) {
   Collider* collider = luax_checkcollider(L, 1);
   float damping = luax_checkfloat(L, 2);
-  float threshold = luax_optfloat(L, 3, 0.0f);
-  lovrColliderSetAngularDamping(collider, damping, threshold);
+  lovrColliderSetAngularDamping(collider, damping);
   return 0;
 }
 

diff --git a/src/modules/physics/physics.c b/src/modules/physics/physics.c
@@ -757,8 +757,8 @@ Collider* lovrColliderCreate(World* world, float position[3], Shape* shape) {
   quat_identity(collider->lastOrientation);
 
   if (type == JPH_MotionType_Dynamic) {
-    lovrColliderSetLinearDamping(collider, world->defaultLinearDamping, 0.f);
-    lovrColliderSetAngularDamping(collider, world->defaultAngularDamping, 0.f);
+    lovrColliderSetLinearDamping(collider, world->defaultLinearDamping);
+    lovrColliderSetAngularDamping(collider, world->defaultAngularDamping);
     lovrColliderSetSleepingAllowed(collider, world->defaultIsSleepingAllowed);
   }
 
@@ -1452,26 +1452,24 @@ void lovrColliderSetAngularVelocity(Collider* collider, float velocity[3]) {
   JPH_BodyInterface_SetAngularVelocity(collider->world->bodies, collider->id, vec3_toJolt(velocity));
 }
 
-void lovrColliderGetLinearDamping(Collider* collider, float* damping, float* threshold) {
+float lovrColliderGetLinearDamping(Collider* collider) {
   JPH_MotionProperties* properties = JPH_Body_GetMotionProperties(collider->body);
-  *damping = JPH_MotionProperties_GetLinearDamping(properties);
-  *threshold = 0.f;
+  return JPH_MotionProperties_GetLinearDamping(properties);
 }
 
-void lovrColliderSetLinearDamping(Collider* collider, float damping, float threshold) {
+void lovrColliderSetLinearDamping(Collider* collider, float damping) {
   JPH_MotionProperties* properties = JPH_Body_GetMotionProperties(collider->body);
-  JPH_MotionProperties_SetLinearDamping(properties, damping);
+  JPH_MotionProperties_SetLinearDamping(properties, MAX(damping, 0.f));
 }
 
-void lovrColliderGetAngularDamping(Collider* collider, float* damping, float* threshold) {
+float lovrColliderGetAngularDamping(Collider* collider) {
   JPH_MotionProperties* properties = JPH_Body_GetMotionProperties(collider->body);
-  *damping = JPH_MotionProperties_GetAngularDamping(properties);
-  *threshold = 0.f;
+  return JPH_MotionProperties_GetAngularDamping(properties);
 }
 
-void lovrColliderSetAngularDamping(Collider* collider, float damping, float threshold) {
+void lovrColliderSetAngularDamping(Collider* collider, float damping) {
   JPH_MotionProperties* properties = JPH_Body_GetMotionProperties(collider->body);
-  JPH_MotionProperties_SetAngularDamping(properties, damping);
+  JPH_MotionProperties_SetAngularDamping(properties, MAX(damping, 0.f));
 }
 
 void lovrColliderApplyForce(Collider* collider, float force[3]) {

diff --git a/src/modules/physics/physics.h b/src/modules/physics/physics.h
@@ -161,10 +161,10 @@ void lovrColliderGetLinearVelocity(Collider* collider, float velocity[3]);
 void lovrColliderSetLinearVelocity(Collider* collider, float velocity[3]);
 void lovrColliderGetAngularVelocity(Collider* collider, float velocity[3]);
 void lovrColliderSetAngularVelocity(Collider* collider, float velocity[3]);
-void lovrColliderGetLinearDamping(Collider* collider, float* damping, float* threshold);
-void lovrColliderSetLinearDamping(Collider* collider, float damping, float threshold);
-void lovrColliderGetAngularDamping(Collider* collider, float* damping, float* threshold);
-void lovrColliderSetAngularDamping(Collider* collider, float damping, float threshold);
+float lovrColliderGetLinearDamping(Collider* collider);
+void lovrColliderSetLinearDamping(Collider* collider, float damping);
+float lovrColliderGetAngularDamping(Collider* collider);
+void lovrColliderSetAngularDamping(Collider* collider, float damping);
 void lovrColliderApplyForce(Collider* collider, float force[3]);
 void lovrColliderApplyForceAtPosition(Collider* collider, float force[3], float position[3]);
 void lovrColliderApplyTorque(Collider* collider, float torque[3]);