Still trying to get it working.

2014-04-12 20:53:35 +02:00
parent 04fff4a27b
commit 41db395f61
3 changed files with 185 additions and 9 deletions
@@ -1,10 +1,41 @@
 #ifndef PhysicsSystem_h__
 #define PhysicsSystem_h__

+
+
+
+
 #include "System.h"
 #include "Components/Transform.h"

-#include <unordered_set>
+// Math and base include
+
+#include <Common/Base/hkBase.h>
+#include <Common/Base/Memory/System/Util/hkMemoryInitUtil.h>
+#include <Common/Base/System/Error/hkDefaultError.h>
+#include <Common/Base/Monitor/hkMonitorStream.h>
+#include <Common/Base/Config/hkConfigVersion.h>
+#include <Common/Base/Memory/System/hkMemorySystem.h>
+#include <Common/Base/Memory/Allocator/Malloc/hkMallocAllocator.h>
+#include <Common/Base/Container/String/hkStringBuf.h>
+
+// Dynamics includes
+#include <Physics2012/Collide/hkpCollide.h>
+#include <Physics2012/Collide/Agent/ConvexAgent/SphereBox/hkpSphereBoxAgent.h>
+#include <Physics2012/Collide/Shape/Convex/Box/hkpBoxShape.h>
+#include <Physics2012/Collide/Shape/Convex/Sphere/hkpSphereShape.h>
+#include <Physics2012/Collide/Dispatch/hkpAgentRegisterUtil.h>
+
+
+
+#include <Physics2012/Dynamics/World/hkpWorld.h>
+#include <Physics2012/Dynamics/Entity/hkpRigidBody.h>
+#include <Physics2012/Utilities/Dynamics/Inertia/hkpInertiaTensorComputer.h>
+
+// Visual Debugger includes
+#include <Common/Visualize/hkVisualDebugger.h>
+#include <Physics2012/Utilities/VisualDebugger/hkpPhysicsContext.h>
+

 namespace Systems
 {
@@ -17,11 +48,25 @@ public:
 	void UpdateEntity(double dt, EntityID entity, EntityID parent) override;
 	void OnComponentCreated(std::string type, std::shared_ptr<Component> component) override;
 	void OnComponentRemoved(std::string type, Component* component) override;
+	

 private:
+
+	hkpWorld* m_PhysicsWorld;
+
 	void SetUpPhysicsState(EntityID entity, EntityID parent);
 	void TearDownPhysicsState(EntityID entity, EntityID parent);
+
+	hkVisualDebugger* m_VisualDebugger;
+	void SetupVisualDebugger(hkpPhysicsContext* worlds);
+	void StepVisualDebugger();
+	static void HK_CALL HavokErrorReport(const char* msg, void*);
+
+	void SetupPhysics(hkpWorld* physicsWorld);
+
+	hkpRigidBody* g_ball;
 };
+
 }

 #endif // PhysicsSystem_h__