Procházet zdrojové kódy

Tidied 2DPhysics includes.

Cameron Hart před 14 roky
rodič
revize
3e1cf09c36

+ 5 - 5
Modules/Contents/2DPhysics/Include/PolyPhysicsScreen.h

@@ -23,19 +23,19 @@ THE SOFTWARE.
 #pragma once
 #include "PolyGlobals.h"
 #include "PolyEvent.h"
-#include "PolyVector2.h"
 #include "PolyScreen.h"
+#include "PolyVector2.h"
 #include "Box2D/Box2D.h"
-//#include "PolyCoreServices.h"
-#include "PolyScreenLine.h"
-#include "PolyPhysicsScreenEntity.h"
-#include "PolyTimer.h"
 #include <vector>
 
 #define MAX_B2DCONTACTPOINTS 2048
 
 namespace Polycode {
 
+class ScreenEntity;
+class PhysicsScreenEntity;
+class Timer;
+
 /**
 * Event sent out by the PhysicsScreen class when collisions begin and end.
 */	

+ 4 - 3
Modules/Contents/2DPhysics/Include/PolyPhysicsScreenEntity.h

@@ -22,12 +22,13 @@ THE SOFTWARE.
 
 #pragma once
 #include "PolyGlobals.h"
-#include "PolyScreenEntity.h"
-#include "PolyScreenMesh.h"
+#include "PolyVector2.h"
 #include "Box2D/Box2D.h"
 
 namespace Polycode {
 
+	class ScreenEntity;
+
 	/**
 	* A 2D Physics enabled screen entity. 
 	*/	
@@ -84,4 +85,4 @@ namespace Polycode {
 		ScreenEntity *screenEntity;
 	};
 
-}
+}

+ 3 - 1
Modules/Contents/2DPhysics/Source/PolyPhysicsScreen.cpp

@@ -22,6 +22,8 @@ THE SOFTWARE.
 
 
 #include "PolyPhysicsScreen.h"
+#include "PolyScreenEntity.h"
+#include "PolyPhysicsScreenEntity.h"
 
 using namespace Polycode;
 
@@ -452,4 +454,4 @@ void PhysicsScreen::Update() {
 		physicsChildren[i]->Update();
 	}
 	world->Step(timeStep, iterations,iterations);	
-}
+}

+ 2 - 0
Modules/Contents/2DPhysics/Source/PolyPhysicsScreenEntity.cpp

@@ -26,6 +26,8 @@ THE SOFTWARE.
 #include "PolyLogger.h"
 #include "PolyMesh.h"
 #include "PolyPolygon.h"
+#include "PolyScreenEntity.h"
+#include "PolyScreenMesh.h"
 
 using namespace Polycode;