Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch

Code/GameLogic/GameLogic.vcxproj

@@ -178,6 +178,7 @@
     <ClInclude Include="Level.h" />
     <ClInclude Include="Object.h" />
     <ClInclude Include="Player.h" />
+    <ClInclude Include="RefManager.h" />
     <ClInclude Include="StaticObject.h" />
     <ClInclude Include="Weapon.h" />
   </ItemGroup>
@@ -188,6 +189,7 @@
     <ClCompile Include="Level.cpp" />
     <ClCompile Include="Object.cpp" />
     <ClCompile Include="Player.cpp" />
+    <ClCompile Include="RefManager.cpp" />
     <ClCompile Include="StaticObject.cpp" />
     <ClCompile Include="TestGLMain.cpp" />
     <ClCompile Include="Weapon.cpp" />

Code/GameLogic/GameLogic.vcxproj.filters

@@ -39,6 +39,9 @@
     <ClInclude Include="DynamicObject.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="RefManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Game.cpp">
@@ -68,5 +71,8 @@
     <ClCompile Include="TestGLMain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="RefManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

Code/GameLogic/GameMode.cpp

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

Code/GameLogic/GameMode.h

@@ -0,0 +1,17 @@
+#ifndef GAMEMODE_H
+#define GAMEMODE_H
+
+namespace GameLogic
+{
+
+	class GameMode
+	{
+		public:
+			GameMode(void);
+			~GameMode(void);
+		private:
+			//variabels that control what game rules the level runs on
+	};
+
+}
+#endif

Code/GameLogic/Level.h

@@ -1,6 +1,10 @@
 #ifndef LEVEL_H
 #define LEVEL_H
 
+#include "StaticObject.h"
+#include "DynamicObject.h"
+#include "GameMode.h"
+
 namespace GameLogic
 {
 
@@ -12,6 +16,15 @@ namespace GameLogic
 		~Level(void);
 
 	private:
+		StaticObject** staticObjects;
+		int nrOfStaticObjects;
+
+		DynamicObject** dynamicObjects;
+		int nrOfDynamicObjects;
+
+		GameMode* gameMode;
+
+
 
 	};
 

Code/GameLogic/RefManager.cpp

@@ -0,0 +1,26 @@
+#include "RefManager.h"
+
+using namespace GameLogic;
+
+typedef std::pair<Oyster::Physics::ICustomBody*, Object*> mapData;
+
+RefManager::RefManager(void)
+{
+}
+
+
+RefManager::~RefManager(void)
+{
+}
+
+Object* RefManager::GetMap(Oyster::Physics::ICustomBody *body)
+{
+	return mapper[body];
+}
+
+void RefManager::AddMapping(Oyster::Physics::ICustomBody *body, Object *obj)
+{
+	mapper.insert(mapData(body,obj));
+}
+
+

Code/GameLogic/RefManager.h

@@ -0,0 +1,28 @@
+#ifndef REFMANAGER_H
+#define REFMANAGER_H
+
+#include<map>
+#include "Object.h"
+#include "PhysicsAPI.h"
+
+namespace GameLogic
+{
+
+	
+
+	class RefManager
+	{
+	public:
+		RefManager(void);
+		~RefManager(void);
+
+		Object* GetMap(Oyster::Physics::ICustomBody *body);
+		void AddMapping(Oyster::Physics::ICustomBody *body, Object *obj);
+
+
+	private:
+		std::map<Oyster::Physics::ICustomBody*,Object*> mapper; //shall be pointer from physics that map to an object
+
+	};
+}
+#endif