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

CompoundShape:replaceShape fixes;

This commit is contained in:
bjorn 2024-04-07 13:35:16 -07:00
parent e36374c4cf
commit 582ee1625f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/l_physics_shapes.c
View File

@ -402,7 +402,7 @@ static int l_lovrCompoundShapeAddShape(lua_State* L) {
static int l_lovrCompoundShapeReplaceShape(lua_State* L) {
CompoundShape* shape = luax_checktype(L, 1, CompoundShape);
uint32_t index = luax_checku32(L, 2);
uint32_t index = luax_checku32(L, 2) - 1;
Shape* child = luax_checkshape(L, 3);
float position[3], orientation[4];
int i = 4;

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

@ -1041,6 +1041,7 @@ void lovrCompoundShapeReplaceShape(CompoundShape* shape, uint32_t index, Shape*
lovrCheck(child != shape, "Don't put a CompoundShape inside itself! lol");
JPH_Vec3 pos = { position[0], position[1], position[2] };
JPH_Quat rot = { orientation[0], orientation[1], orientation[2], orientation[3] };
lovrRelease(lovrCompoundShapeGetShape(shape, index), lovrShapeDestroy);
JPH_MutableCompoundShape_ModifyShape2((JPH_MutableCompoundShape*) shape->shape, index, &pos, &rot, child->shape);
lovrRetain(child);
}