Changeset 164 for code/trunk

Timestamp:

Nov 5, 2007, 1:16:39 PM (17 years ago)

Author:

nicolasc

Message:

Brute force megre of xml branch

Location:

code/trunk

Files:

• bin/levels (added)
• bin/levels/sp_level_moonstation.oxw (added)
• src/CMakeLists.txt (modified) (1 diff)
• src/loader (added)
• src/loader/LevelLoader.cc (added)
• src/loader/LevelLoader.h (added)
• src/loader/Light.cc (added)
• src/loader/Light.h (added)
• src/loader/LightManager.cc (added)
• src/loader/LightManager.h (added)
• src/orxonox.cc (modified) (3 diffs)
• src/xml (added)
• src/xml/xmlParser.cc (added)
• src/xml/xmlParser.h (added)

code/trunk/src/CMakeLists.txt

@@ -2 +2 @@
 
 # create a few variables to simplify life
-SET(SRC_FILES orxonox.cc)
-#SET(INC_FILES ExampleApplication.h  ExampleFrameListener.h)
+
+SET(SRC_FILES orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc)
+SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h)
 
 #Creates an executable

code/trunk/src/orxonox.cc

@@ -35 +35 @@
 #include <CEGUI/CEGUI.h>
 #include <OgreCEGUIRenderer.h>
+
+#include <string>
+#include <iostream>
+
+#include "xml/xmlParser.h"
+#include "loader/LevelLoader.h"
+
 
 // some tests to see if enet works without includsion
@@ -97 +104 @@
       createRenderWindow();
       initializeResourceGroups();
+      createScene();
       setupScene();
       setupInputSystem();
@@ -180 +188 @@
     }
 
+    void createScene(void)
+    {
+
+      string levelFile = "sp_level_moonstation.oxw";
+      loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
+    }
+    
     void setupScene()
     {