Updated to Box2D 2.2, added new joints, some other updates to match the API changes (still plenty more to go though)

--HG--
branch : box2d-update
This commit is contained in:
Bill Meltsner
2011-09-03 15:39:32 -04:00
parent b3434997bf
commit 915e3e9d86
126 changed files with 8581 additions and 3772 deletions
+1 -26
View File
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2006-2009 Erin Catto http://www.gphysics.com
* Copyright (c) 2006-2009 Erin Catto http://www.box2d.org
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
@@ -34,28 +34,3 @@ bool b2ContactFilter::ShouldCollide(b2Fixture* fixtureA, b2Fixture* fixtureB)
bool collide = (filterA.maskBits & filterB.categoryBits) != 0 && (filterA.categoryBits & filterB.maskBits) != 0;
return collide;
}
b2DebugDraw::b2DebugDraw()
{
m_drawFlags = 0;
}
void b2DebugDraw::SetFlags(uint32 flags)
{
m_drawFlags = flags;
}
uint32 b2DebugDraw::GetFlags() const
{
return m_drawFlags;
}
void b2DebugDraw::AppendFlags(uint32 flags)
{
m_drawFlags |= flags;
}
void b2DebugDraw::ClearFlags(uint32 flags)
{
m_drawFlags &= ~flags;
}