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

World:rayCastAny and rayCastClosest also return the fixture they hit.

Browse Source
This commit is contained in:
Sasha Szpakowski
2023-10-02 14:05:54 -03:00
parent 6cb0287500
commit da430d5145
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/physics/box2d/World.cpp
+14 -4
View File
@@ -242,7 +242,7 @@ float World::RayCastCallback::ReportFixture(b2Fixture *fixture, const b2Vec2 &po
} }
World::RayCastOneCallback::RayCastOneCallback(uint16 categoryMask, bool any) World::RayCastOneCallback::RayCastOneCallback(uint16 categoryMask, bool any)
: hit(false) : hitFixture(nullptr)
, hitPoint() , hitPoint()
, hitNormal() , hitNormal()
, hitFraction(1.0f) , hitFraction(1.0f)
@@ -256,7 +256,7 @@ float World::RayCastOneCallback::ReportFixture(b2Fixture *fixture, const b2Vec2
if (categoryMask != 0xFFFF && (categoryMask & fixture->GetFilterData().categoryBits) == 0) if (categoryMask != 0xFFFF && (categoryMask & fixture->GetFilterData().categoryBits) == 0)
return -1; return -1;
hit = true; hitFixture = fixture;
hitPoint = point; hitPoint = point;
hitNormal = normal; hitNormal = normal;
hitFraction = fraction; hitFraction = fraction;
@@ -652,8 +652,13 @@ int World::rayCastAny(lua_State *L)
b2Vec2 v2 = Physics::scaleDown(b2Vec2(x2, y2)); b2Vec2 v2 = Physics::scaleDown(b2Vec2(x2, y2));
RayCastOneCallback raycast(categoryMaskBits, true); RayCastOneCallback raycast(categoryMaskBits, true);
world->RayCast(&raycast, v1, v2); world->RayCast(&raycast, v1, v2);
if (raycast.hit) if (raycast.hitFixture)
{ {
Fixture *f = (Fixture *)(raycast.hitFixture->GetUserData().pointer);
if (f == nullptr)
return luaL_error(L, "A fixture has escaped Memoizer!");
luax_pushtype(L, f);
b2Vec2 hitPoint = Physics::scaleUp(raycast.hitPoint); b2Vec2 hitPoint = Physics::scaleUp(raycast.hitPoint);
lua_pushnumber(L, hitPoint.x); lua_pushnumber(L, hitPoint.x);
lua_pushnumber(L, hitPoint.y); lua_pushnumber(L, hitPoint.y);
@@ -676,8 +681,13 @@ int World::rayCastClosest(lua_State *L)
b2Vec2 v2 = Physics::scaleDown(b2Vec2(x2, y2)); b2Vec2 v2 = Physics::scaleDown(b2Vec2(x2, y2));
RayCastOneCallback raycast(categoryMaskBits, false); RayCastOneCallback raycast(categoryMaskBits, false);
world->RayCast(&raycast, v1, v2); world->RayCast(&raycast, v1, v2);
if (raycast.hit) if (raycast.hitFixture)
{ {
Fixture *f = (Fixture *)(raycast.hitFixture->GetUserData().pointer);
if (f == nullptr)
return luaL_error(L, "A fixture has escaped Memoizer!");
luax_pushtype(L, f);
b2Vec2 hitPoint = Physics::scaleUp(raycast.hitPoint); b2Vec2 hitPoint = Physics::scaleUp(raycast.hitPoint);
lua_pushnumber(L, hitPoint.x); lua_pushnumber(L, hitPoint.x);
lua_pushnumber(L, hitPoint.y); lua_pushnumber(L, hitPoint.y);
src/modules/physics/box2d/World.h
+1 -1
View File
@@ -136,7 +136,7 @@ public:
virtual ~RayCastOneCallback() {}; virtual ~RayCastOneCallback() {};
float ReportFixture(b2Fixture* fixture, const b2Vec2& point, const b2Vec2& normal, float fraction) override; float ReportFixture(b2Fixture* fixture, const b2Vec2& point, const b2Vec2& normal, float fraction) override;
bool hit; b2Fixture *hitFixture;
b2Vec2 hitPoint; b2Vec2 hitPoint;
b2Vec2 hitNormal; b2Vec2 hitNormal;
float hitFraction; float hitFraction;