AnotherFoxGuy/bounce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename contact areas to contact polygons

Browse Source
This commit is contained in:
Irlan 2018-04-07 01:34:11 -03:00
parent 54202454ea
commit 6dd32061d7
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bounce/dynamics/draw_world.cpp
View File

@ -80,7 +80,7 @@ void b3World::DebugDraw() const
{ {
u32 manifoldCount = c->m_manifoldCount; u32 manifoldCount = c->m_manifoldCount;
const b3Manifold* manifolds = c->m_manifolds; const b3Manifold* manifolds = c->m_manifolds;
for (u32 i = 0; i < manifoldCount; ++i) for (u32 i = 0; i < manifoldCount; ++i)
{ {
const b3Manifold* m = manifolds + i; const b3Manifold* m = manifolds + i;
@ -98,14 +98,14 @@ void b3World::DebugDraw() const
b3Vec3 n = wmp->normal; b3Vec3 n = wmp->normal;
b3Vec3 p = wmp->point; b3Vec3 p = wmp->point;
points[j] = p; points[j] = p;
if (flags & b3Draw::e_contactPointsFlag) if (flags & b3Draw::e_contactPointsFlag)
{ {
b3_debugDraw->DrawPoint(p, 4.0f, mp->persisting ? b3Color_green : b3Color_red); b3_debugDraw->DrawPoint(p, 4.0f, mp->persisting ? b3Color_green : b3Color_red);
} }
if (flags & b3Draw::e_contactNormalsFlag) if (flags & b3Draw::e_contactNormalsFlag)
{ {
b3_debugDraw->DrawSegment(p, p + n, b3Color_white); b3_debugDraw->DrawSegment(p, p + n, b3Color_white);
@ -118,7 +118,7 @@ void b3World::DebugDraw() const
b3Vec3 n = wm.normal; b3Vec3 n = wm.normal;
t1 = wm.tangent1; t1 = wm.tangent1;
t2 = wm.tangent2; t2 = wm.tangent2;
if (flags & b3Draw::e_contactNormalsFlag) if (flags & b3Draw::e_contactNormalsFlag)
{ {
b3_debugDraw->DrawSegment(p, p + n, b3Color_yellow); b3_debugDraw->DrawSegment(p, p + n, b3Color_yellow);
@ -130,9 +130,12 @@ void b3World::DebugDraw() const
b3_debugDraw->DrawSegment(p, p + t2, b3Color_yellow); b3_debugDraw->DrawSegment(p, p + t2, b3Color_yellow);
} }
if (flags & b3Draw::e_contactPolygonsFlag) if (m->pointCount > 2)
{ {
b3_debugDraw->DrawSolidPolygon(wm.normal, points, m->pointCount, b3Color_pink); if (flags & b3Draw::e_contactPolygonsFlag)
{
b3_debugDraw->DrawSolidPolygon(wm.normal, points, m->pointCount, b3Color_pink);
}
} }
} }
} }
@ -169,7 +172,7 @@ void b3World::DrawShape(const b3Transform& xf, const b3Shape* shape) const
{ {
const b3HalfEdge* edge = hull->GetEdge(i); const b3HalfEdge* edge = hull->GetEdge(i);
const b3HalfEdge* twin = hull->GetEdge(i + 1); const b3HalfEdge* twin = hull->GetEdge(i + 1);
b3Vec3 p1 = xf * hull->vertices[edge->origin]; b3Vec3 p1 = xf * hull->vertices[edge->origin];
b3Vec3 p2 = xf * hull->vertices[twin->origin]; b3Vec3 p2 = xf * hull->vertices[twin->origin];
@ -252,5 +255,5 @@ void b3World::DrawJoint(const b3Joint* joint) const
void b3World::DrawContact(const b3Contact* c) const void b3World::DrawContact(const b3Contact* c) const
{ {
B3_NOT_USED(c); B3_NOT_USED(c);
} }