LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 07:41:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename to get/setKinematicState

Browse Source
This commit is contained in:
Garrett Brown
2020-09-20 21:54:02 -04:00
parent e4c7a4e777
commit bd6d50e2a9
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/physics/box2d/Body.cpp
+2 -2
View File
@@ -112,7 +112,7 @@ float Body::getAngularVelocity() const
return body->GetAngularVelocity();
}
void Body::getState(b2Vec2 &pos_o, float &a_o, b2Vec2 &vel_o, float &da_o) const
void Body::getKinematicState(b2Vec2 &pos_o, float &a_o, b2Vec2 &vel_o, float &da_o) const
{
pos_o = Physics::scaleUp(body->GetPosition());
a_o = body->GetAngle();
@@ -233,7 +233,7 @@ void Body::setAngularVelocity(float r)
body->SetAngularVelocity(r);
}
void Body::setState(b2Vec2 pos, float a, b2Vec2 vel, float da)
void Body::setKinematicState(b2Vec2 pos, float a, b2Vec2 vel, float da)
{
body->SetTransform(Physics::scaleDown(pos), a);
body->SetLinearVelocity(Physics::scaleDown(vel));
src/modules/physics/box2d/Body.h
+2 -2
View File
@@ -132,7 +132,7 @@ public:
/**
* Get the current Body kinematic state. (Position, angle, velocity, angle velocity).
**/
void getState(b2Vec2 &pos_o, float &a_o, b2Vec2& vel_o, float &da_o) const;
void getKinematicState(b2Vec2 &pos_o, float &a_o, b2Vec2& vel_o, float &da_o) const;
/**
* Gets the Body's mass.
@@ -227,7 +227,7 @@ public:
/**
* Set the current Body kinematic state. (Position, angle, velocity, angle velocity).
**/
void setState(b2Vec2 pos, float a, b2Vec2 vel, float da);
void setKinematicState(b2Vec2 pos, float a, b2Vec2 vel, float da);
/**
* Sets the current position of the Body.
src/modules/physics/box2d/wrap_Body.cpp
+6 -6
View File
@@ -125,12 +125,12 @@ int w_Body_getAngularVelocity(lua_State *L)
return 1;
}
int w_Body_getState(lua_State *L)
int w_Body_getKinematicState(lua_State *L)
{
Body *t = luax_checkbody(L, 1);
b2Vec2 pos_o, vel_o;
float a_o, da_o;
t->getState(pos_o, a_o, vel_o, da_o);
t->getKinematicState(pos_o, a_o, vel_o, da_o);
lua_pushnumber(L, pos_o.x);
lua_pushnumber(L, pos_o.y);
lua_pushnumber(L, a_o);
@@ -328,7 +328,7 @@ int w_Body_setPosition(lua_State *L)
return 0;
}
int w_Body_setState(lua_State *L)
int w_Body_setKinematicState(lua_State *L)
{
Body *t = luax_checkbody(L, 1);
float x = (float)luaL_checknumber(L, 2);
@@ -337,7 +337,7 @@ int w_Body_setState(lua_State *L)
float dx = (float)luaL_checknumber(L, 5);
float dy = (float)luaL_checknumber(L, 6);
float da = (float)luaL_checknumber(L, 7);
luax_catchexcept(L, [&](){ t->setState(b2Vec2(x, y), a, b2Vec2(dx, dy), da); });
luax_catchexcept(L, [&](){ t->setKinematicState(b2Vec2(x, y), a, b2Vec2(dx, dy), da); });
return 0;
}
@@ -659,7 +659,7 @@ static const luaL_Reg w_Body_functions[] =
{ "getWorldCenter", w_Body_getWorldCenter },
{ "getLocalCenter", w_Body_getLocalCenter },
{ "getAngularVelocity", w_Body_getAngularVelocity },
{ "getState", w_Body_getState },
{ "getKinematicState", w_Body_getKinematicState },
{ "getMass", w_Body_getMass },
{ "getInertia", w_Body_getInertia },
{ "getMassData", w_Body_getMassData },
@@ -677,7 +677,7 @@ static const luaL_Reg w_Body_functions[] =
{ "setAngle", w_Body_setAngle },
{ "setAngularVelocity", w_Body_setAngularVelocity },
{ "setPosition", w_Body_setPosition },
{ "setState", w_Body_setState },
{ "setKinematicState", w_Body_setKinematicState },
{ "resetMassData", w_Body_resetMassData },
{ "setMassData", w_Body_setMassData },
{ "setMass", w_Body_setMass },