Miscellaneous fixes (erincatto#736)

erincatto#711 erincatto#732 erincatto#731 erincatto#729 erincatto#723 erincatto#718

docs/dynamics.md

@@ -637,7 +637,7 @@ too strong.
 
 ### Joint Definition
 Each joint type has a definition that derives from b2JointDef. All
-joints are connected between two different bodies. One body may static.
+joints are connected between two different bodies. One body may be static.
 Joints between static and/or kinematic bodies are allowed, but have no
 effect and use some processing time.
 

include/box2d/b2_collision.h

@@ -244,7 +244,7 @@ B2_API void b2CollideEdgeAndCircle(b2Manifold* manifold,
 /// Compute the collision manifold between an edge and a polygon.
 B2_API void b2CollideEdgeAndPolygon(b2Manifold* manifold,
 							   const b2EdgeShape* edgeA, const b2Transform& xfA,
-							   const b2PolygonShape* circleB, const b2Transform& xfB);
+							   const b2PolygonShape* polygonB, const b2Transform& xfB);
 
 /// Clipping for contact manifolds.
 B2_API int32 b2ClipSegmentToLine(b2ClipVertex vOut[2], const b2ClipVertex vIn[2],

include/box2d/b2_world.h

@@ -221,6 +221,9 @@ class B2_API b2World
 	friend class b2ContactManager;
 	friend class b2Controller;
 
+	b2World(const b2World&) = delete;
+	void operator=(const b2World&) = delete;
+
 	void Solve(const b2TimeStep& step);
 	void SolveTOI(const b2TimeStep& step);
 

src/dynamics/b2_contact_solver.cpp

@@ -775,7 +775,7 @@ bool b2ContactSolver::SolveTOIPositionConstraints(int32 toiIndexA, int32 toiInde
 		}
 
 		float mB = 0.0f;
-		float iB = 0.;
+		float iB = 0.0f;
 		if (indexB == toiIndexA || indexB == toiIndexB)
 		{
 			mB = pc->invMassB;

src/rope/b2_rope.cpp

@@ -243,7 +243,7 @@ void b2Rope::SetTuning(const b2RopeTuning& tuning)
 
 void b2Rope::Step(float dt, int32 iterations, const b2Vec2& position)
 {
-	if (dt == 0.0)
+	if (dt == 0.0f)
 	{
 		return;
 	}

testbed/main.cpp

@@ -45,6 +45,7 @@ static Test* s_test = nullptr;
 static Settings s_settings;
 static bool s_rightMouseDown = false;
 static b2Vec2 s_clickPointWS = b2Vec2_zero;
+static float s_displayScale = 1.0f;
 
 void glfwErrorCallback(int error, const char* description)
 {
@@ -113,7 +114,7 @@ static void CreateUI(GLFWwindow* window, const char* glslVersion = NULL)
 
 	if (fontPath)
 	{
-		ImGui::GetIO().Fonts->AddFontFromFileTTF(fontPath, 16.0f);
+		ImGui::GetIO().Fonts->AddFontFromFileTTF(fontPath, 14.0f * s_displayScale);
 	}
 }
 
@@ -350,11 +351,11 @@ static void ScrollCallback(GLFWwindow* window, double dx, double dy)
 
 static void UpdateUI()
 {
-	int menuWidth = 180;
+	float menuWidth = 180.0f * s_displayScale;
 	if (g_debugDraw.m_showUI)
 	{
-		ImGui::SetNextWindowPos(ImVec2((float)g_camera.m_width - menuWidth - 10, 10));
-		ImGui::SetNextWindowSize(ImVec2((float)menuWidth, (float)g_camera.m_height - 20));
+		ImGui::SetNextWindowPos({g_camera.m_width - menuWidth - 10.0f, 10.0f});
+		ImGui::SetNextWindowSize({menuWidth, g_camera.m_height - 20.0f});
 
 		ImGui::Begin("Tools", &g_debugDraw.m_showUI, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);
 
@@ -523,6 +524,8 @@ int main(int, char**)
 		return -1;
 	}
 
+	glfwGetWindowContentScale(g_mainWindow, &s_displayScale, &s_displayScale);
+
 	glfwMakeContextCurrent(g_mainWindow);
 
 	// Load OpenGL functions using glad

testbed/tests/collision_processing.cpp

@@ -37,7 +37,7 @@ class CollisionProcessing : public Test
 			shape.SetTwoSided(b2Vec2(-50.0f, 0.0f), b2Vec2(50.0f, 0.0f));
 
 			b2FixtureDef sd;
-			sd.shape = &shape;;
+			sd.shape = &shape;
 
 			b2BodyDef bd;
 			b2Body* ground = m_world->CreateBody(&bd);

testbed/tests/web.cpp

@@ -114,7 +114,7 @@ class Web : public Test
 			jd.bodyA = m_bodies[0];
 			jd.bodyB = m_bodies[1];
 			jd.localAnchorA.Set(0.5f, 0.0f);
-			jd.localAnchorB.Set(-0.5f, 0.0f);;
+			jd.localAnchorB.Set(-0.5f, 0.0f);
 			p1 = jd.bodyA->GetWorldPoint(jd.localAnchorA);
 			p2 = jd.bodyB->GetWorldPoint(jd.localAnchorB);
 			d = p2 - p1;

unit-test/joint_test.cpp

@@ -27,7 +27,7 @@
 DOCTEST_TEST_CASE("joint reactions")
 {
 	b2Vec2 gravity(0, -10.0f);
-	b2World world = b2World(gravity);
+	b2World world(gravity);
 
 	b2BodyDef bodyDef;
 	b2Body* ground = world.CreateBody(&bodyDef);

unit-test/world_test.cpp

@@ -37,7 +37,7 @@ class MyContactListener : public b2ContactListener
 
 DOCTEST_TEST_CASE("begin contact")
 {
-	b2World world = b2World(b2Vec2(0.0f, -10.0f));
+	b2World world({ 0.0f, -10.0f });
 	MyContactListener listener;
 	world.SetContactListener(&listener);