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

updated to latest mobile-common (0cf55b7da58e), removed libtiff, libpng, libmng, devil, jasper, jpeg-8d, added libturbo-jpeg

Browse Source
This commit is contained in:
fysx
2014-08-27 23:19:11 +02:00
parent aba2f47b31
commit abb819335b
1910 changed files with 78167 additions and 922995 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jni/love/src/modules/physics/box2d/Body.cpp
+27 -6
View File
@@ -41,7 +41,6 @@ Body::Body(World *world, b2Vec2 p, Body::Type type)
{
udata = new bodyudata();
udata->ref = nullptr;
world->retain();
b2BodyDef def;
def.position = Physics::scaleDown(p);
def.userData = (void *) udata;
@@ -57,8 +56,7 @@ Body::Body(b2Body *b)
, udata(nullptr)
{
udata = (bodyudata *) b->GetUserData();
world = (World *)Memoizer::find(b->GetWorld());
world->retain();
world.set((World *) Memoizer::find(b->GetWorld()));
// Box2D body holds a reference to the love Body.
this->retain();
Memoizer::add(body, this);
@@ -69,7 +67,6 @@ Body::~Body()
if (udata != nullptr)
delete udata->ref;
delete udata;
world->release();
}
float Body::getX()
@@ -420,7 +417,7 @@ bool Body::isFixedRotation() const
World *Body::getWorld() const
{
return world;
return world.get();
}
int Body::getFixtureList(lua_State *L) const
@@ -435,7 +432,6 @@ int Body::getFixtureList(lua_State *L) const
Fixture *fixture = (Fixture *)Memoizer::find(f);
if (!fixture)
throw love::Exception("A fixture has escaped Memoizer!");
fixture->retain();
luax_pushtype(L, "Fixture", PHYSICS_FIXTURE_T, fixture);
lua_rawseti(L, -2, i);
i++;
@@ -444,6 +440,31 @@ int Body::getFixtureList(lua_State *L) const
return 1;
}
int Body::getContactList(lua_State *L) const
{
lua_newtable(L);
const b2ContactEdge *ce = body->GetContactList();
int i = 1;
do
{
if (!ce)
break;
Contact *contact = (Contact *) Memoizer::find(ce->contact);
if (!contact)
contact = new Contact(ce->contact);
else
contact->retain();
luax_pushtype(L, "Contact", PHYSICS_CONTACT_T, contact);
contact->release();
lua_rawseti(L, -2, i);
i++;
}
while ((ce = ce->next));
return 1;
}
b2Vec2 Body::getVector(lua_State *L)
{
love::luax_assert_argc(L, 2, 2);