From 0f5517398dbb4b72c5395d13b918fcc8d5acdf11 Mon Sep 17 00:00:00 2001
From: Pontus Fransson <pontus.fransson92@gmail.com>
Date: Fri, 24 Jan 2014 09:00:59 +0100
Subject: [PATCH] GL - Update uml, LevelParser.h.cpp ObjectDefines.h

---
 Code/Dokumentation/LevelLoader.uxf    | 46 +++++++++++++--------------
 Code/Game/GameLogic/GameLogic.vcxproj |  3 ++
 Code/Game/GameLogic/LevelParser.cpp   |  2 ++
 Code/Game/GameLogic/LevelParser.h     | 28 ++++++++++++++++
 Code/Game/GameLogic/ObjectDefines.h   | 38 ++++++++++++++++++++++
 5 files changed, 94 insertions(+), 23 deletions(-)
 create mode 100644 Code/Game/GameLogic/LevelParser.cpp
 create mode 100644 Code/Game/GameLogic/LevelParser.h
 create mode 100644 Code/Game/GameLogic/ObjectDefines.h

diff --git a/Code/Dokumentation/LevelLoader.uxf b/Code/Dokumentation/LevelLoader.uxf
index 723857bb..fd3e9c79 100644
--- a/Code/Dokumentation/LevelLoader.uxf
+++ b/Code/Dokumentation/LevelLoader.uxf
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<diagram program="umlet" version="12.0">
+<diagram program="umlet" version="12.1">
   <zoom_level>8</zoom_level>
   <element>
     <type>com.umlet.element.Package</type>
     <coordinates>
       <x>552</x>
-      <y>320</y>
+      <y>360</y>
       <w>584</w>
       <h>368</h>
     </coordinates>
@@ -16,7 +16,7 @@
     <type>com.umlet.element.Class</type>
     <coordinates>
       <x>440</x>
-      <y>88</y>
+      <y>128</y>
       <w>128</w>
       <h>40</h>
     </coordinates>
@@ -28,7 +28,7 @@
     <type>com.umlet.element.Relation</type>
     <coordinates>
       <x>768</x>
-      <y>472</y>
+      <y>512</y>
       <w>136</w>
       <h>104</h>
     </coordinates>
@@ -39,12 +39,12 @@
     <type>com.umlet.element.Class</type>
     <coordinates>
       <x>560</x>
-      <y>544</y>
+      <y>584</y>
       <w>232</w>
       <h>136</h>
     </coordinates>
     <panel_attributes>&lt;&lt;Interface&gt;&gt;
-Parser
+LevelParser
 --
 Functions:
 vector&lt;struct&gt; Parse();
@@ -60,7 +60,7 @@ const int FileVersion;
     <type>com.umlet.element.Class</type>
     <coordinates>
       <x>624</x>
-      <y>208</y>
+      <y>248</y>
       <w>80</w>
       <h>24</h>
     </coordinates>
@@ -72,7 +72,7 @@ const int FileVersion;
     <type>com.umlet.element.Relation</type>
     <coordinates>
       <x>640</x>
-      <y>208</y>
+      <y>248</y>
       <w>40</w>
       <h>168</h>
     </coordinates>
@@ -83,7 +83,7 @@ const int FileVersion;
     <type>com.umlet.element.Relation</type>
     <coordinates>
       <x>384</x>
-      <y>176</y>
+      <y>216</y>
       <w>256</w>
       <h>56</h>
     </coordinates>
@@ -97,7 +97,7 @@ m2=1..1
     <type>com.umlet.element.Package</type>
     <coordinates>
       <x>248</x>
-      <y>320</y>
+      <y>360</y>
       <w>248</w>
       <h>160</h>
     </coordinates>
@@ -108,7 +108,7 @@ m2=1..1
     <type>com.umlet.element.Class</type>
     <coordinates>
       <x>800</x>
-      <y>360</y>
+      <y>400</y>
       <w>208</w>
       <h>136</h>
     </coordinates>
@@ -127,7 +127,7 @@ Privates:</panel_attributes>
     <type>com.umlet.element.Class</type>
     <coordinates>
       <x>328</x>
-      <y>208</y>
+      <y>248</y>
       <w>80</w>
       <h>24</h>
     </coordinates>
@@ -138,11 +138,11 @@ Privates:</panel_attributes>
     <type>com.umlet.element.Class</type>
     <coordinates>
       <x>256</x>
-      <y>360</y>
+      <y>400</y>
       <w>232</w>
       <h>104</h>
     </coordinates>
-    <panel_attributes>Defines.h
+    <panel_attributes>ObjectDefines.h
 &lt;&lt;Header file&gt;&gt;
 --
 Enum ObjectType(static, dynamic, specials);
@@ -156,7 +156,7 @@ Struct specials</panel_attributes>
     <type>com.umlet.element.Relation</type>
     <coordinates>
       <x>680</x>
-      <y>176</y>
+      <y>216</y>
       <w>152</w>
       <h>56</h>
     </coordinates>
@@ -170,7 +170,7 @@ Uses&gt;</panel_attributes>
     <type>com.umlet.element.Class</type>
     <coordinates>
       <x>816</x>
-      <y>192</y>
+      <y>232</y>
       <w>128</w>
       <h>40</h>
     </coordinates>
@@ -182,7 +182,7 @@ Uses&gt;</panel_attributes>
     <type>com.umlet.element.Class</type>
     <coordinates>
       <x>928</x>
-      <y>560</y>
+      <y>600</y>
       <w>200</w>
       <h>120</h>
     </coordinates>
@@ -196,7 +196,7 @@ functions for creating the right structs</panel_attributes>
     <type>com.umlet.element.Relation</type>
     <coordinates>
       <x>768</x>
-      <y>576</y>
+      <y>616</y>
       <w>176</w>
       <h>56</h>
     </coordinates>
@@ -210,7 +210,7 @@ Uses&gt;</panel_attributes>
     <type>com.umlet.element.Class</type>
     <coordinates>
       <x>560</x>
-      <y>360</y>
+      <y>400</y>
       <w>232</w>
       <h>136</h>
     </coordinates>
@@ -230,7 +230,7 @@ Privates:
     <type>com.umlet.element.Relation</type>
     <coordinates>
       <x>344</x>
-      <y>208</y>
+      <y>248</y>
       <w>40</w>
       <h>168</h>
     </coordinates>
@@ -241,7 +241,7 @@ Privates:
     <type>com.umlet.element.Relation</type>
     <coordinates>
       <x>840</x>
-      <y>208</y>
+      <y>248</y>
       <w>88</w>
       <h>168</h>
     </coordinates>
@@ -253,7 +253,7 @@ Privates:
     <type>com.umlet.element.Relation</type>
     <coordinates>
       <x>656</x>
-      <y>472</y>
+      <y>512</y>
       <w>40</w>
       <h>88</h>
     </coordinates>
@@ -264,7 +264,7 @@ Privates:
     <type>com.umlet.element.Relation</type>
     <coordinates>
       <x>544</x>
-      <y>64</y>
+      <y>104</y>
       <w>136</w>
       <h>160</h>
     </coordinates>
diff --git a/Code/Game/GameLogic/GameLogic.vcxproj b/Code/Game/GameLogic/GameLogic.vcxproj
index 6b66a9d5..da052b70 100644
--- a/Code/Game/GameLogic/GameLogic.vcxproj
+++ b/Code/Game/GameLogic/GameLogic.vcxproj
@@ -185,6 +185,8 @@
     <ClInclude Include="IAttatchment.h" />
     <ClInclude Include="Level.h" />
     <ClInclude Include="Object.h" />
+    <ClInclude Include="ObjectDefines.h" />
+    <ClInclude Include="LevelParser.h" />
     <ClInclude Include="Player.h" />
     <ClInclude Include="StaticObject.h" />
     <ClInclude Include="Team.h" />
@@ -202,6 +204,7 @@
     <ClCompile Include="Game_PlayerData.cpp" />
     <ClCompile Include="IAttatchment.cpp" />
     <ClCompile Include="Level.cpp" />
+    <ClCompile Include="LevelParser.cpp" />
     <ClCompile Include="Object.cpp" />
     <ClCompile Include="Player.cpp" />
     <ClCompile Include="StaticObject.cpp" />
diff --git a/Code/Game/GameLogic/LevelParser.cpp b/Code/Game/GameLogic/LevelParser.cpp
new file mode 100644
index 00000000..65b63aef
--- /dev/null
+++ b/Code/Game/GameLogic/LevelParser.cpp
@@ -0,0 +1,2 @@
+#include "LevelParser.h"
+
diff --git a/Code/Game/GameLogic/LevelParser.h b/Code/Game/GameLogic/LevelParser.h
new file mode 100644
index 00000000..f1904d9c
--- /dev/null
+++ b/Code/Game/GameLogic/LevelParser.h
@@ -0,0 +1,28 @@
+#ifndef LEVEL_PARSER_H
+#define LEVEL_PARSER_H
+
+#include <vector>
+#include "ObjectDefines.h"
+
+namespace GameLogic
+{
+	namespace LevelLoader
+	{
+		class LevelParser
+		{
+		public:
+			LevelParser();
+			~LevelParser();
+
+			//
+			std::vector<ObjectTypeHeader> Parse();
+
+			//
+			ObjectTypeHeader ParseHeader();
+
+		private:
+
+		};
+	}
+}
+#endif
\ No newline at end of file
diff --git a/Code/Game/GameLogic/ObjectDefines.h b/Code/Game/GameLogic/ObjectDefines.h
new file mode 100644
index 00000000..74bca42c
--- /dev/null
+++ b/Code/Game/GameLogic/ObjectDefines.h
@@ -0,0 +1,38 @@
+#ifndef OBJECT_DEFINES_H
+#define OBJECT_DEFINES_H
+
+namespace GameLogic
+{
+	enum ObjectType
+	{
+		ObjectType_Static,
+		ObjectType_Dynamic,
+
+
+		ObjectType_NUM_OF_TYPES,
+
+		ObjectType_Unknow = -1,
+	};
+
+	struct ObjectTypeHeader
+	{
+		ObjectType typeID;
+
+	};
+
+	struct ObjectHeader : public ObjectTypeHeader
+	{
+		//Model,
+		
+		//Texture
+
+		//Position
+		float position[3];
+		//Rotation
+		float rotation[3];
+		//Scale
+		float scale[3];
+	};
+}
+
+#endif
\ No newline at end of file