lpnf/lovr
1
0
Fork 0
mirror of https://github.com/bjornbytes/lovr.git synced 2024-07-20 04:33:36 +00:00
Code Issues Projects Releases Wiki Activity

Rename contact penetration to overlap;

Browse source
This commit is contained in:
bjorn 2024-06-03 08:39:34 -07:00
parent 0966234a65
commit 38ac0e4022
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/api/l_physics_contact.c
View file

@ -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;
}
@ -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 },

2
src/modules/physics/physics.c
View file

@ -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);
}

2
src/modules/physics/physics.h
View file

@ -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);