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:28:48 -03:00
parent 5401e8aba2
commit 54202454ea
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/testbed/framework/main.cpp
View File

@ -405,7 +405,7 @@ static void Interface()
ImGui::Checkbox("Contact Points", &g_settings.drawContactPoints); ImGui::Checkbox("Contact Points", &g_settings.drawContactPoints);
ImGui::Checkbox("Contact Normals", &g_settings.drawContactNormals); ImGui::Checkbox("Contact Normals", &g_settings.drawContactNormals);
ImGui::Checkbox("Contact Tangents", &g_settings.drawContactTangents); ImGui::Checkbox("Contact Tangents", &g_settings.drawContactTangents);
ImGui::Checkbox("Contact Areas", &g_settings.drawContactAreas); ImGui::Checkbox("Contact Polygons", &g_settings.drawContactPolygons);
ImGui::Checkbox("Statistics", &g_settings.drawStats); ImGui::Checkbox("Statistics", &g_settings.drawStats);
ImGui::Checkbox("Profile", &g_settings.drawProfile); ImGui::Checkbox("Profile", &g_settings.drawProfile);

2
examples/testbed/framework/test.cpp
View File

@ -136,7 +136,7 @@ void Test::Step()
drawFlags += g_settings.drawContactPoints * b3Draw::e_contactPointsFlag; drawFlags += g_settings.drawContactPoints * b3Draw::e_contactPointsFlag;
drawFlags += g_settings.drawContactNormals * b3Draw::e_contactNormalsFlag; drawFlags += g_settings.drawContactNormals * b3Draw::e_contactNormalsFlag;
drawFlags += g_settings.drawContactTangents * b3Draw::e_contactTangentsFlag; drawFlags += g_settings.drawContactTangents * b3Draw::e_contactTangentsFlag;
drawFlags += g_settings.drawContactAreas * b3Draw::e_contactAreasFlag; drawFlags += g_settings.drawContactPolygons * b3Draw::e_contactPolygonsFlag;
g_debugDraw->SetFlags(drawFlags); g_debugDraw->SetFlags(drawFlags);
m_world.DebugDraw(); m_world.DebugDraw();

4
examples/testbed/tests/test.h
View File

@ -53,7 +53,7 @@ struct Settings
drawContactPoints = true; drawContactPoints = true;
drawContactNormals = false; drawContactNormals = false;
drawContactTangents = false; drawContactTangents = false;
drawContactAreas = false; drawContactPolygons = false;
drawStats = false; drawStats = false;
drawProfile = false; drawProfile = false;
drawGrid = true; drawGrid = true;
@ -84,7 +84,7 @@ struct Settings
bool drawContactPoints; bool drawContactPoints;
bool drawContactNormals; bool drawContactNormals;
bool drawContactTangents; bool drawContactTangents;
bool drawContactAreas; bool drawContactPolygons;
bool drawStats; bool drawStats;
bool drawProfile; bool drawProfile;
bool drawGrid; bool drawGrid;

2
include/bounce/common/draw.h
View File

@ -54,7 +54,7 @@ public :
e_contactPointsFlag = 0x0008, e_contactPointsFlag = 0x0008,
e_contactNormalsFlag = 0x0010, e_contactNormalsFlag = 0x0010,
e_contactTangentsFlag = 0x0020, e_contactTangentsFlag = 0x0020,
e_contactAreasFlag = 0x0040, e_contactPolygonsFlag = 0x0040,
e_aabbsFlag = 0x0080, e_aabbsFlag = 0x0080,
}; };

2
include/bounce/common/settings.h
View File

@ -175,4 +175,4 @@ struct b3Version
// The current version of Bounce. // The current version of Bounce.
extern b3Version b3_version; extern b3Version b3_version;
#endif #endif

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

@ -130,7 +130,7 @@ void b3World::DebugDraw() const
b3_debugDraw->DrawSegment(p, p + t2, b3Color_yellow); b3_debugDraw->DrawSegment(p, p + t2, b3Color_yellow);
} }
if (flags & b3Draw::e_contactAreasFlag) if (flags & b3Draw::e_contactPolygonsFlag)
{ {
b3_debugDraw->DrawSolidPolygon(wm.normal, points, m->pointCount, b3Color_pink); b3_debugDraw->DrawSolidPolygon(wm.normal, points, m->pointCount, b3Color_pink);
} }