Shape:get/setDensity;

bjornbytes · Apr 30, 2024 · ce217dd · ce217dd
1 parent a8f8f15
commit ce217dd
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 4 deletions.
diff --git a/src/api/l_physics_shapes.c b/src/api/l_physics_shapes.c
@@ -235,15 +235,15 @@ static int l_lovrShapeGetType(lua_State* L) {
 }
 
 static int l_lovrShapeGetUserData(lua_State* L) {
-  luax_checktype(L, 1, Shape);
+  luax_checkshape(L, 1);
   luax_pushstash(L, "lovr.shape.userdata");
   lua_pushvalue(L, 1);
   lua_rawget(L, -2);
   return 1;
 }
 
 static int l_lovrShapeSetUserData(lua_State* L) {
-  luax_checktype(L, 1, Shape);
+  luax_checkshape(L, 1);
   luax_pushstash(L, "lovr.shape.userdata");
   lua_pushvalue(L, 1);
   lua_pushvalue(L, 2);
@@ -252,12 +252,26 @@ static int l_lovrShapeSetUserData(lua_State* L) {
 }
 
 static int l_lovrShapeGetVolume(lua_State* L) {
-  Shape* shape = luax_checktype(L, 1, Shape);
+  Shape* shape = luax_checkshape(L, 1);
   float volume = lovrShapeGetVolume(shape);
   lua_pushnumber(L, volume);
   return 1;
 }
 
+static int l_lovrShapeGetDensity(lua_State* L) {
+  Shape* shape = luax_checkshape(L, 1);
+  float density = lovrShapeGetDensity(shape);
+  lua_pushnumber(L, density);
+  return 1;
+}
+
+static int l_lovrShapeSetDensity(lua_State* L) {
+  Shape* shape = luax_checkshape(L, 1);
+  float density = luax_checkfloat(L, 2);
+  lovrShapeSetDensity(shape, density);
+  return 0;
+}
+
 static int l_lovrShapeGetMass(lua_State* L) {
   Shape* shape = luax_checkshape(L, 1);
   float density = luax_checkfloat(L, 2);
@@ -296,7 +310,9 @@ static int l_lovrShapeGetAABB(lua_State* L) {
   { "getType", l_lovrShapeGetType }, \
   { "getUserData", l_lovrShapeGetUserData }, \
   { "setUserData", l_lovrShapeSetUserData }, \
-  { "setVolume", l_lovrShapeGetVolume }, \
+  { "getVolume", l_lovrShapeGetVolume }, \
+  { "getDensity", l_lovrShapeGetDensity }, \
+  { "setDensity", l_lovrShapeSetDensity }, \
   { "getMass", l_lovrShapeGetMass }, \
   { "getAABB", l_lovrShapeGetAABB }
 

diff --git a/src/modules/physics/physics.h b/src/modules/physics/physics.h
@@ -176,6 +176,8 @@ typedef enum {
 void lovrShapeDestroy(void* ref);
 ShapeType lovrShapeGetType(Shape* shape);
 float lovrShapeGetVolume(Shape* shape);
+float lovrShapeGetDensity(Shape* shape);
+void lovrShapeSetDensity(Shape* shape, float density);
 void lovrShapeGetMass(Shape* shape, float density, float centerOfMass[3], float* mass, float inertia[6]);
 void lovrShapeGetAABB(Shape* shape, float position[3], float orientation[4], float aabb[6]);
 

diff --git a/src/modules/physics/physics_jolt.c b/src/modules/physics/physics_jolt.c
@@ -962,6 +962,20 @@ float lovrShapeGetVolume(Shape* shape) {
   }
 }
 
+float lovrShapeGetDensity(Shape* shape) {
+  if (shape->type == SHAPE_MESH || shape->type == SHAPE_TERRAIN) {
+    return 0.f;
+  } else {
+    return JPH_ConvexShape_GetDensity((JPH_ConvexShape*) shape->handle);
+  }
+}
+
+void lovrShapeSetDensity(Shape* shape, float density) {
+  if (shape->type != SHAPE_MESH && shape->type != SHAPE_TERRAIN) {
+    JPH_ConvexShape_SetDensity((JPH_ConvexShape*) shape->handle, density);
+  }
+}
+
 void lovrShapeGetMass(Shape* shape, float density, float centerOfMass[3], float* mass, float inertia[6]) {
   //
 }

diff --git a/src/modules/physics/physics_ode.c b/src/modules/physics/physics_ode.c
@@ -847,6 +847,14 @@ float lovrShapeGetVolume(Shape* shape) {
   return 0.f;
 }
 
+float lovrShapeGetDensity(Shape* shape) {
+  return 0.f;
+}
+
+void lovrShapeSetDensity(Shape* shape, float density) {
+  //
+}
+
 Collider* lovrShapeGetCollider(Shape* shape) {
   return shape->collider;
 }