Skip to content

Commit

Permalink
Rename contact penetration to overlap;
Browse files Browse the repository at this point in the history
  • Loading branch information
bjornbytes committed Jun 3, 2024
1 parent 0966234 commit 38ac0e4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/api/l_physics_contact.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ static int l_lovrContactGetNormal(lua_State* L) {
return 3;
}

static int l_lovrContactGetPenetration(lua_State* L) {
static int l_lovrContactGetOverlap(lua_State* L) {
Contact* contact = luax_checktype(L, 1, Contact);
float penetration = lovrContactGetPenetration(contact);
lua_pushnumber(L, penetration);
float overlap = lovrContactGetOverlap(contact);
lua_pushnumber(L, overlap);
return 1;
}

Expand Down Expand Up @@ -114,7 +114,7 @@ const luaL_Reg lovrContact[] = {
{ "getColliders", l_lovrContactGetColliders },
{ "getShapes", l_lovrContactGetShapes },
{ "getNormal", l_lovrContactGetNormal },
{ "getPenetration", l_lovrContactGetPenetration },
{ "getOverlap", l_lovrContactGetOverlap },
{ "getPoints", l_lovrContactGetPoints },
{ "getFriction", l_lovrContactGetFriction },
{ "setFriction", l_lovrContactSetFriction },
Expand Down
2 changes: 1 addition & 1 deletion src/modules/physics/physics.c
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,7 @@ void lovrContactGetNormal(Contact* contact, float normal[3]) {
vec3_fromJolt(normal, &n);
}

float lovrContactGetPenetration(Contact* contact) {
float lovrContactGetOverlap(Contact* contact) {
return JPH_ContactManifold_GetPenetrationDepth(contact->manifold);
}

Expand Down
2 changes: 1 addition & 1 deletion src/modules/physics/physics.h
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ Collider* lovrContactGetColliderB(Contact* contact);
Shape* lovrContactGetShapeA(Contact* contact);
Shape* lovrContactGetShapeB(Contact* contact);
void lovrContactGetNormal(Contact* contact, float normal[3]);
float lovrContactGetPenetration(Contact* contact);
float lovrContactGetOverlap(Contact* contact);
uint32_t lovrContactGetPointCount(Contact* contact);
void lovrContactGetPoint(Contact* contact, uint32_t index, float point[3]);
float lovrContactGetFriction(Contact* contact);
Expand Down

0 comments on commit 38ac0e4

Please sign in to comment.