Skip to content

Commit

Permalink
Rename World:queryBoundingBox to World:queryFixturesInArea.
Browse files Browse the repository at this point in the history
Matches the new World:getFixturesInArea function.
  • Loading branch information
slime73 committed Oct 2, 2023
1 parent d24ccde commit c3847d5
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/modules/physics/box2d/World.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ b2Body *World::getGroundBody() const
return groundBody;
}

int World::queryBoundingBox(lua_State *L)
int World::queryFixturesInArea(lua_State *L)
{
b2AABB box;
float lx = (float)luaL_checknumber(L, 1);
Expand Down
2 changes: 1 addition & 1 deletion src/modules/physics/box2d/World.h
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ class World : public Object, public b2ContactListener, public b2ContactFilter, p
/**
* Calls a callback on all fixtures that overlap a given bounding box.
**/
int queryBoundingBox(lua_State *L);
int queryFixturesInArea(lua_State *L);

/**
* Gets all fixtures that overlap a given bounding box.
Expand Down
15 changes: 12 additions & 3 deletions src/modules/physics/box2d/wrap_World.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,17 @@ int w_World_getContacts(lua_State *L)
return ret;
}

int w_World_queryBoundingBox(lua_State *L)
int w_World_queryFixturesInArea(lua_State *L)
{
World *t = luax_checkworld(L, 1);
lua_remove(L, 1);
return t->queryBoundingBox(L);
return t->queryFixturesInArea(L);
}

int w_World_queryBoundingBox(lua_State* L)
{
luax_markdeprecated(L, 1, "World:queryBoundingBox", API_METHOD, DEPRECATED_RENAMED, "World:queryFixturesInArea");
return w_World_queryFixturesInArea(L);
}

int w_World_getFixturesInArea(lua_State *L)
Expand Down Expand Up @@ -236,12 +242,15 @@ static const luaL_Reg w_World_functions[] =
{ "getBodies", w_World_getBodies },
{ "getJoints", w_World_getJoints },
{ "getContacts", w_World_getContacts },
{ "queryBoundingBox", w_World_queryBoundingBox },
{ "queryFixturesInArea", w_World_queryFixturesInArea },
{ "getFixturesInArea", w_World_getFixturesInArea },
{ "rayCast", w_World_rayCast },
{ "destroy", w_World_destroy },
{ "isDestroyed", w_World_isDestroyed },

// Deprecated
{ "queryBoundingBox", w_World_queryBoundingBox },

{ 0, 0 }
};

Expand Down

0 comments on commit c3847d5

Please sign in to comment.