lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rm lovrColliderInitInertia;

This commit is contained in:
bjorn 2024-04-22 10:01:13 -07:00
parent eaf6805fc6
commit f9169202d0
4 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/l_physics_world.c
View File

@ -51,7 +51,6 @@ static int l_lovrWorldNewBoxCollider(lua_State* L) {
int index = luax_readvec3(L, 2, position, NULL);
BoxShape* shape = luax_newboxshape(L, index);
Collider* collider = lovrColliderCreate(world, shape, position);
lovrColliderInitInertia(collider, shape);
luax_pushtype(L, Collider, collider);
lovrRelease(collider, lovrColliderDestroy);
lovrRelease(shape, lovrShapeDestroy);
@ -64,7 +63,6 @@ static int l_lovrWorldNewCapsuleCollider(lua_State* L) {
int index = luax_readvec3(L, 2, position, NULL);
CapsuleShape* shape = luax_newcapsuleshape(L, index);
Collider* collider = lovrColliderCreate(world, shape, position);
lovrColliderInitInertia(collider, shape);
luax_pushtype(L, Collider, collider);
lovrRelease(collider, lovrColliderDestroy);
lovrRelease(shape, lovrShapeDestroy);
@ -77,7 +75,6 @@ static int l_lovrWorldNewCylinderCollider(lua_State* L) {
int index = luax_readvec3(L, 2, position, NULL);
CylinderShape* shape = luax_newcylindershape(L, index);
Collider* collider = lovrColliderCreate(world, shape, position);
lovrColliderInitInertia(collider, shape);
luax_pushtype(L, Collider, collider);
lovrRelease(collider, lovrColliderDestroy);
lovrRelease(shape, lovrShapeDestroy);
@ -90,7 +87,6 @@ static int l_lovrWorldNewConvexCollider(lua_State* L) {
int index = luax_readvec3(L, 2, position, NULL);
ConvexShape* shape = luax_newconvexshape(L, index);
Collider* collider = lovrColliderCreate(world, shape, position);
lovrColliderInitInertia(collider, shape);
luax_pushtype(L, Collider, collider);
lovrRelease(collider, lovrColliderDestroy);
lovrRelease(shape, lovrShapeDestroy);
@ -103,7 +99,6 @@ static int l_lovrWorldNewSphereCollider(lua_State* L) {
int index = luax_readvec3(L, 2, position, NULL);
SphereShape* shape = luax_newsphereshape(L, index);
Collider* collider = lovrColliderCreate(world, shape, position);
lovrColliderInitInertia(collider, shape);
luax_pushtype(L, Collider, collider);
lovrRelease(collider, lovrColliderDestroy);
lovrRelease(shape, lovrShapeDestroy);
@ -115,7 +110,6 @@ static int l_lovrWorldNewMeshCollider(lua_State* L) {
MeshShape* shape = luax_newmeshshape(L, 2);
float position[3] = { 0.f, 0.f, 0.f };
Collider* collider = lovrColliderCreate(world, shape, position);
lovrColliderInitInertia(collider, shape);
luax_pushtype(L, Collider, collider);
lovrRelease(collider, lovrColliderDestroy);
lovrRelease(shape, lovrShapeDestroy);

1
src/modules/physics/physics.h
View File

@ -84,7 +84,6 @@ void lovrColliderDestroyData(Collider* collider);
bool lovrColliderIsDestroyed(Collider* collider);
bool lovrColliderIsEnabled(Collider* collider);
void lovrColliderSetEnabled(Collider* collider, bool enable);
void lovrColliderInitInertia(Collider* collider, Shape* shape);
World* lovrColliderGetWorld(Collider* collider);
Joint* lovrColliderGetJoints(Collider* collider, Joint* joint);
Shape* lovrColliderGetShape(Collider* collider, uint32_t child);

10
src/modules/physics/physics_jolt.c
View File

@ -416,10 +416,6 @@ void lovrColliderSetEnabled(Collider* collider, bool enable) {
}
}
void lovrColliderInitInertia(Collider* collider, Shape* shape) {
//
}
World* lovrColliderGetWorld(Collider* collider) {
return collider->world;
}
@ -667,9 +663,6 @@ void lovrColliderGetLinearDamping(Collider* collider, float* damping, float* thr
void lovrColliderSetLinearDamping(Collider* collider, float damping, float threshold) {
JPH_MotionProperties* properties = JPH_Body_GetMotionProperties(collider->body);
JPH_MotionProperties_SetLinearDamping(properties, damping);
if (threshold != 0.f) {
lovrLog(LOG_WARN, "PHY", "Jolt does not support velocity threshold parameter for damping");
}
}
void lovrColliderGetAngularDamping(Collider* collider, float* damping, float* threshold) {
@ -681,9 +674,6 @@ void lovrColliderGetAngularDamping(Collider* collider, float* damping, float* th
void lovrColliderSetAngularDamping(Collider* collider, float damping, float threshold) {
JPH_MotionProperties* properties = JPH_Body_GetMotionProperties(collider->body);
JPH_MotionProperties_SetAngularDamping(properties, damping);
if (threshold != 0.f) {
lovrLog(LOG_WARN, "PHY", "Jolt does not support velocity threshold parameter for damping");
}
}
void lovrColliderApplyForce(Collider* collider, float force[3]) {

8
src/modules/physics/physics_ode.c
View File

@ -475,14 +475,6 @@ void lovrColliderSetEnabled(Collider* collider, bool enable) {
//
}
void lovrColliderInitInertia(Collider* collider, Shape* shape) {
// compute inertia matrix for default density
const float density = 1.0f;
float centerOfMass[3], mass, inertia[6];
lovrShapeGetMass(shape, density, centerOfMass, &mass, inertia);
lovrColliderSetMassData(collider, centerOfMass, mass, inertia);
}
World* lovrColliderGetWorld(Collider* collider) {
return collider->world;
}