LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 12:14:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

World:rayCast and World:queryBoundingBox have user args passed through to the callback function.

Browse Source 
Fixes #1194
This commit is contained in:
Sasha Szpakowski
2023-10-02 11:00:02 -03:00
parent b1609ed83b
commit d24ccde864
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/physics/box2d/World.cpp
+8 -2
View File
@@ -147,6 +147,7 @@ World::QueryCallback::QueryCallback(World *world, lua_State *L, int idx)
, funcidx(idx) , funcidx(idx)
{ {
luaL_checktype(L, funcidx, LUA_TFUNCTION); luaL_checktype(L, funcidx, LUA_TFUNCTION);
userargs = lua_gettop(L) - funcidx;
} }
World::QueryCallback::~QueryCallback() World::QueryCallback::~QueryCallback()
@@ -162,7 +163,9 @@ bool World::QueryCallback::ReportFixture(b2Fixture *fixture)
if (!f) if (!f)
throw love::Exception("A fixture has escaped Memoizer!"); throw love::Exception("A fixture has escaped Memoizer!");
luax_pushtype(L, f); luax_pushtype(L, f);
lua_call(L, 1, 1); for (int i = 1; i <= userargs; i++)
lua_pushvalue(L, funcidx + i);
lua_call(L, 1 + userargs, 1);
bool cont = luax_toboolean(L, -1); bool cont = luax_toboolean(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
return cont; return cont;
@@ -199,6 +202,7 @@ World::RayCastCallback::RayCastCallback(World *world, lua_State *L, int idx)
, funcidx(idx) , funcidx(idx)
{ {
luaL_checktype(L, funcidx, LUA_TFUNCTION); luaL_checktype(L, funcidx, LUA_TFUNCTION);
userargs = lua_gettop(L) - funcidx;
} }
World::RayCastCallback::~RayCastCallback() World::RayCastCallback::~RayCastCallback()
@@ -220,7 +224,9 @@ float World::RayCastCallback::ReportFixture(b2Fixture *fixture, const b2Vec2 &po
lua_pushnumber(L, normal.x); lua_pushnumber(L, normal.x);
lua_pushnumber(L, normal.y); lua_pushnumber(L, normal.y);
lua_pushnumber(L, fraction); lua_pushnumber(L, fraction);
lua_call(L, 6, 1); for (int i = 1; i <= userargs; i++)
lua_pushvalue(L, funcidx + i);
lua_call(L, 6 + userargs, 1);
if (!lua_isnumber(L, -1)) if (!lua_isnumber(L, -1))
luaL_error(L, "Raycast callback didn't return a number!"); luaL_error(L, "Raycast callback didn't return a number!");
float fraction = (float) lua_tonumber(L, -1); float fraction = (float) lua_tonumber(L, -1);
src/modules/physics/box2d/World.h
+2
View File
@@ -100,6 +100,7 @@ public:
World *world; World *world;
lua_State *L; lua_State *L;
int funcidx; int funcidx;
int userargs;
}; };
class CollectCallback : public b2QueryCallback class CollectCallback : public b2QueryCallback
@@ -124,6 +125,7 @@ public:
World *world; World *world;
lua_State *L; lua_State *L;
int funcidx; int funcidx;
int userargs;
}; };
/** /**