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

Change Contact callbacks to pass the actual Fixtures instead of just the userdata

Browse Source 
--HG--
branch : box2d-update
This commit is contained in:
Bill Meltsner
2011-09-24 13:51:11 -04:00
parent c233ab3d50
commit 055238659b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/physics/box2d/World.cpp
+9 -9
View File
@@ -76,22 +76,22 @@ namespace box2d
// Push the function. // Push the function.
ref->push(); ref->push();
// Push first userdata. // Push first fixture.
{ {
fixtureudata * d = (fixtureudata *)(contacts[i]->contact->GetFixtureA()->GetUserData()); Fixture * a = (Fixture *)Memoizer::find(contacts[i]->contact->GetFixtureA());
if(d->ref != 0) if(a != 0)
d->ref->push(); luax_newtype(L, "Fixture", PHYSICS_FIXTURE_T, (void*)a);
else else
lua_pushnil(L); throw love::Exception("A fixture has escaped Memoizer!");
} }
// Push second userdata. // Push second userdata.
{ {
fixtureudata * d = (fixtureudata *)(contacts[i]->contact->GetFixtureB()->GetUserData()); Fixture * b = (Fixture *)Memoizer::find(contacts[i]->contact->GetFixtureB());
if(d->ref != 0) if(b != 0)
d->ref->push(); luax_newtype(L, "Fixture", PHYSICS_FIXTURE_T, (void*)b);
else else
lua_pushnil(L); throw love::Exception("A fixture has escaped Memoizer!");
} }
luax_newtype(L, "Contact", (PHYSICS_CONTACT_T), (void*)contacts[i], false); luax_newtype(L, "Contact", (PHYSICS_CONTACT_T), (void*)contacts[i], false);