Merge branch 'dev1' of https://github.com/AngryAccelerated/Physics2D into dev1

Author: acrlw

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.6)
 
 project(physics-engine LANGUAGES CXX)
 set(CMAKE_AUTOUIC ON)
@@ -107,8 +107,7 @@ add_executable(physics-engine
     "testbed/scenes/chain.h" 
     "testbed/scenes/wreckingball.h"
     "testbed/scenes/newtoncradle.h"
-    "testbed/scenes/pendulum.h"
-
+    "testbed/scenes/pendulum.h
      "include/geometry/shape/point.h" 
      "include/geometry/shape/polygon.h" 
      "include/geometry/shape/rectangle.h" 
@@ -121,6 +120,15 @@ add_executable(physics-engine
      "include/collision/algorithm/simplex.h" 
      "include/collision/algorithm/minkowski.h" 
      "source/collision/algorithm/simplex.cpp" 
-      "source/geometry/shape/point.cpp" "source/geometry/shape/polygon.cpp" "source/geometry/shape/rectangle.cpp" "source/geometry/shape/circle.cpp" "source/geometry/shape/ellipse.cpp" "source/geometry/shape/edge.cpp" "source/geometry/shape/curve.cpp" "source/geometry/shape/capsule.cpp" "source/geometry/shape/sector.cpp")
-find_package(Qt5 COMPONENTS Widgets REQUIRED)
-target_link_libraries(physics-engine PRIVATE Qt5::Widgets)
+      "source/geometry/shape/point.cpp"
+      "source/geometry/shape/polygon.cpp"
+      "source/geometry/shape/rectangle.cpp"
+      "source/geometry/shape/circle.cpp"
+      "source/geometry/shape/ellipse.cpp"
+      "source/geometry/shape/edge.cpp"
+      "source/geometry/shape/curve.cpp"
+      "source/geometry/shape/capsule.cpp"
+      "source/geometry/shape/sector.cpp"
+      )
+      find_package(Qt5 COMPONENTS Widgets REQUIRED)
+      target_link_libraries(physics-engine PRIVATE Qt5::Widgets)

testbed/scenes/bridge.h

@@ -54,7 +54,7 @@ namespace Physics2D
 			{
 				rect2 = m_world->createBody();
 				rect2->setShape(&brick);
-				rect2->position().set({ -15.0f + i * brick.width(), 0.0f });
+				rect2->position().set({ -15.0f + i * brick.width() * 1.2f, 0.0f });
 				rect2->rotation() = 0;
 				rect2->setMass(1.0f);
 				rect2->setFriction(0.01f);
@@ -63,8 +63,8 @@ namespace Physics2D
 				this->m_tree->insert(rect2);
 				revolutePrim.bodyA = rect;
 				revolutePrim.bodyB = rect2;
-				revolutePrim.localPointA.set(half, 0);
-				revolutePrim.localPointB.set(-half, 0);
+				revolutePrim.localPointA.set(half + brick.width() * 0.1f, 0);
+				revolutePrim.localPointB.set(-half - brick.width() * 0.1f, 0);
 				revolutePrim.dampingRatio = 0.8f;
 				revolutePrim.frequency = 10;
 				revolutePrim.maxForce = 10000;
@@ -74,7 +74,7 @@ namespace Physics2D
 
 			ppm.bodyA = rect2;
 			ppm.localPointA.set(0.75f, 0);
-			ppm.targetPoint.set(-15.0f + max * brick.width() - half, 0.0f);
+			ppm.targetPoint.set(rect2->toWorldPoint(Vector2(0.75f, 0.0f)));
 			ppm.dampingRatio = 0.1f;
 			ppm.frequency = 1000;
 			ppm.maxForce = 10000;

testbed/scenes/stacking.h

@@ -26,7 +26,7 @@ namespace Physics2D
 			m_tree->insert(ground);
 
 			real offset = 0.0f;
-			real max = 20.0;
+			real max = 25.0;
 			for (real j = 0; j < max; j += 1.0f)
 			{
 				for (real i = 0.0; i < max - j; i += 1.0f)
@@ -35,7 +35,7 @@ namespace Physics2D
 					body->position().set({ -10.0f + i * 1.1f + offset, j * 1.8f + 2.0f });
 					body->setShape(&rectangle);
 					body->rotation() = 0;
-					body->setMass(1.0f);
+					body->setMass(0.2f);
 					body->setType(Body::BodyType::Dynamic);
 					body->setFriction(0.8f);
 					body->setRestitution(0.0f);