added collisionManager

also some changes around the place

Code/GameLogic/CollisionManager.cpp

@@ -0,0 +1,12 @@
+#include "CollisionManager.h"
+
+using namespace GameLogic;
+
+CollisionManager::CollisionManager(void)
+{
+}
+
+
+CollisionManager::~CollisionManager(void)
+{
+}

Code/GameLogic/CollisionManager.h

@@ -0,0 +1,30 @@
+#ifndef COLLISIONMANAGER_H
+#define COLLISIONMANAGER_H
+
+#include "Object.h"
+#include "PhysicsAPI.h"
+#include "RefManager.h"
+#include "DynamicObject.h"
+#include "Player.h"
+
+namespace GameLogic
+{
+
+	class CollisionManager
+	{
+
+		public:
+			CollisionManager(void);
+			~CollisionManager(void);
+
+			void ColisionEvent(Oyster::Physics::ICustomBody &obj1, Oyster::Physics::ICustomBody &obj2);
+			void PlayerVBox(Player &player, DynamicObject &box);
+	
+		private:
+		
+
+	};
+
+}
+
+#endif

Code/GameLogic/Game.h

@@ -8,13 +8,6 @@ namespace GameLogic
 {
 	class Game
 	{
-	private:
-		
-		
-	private:
-		Level*		level;
-		Player*		player;
-
 	public:
 		Game();
 		~Game();
@@ -23,6 +16,13 @@ namespace GameLogic
 		void StartGame();
 		void Update();
 		void Render();
+		
+		
+	private:
+		Level*		level;
+		Player*		player;
+
+		
 	};
 }		
 #endif

Code/GameLogic/Object.h

@@ -17,7 +17,7 @@ namespace GameLogic
 		Object(void);
 		virtual ~Object(void);
 	
-		Utility::DynamicMemory::UniquePointer<Oyster::Graphics::Render::Model> model;
+		
 		void Render();
 
 	private:
@@ -25,9 +25,9 @@ namespace GameLogic
 	protected:
 		//either a model pointer or an ID to an arraypos filled with models that are to be rendered
 		//rigidBody
-		unsigned int ref;
-		::Utility::DynamicMemory::UniquePointer<Oyster::Physics::ICustomBody> rigidBody;
 
+		Utility::DynamicMemory::UniquePointer<Oyster::Physics::ICustomBody> rigidBody;
+		Utility::DynamicMemory::UniquePointer<Oyster::Graphics::Render::Model> model;
 	};
 
 }

Code/GameLogic/Player.cpp

@@ -46,7 +46,9 @@ Player::Player(void)
 {
 	life = 10;
 
-	UniquePointer<ICustomBody> rigidBody = API::Instance().CreateSimpleRigidBody();
+	rigidBody = API::Instance().CreateSimpleRigidBody();
+
+
 	//ref = API::Instance().AddObject(rigidBody);
 	////ref = API::Instance().AddObject(API::Instance().CreateSimpleRigidBody());
 	//const ICustomBody* rB;

Code/GameLogic/RefManager.cpp

@@ -13,14 +13,14 @@ RefManager::~RefManager(void)
 {
 }
 
-Object* RefManager::GetMap(Oyster::Physics::ICustomBody *body)
+Object* RefManager::GetMap(Oyster::Physics::ICustomBody &body)
 {
-	return mapper[body];
+	return mapper[&body];
 }
 
-void RefManager::AddMapping(Oyster::Physics::ICustomBody *body, Object *obj)
+void RefManager::AddMapping(Oyster::Physics::ICustomBody &body, Object &obj)
 {
-	mapper.insert(mapData(body,obj));
+	mapper.insert(mapData(&body,&obj));
 }
 
 

Code/GameLogic/RefManager.h

@@ -16,8 +16,8 @@ namespace GameLogic
 		RefManager(void);
 		~RefManager(void);
 
-		Object* GetMap(Oyster::Physics::ICustomBody *body);
+		Object* GetMap(Oyster::Physics::ICustomBody &body);
-		void AddMapping(Oyster::Physics::ICustomBody *body, Object *obj);
+		void AddMapping(Oyster::Physics::ICustomBody &body, Object &obj);
 
 
 	private: