mirror of
https://github.com/bjornbytes/lovr.git
synced 2024-07-08 15:13:35 +00:00
Rename get/setEnabledAxes to get/setDegreesOfFreedom;
This commit is contained in:
parent
30352ee328
commit
8a02defdf7
|
@ -33,7 +33,7 @@ dev
|
|||
- Add `World:collideShape`.
|
||||
- Add `Collider:get/setGravityScale`.
|
||||
- Add `Collider:is/setContinuous`.
|
||||
- Add `Collider:get/setEnabledAxes`.
|
||||
- Add `Collider:get/setDegreesOfFreedom`.
|
||||
- Add `Collider:applyLinearImpulse` and `Collider:applyAngularImpulse`.
|
||||
- Add `Collider:getRawPosition` and `Collider:getRawOrientation`.
|
||||
- Add `Collider:getShape`.
|
||||
|
|
|
@ -267,11 +267,11 @@ static int l_lovrColliderResetMassData(lua_State* L) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int l_lovrColliderGetEnabledAxes(lua_State* L) {
|
||||
static int l_lovrColliderGetDegreesOfFreedom(lua_State* L) {
|
||||
Collider* collider = luax_checkcollider(L, 1);
|
||||
bool translation[3];
|
||||
bool rotation[3];
|
||||
lovrColliderGetEnabledAxes(collider, translation, rotation);
|
||||
lovrColliderGetDegreesOfFreedom(collider, translation, rotation);
|
||||
|
||||
char string[3];
|
||||
size_t length;
|
||||
|
@ -295,7 +295,7 @@ static int l_lovrColliderGetEnabledAxes(lua_State* L) {
|
|||
return 2;
|
||||
}
|
||||
|
||||
static int l_lovrColliderSetEnabledAxes(lua_State* L) {
|
||||
static int l_lovrColliderSetDegreesOfFreedom(lua_State* L) {
|
||||
Collider* collider = luax_checkcollider(L, 1);
|
||||
bool translation[3] = { false, false, false };
|
||||
bool rotation[3] = { false, false, false };
|
||||
|
@ -316,7 +316,7 @@ static int l_lovrColliderSetEnabledAxes(lua_State* L) {
|
|||
}
|
||||
}
|
||||
|
||||
lovrColliderSetEnabledAxes(collider, translation, rotation);
|
||||
lovrColliderSetDegreesOfFreedom(collider, translation, rotation);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -693,8 +693,8 @@ const luaL_Reg lovrCollider[] = {
|
|||
{ "getAutomaticMass", l_lovrColliderGetAutomaticMass },
|
||||
{ "setAutomaticMass", l_lovrColliderSetAutomaticMass },
|
||||
{ "resetMassData", l_lovrColliderResetMassData },
|
||||
{ "getEnabledAxes", l_lovrColliderGetEnabledAxes },
|
||||
{ "setEnabledAxes", l_lovrColliderSetEnabledAxes },
|
||||
{ "getDegreesOfFreedom", l_lovrColliderGetDegreesOfFreedom },
|
||||
{ "setDegreesOfFreedom", l_lovrColliderSetDegreesOfFreedom },
|
||||
{ "getPosition", l_lovrColliderGetPosition },
|
||||
{ "setPosition", l_lovrColliderSetPosition },
|
||||
{ "getOrientation", l_lovrColliderGetOrientation },
|
||||
|
|
|
@ -1376,7 +1376,7 @@ void lovrColliderResetMassData(Collider* collider) {
|
|||
}
|
||||
}
|
||||
|
||||
void lovrColliderGetEnabledAxes(Collider* collider, bool translation[3], bool rotation[3]) {
|
||||
void lovrColliderGetDegreesOfFreedom(Collider* collider, bool translation[3], bool rotation[3]) {
|
||||
JPH_MotionProperties* motion = JPH_Body_GetMotionProperties(collider->body);
|
||||
JPH_AllowedDOFs dofs = JPH_MotionProperties_GetAllowedDOFs(motion);
|
||||
if (dofs & JPH_AllowedDOFs_TranslationX) translation[0] = true;
|
||||
|
@ -1387,7 +1387,7 @@ void lovrColliderGetEnabledAxes(Collider* collider, bool translation[3], bool ro
|
|||
if (dofs & JPH_AllowedDOFs_RotationZ) rotation[2] = true;
|
||||
}
|
||||
|
||||
void lovrColliderSetEnabledAxes(Collider* collider, bool translation[3], bool rotation[3]) {
|
||||
void lovrColliderSetDegreesOfFreedom(Collider* collider, bool translation[3], bool rotation[3]) {
|
||||
JPH_AllowedDOFs dofs = 0;
|
||||
|
||||
if (translation[0]) dofs |= JPH_AllowedDOFs_TranslationX;
|
||||
|
|
|
@ -148,8 +148,8 @@ void lovrColliderSetCenterOfMass(Collider* collider, float center[3]);
|
|||
bool lovrColliderGetAutomaticMass(Collider* collider);
|
||||
void lovrColliderSetAutomaticMass(Collider* collider, bool enable);
|
||||
void lovrColliderResetMassData(Collider* collider);
|
||||
void lovrColliderGetEnabledAxes(Collider* collider, bool translation[3], bool rotation[3]);
|
||||
void lovrColliderSetEnabledAxes(Collider* collider, bool translation[3], bool rotation[3]);
|
||||
void lovrColliderGetDegreesOfFreedom(Collider* collider, bool translation[3], bool rotation[3]);
|
||||
void lovrColliderSetDegreesOfFreedom(Collider* collider, bool translation[3], bool rotation[3]);
|
||||
void lovrColliderGetPosition(Collider* collider, float position[3]);
|
||||
void lovrColliderSetPosition(Collider* collider, float position[3]);
|
||||
void lovrColliderGetOrientation(Collider* collider, float orientation[4]);
|
||||
|
|
Loading…
Reference in a new issue