Changeset 140

Timestamp:

Nov 1, 2007, 1:46:09 PM (17 years ago)

Author:

nicolape

Message:

XML-Loader so far…

Location:

code/branches/xml

Files:

• bin/run-script (modified) (2 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/dummy.h (added)
• 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) (6 diffs)
• src/xml (added)
• src/xml/xmlParser.cc (added)
• src/xml/xmlParser.h (added)

code/branches/xml/bin/run-script

@@ -1 +1 @@
 #!/bin/bash
-
+cd bin
 if [[ !  -f main ]] ; then
         echo "main does not exist"
@@ -23 +23 @@
 fi
 exec ./main
+cd ..

code/branches/xml/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 ExampleApplication.h  ExampleFrameListener.h loader/LevelLoader.h xml/xmlParser.h)
 
 #Creates an executable

code/branches/xml/src/orxonox.cc

@@ -29 +29 @@
 #include "ExampleApplication.h"
 
+#include <string>
+#include <iostream>
+
+#include "xml/xmlParser.h"
+#include "loader/LevelLoader.h"
+
+
+
+using namespace std;
+
 // TODO: Put creation of SceneNode and implementation of FrameListener into an extern file
 SceneNode *lightNode;
 
-class OrxFrameListener : public ExampleFrameListener
+class FrameListener : public ExampleFrameListener
 {
   public:
-    OrxFrameListener(RenderWindow* win, Camera* cam, SceneManager *sceneMgr)
+    FrameListener(RenderWindow* win, Camera* cam, SceneManager *sceneMgr)
   : ExampleFrameListener(win, cam, false, false)
     {
@@ -81 +91 @@
     void createScene(void)
     {
+
+        string levelFile = "sp_level_moonstation.oxw";
+                        loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
+
+/*                      
+                        LightManager* lightman = new LightManager();
+                        loader->loadLights(lightman);
+                        CameraManager* cameraman = new CameraManager();
+                        loader->loadCameras(cameraman);                     
+                        ScriptManager* scriptman = new ScriptManager();
+                        loader->loadScripts(scriptman);                     
+        */                                          
+    
+    
         // add tutorial code here:
         // ...
-      mSceneMgr->setAmbientLight( ColourValue( 0.3, 0.3, 0.3 ) );
-      //Entity* head = mSceneMgr->createEntity("head", "ogrehead.mesh");
+        
+        /*
+      mSceneMgr->setAmbientLight( ColourValue( 1, 1, 0.1 ) );
+      Entity* head = mSceneMgr->createEntity("head", "ogrehead.mesh");
 
-      //Entity* head2 = mSceneMgr->createEntity("head2", "ogrehead.mesh");
+      Entity* head2 = mSceneMgr->createEntity("head2", "ogrehead.mesh");
 
       SceneNode *node = mSceneMgr->getRootSceneNode()->createChildSceneNode( "OgreHeadNode", Vector3( 0, 0, 0 ) );
-      //node->attachObject( head );
+      node->attachObject( head );
 
       SceneNode *node2 = mSceneMgr->getRootSceneNode()->createChildSceneNode( "OgreHeadNode2", Vector3( 50, 0, 0 ) );
-      //node2->attachObject( head2 );
+      node2->attachObject( head2 );
 
 
@@ -111 +137 @@
       lightNode->attachObject(light);
       light->setPosition(0.0, 0.0, 0.0);
+      
+      */
     }
 
@@ -116 +144 @@
     {
         // create frame listener
-      mFrameListener = new OrxFrameListener(mWindow, mCamera, mSceneMgr);
+      mFrameListener = new ExampleFrameListener(mWindow, mCamera, mSceneMgr);
       mRoot->addFrameListener(mFrameListener);
     }
@@ -124 +152 @@
 #define WIN32_LEAN_AND_MEAN
 #include "windows.h"
-
 INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT )
 #else
-
 int main(int argc, char **argv)
 #endif
@@ -134 +160 @@
   Orxonox orxonox;
 
-  try {
+  try 
+  {
     orxonox.go();
-  } catch( Exception& e ) {
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-    MessageBox( NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
-#else
-    fprintf(stderr, "An exception has occurred: %s\n",
-            e.getFullDescription().c_str());
-#endif
+  } 
+  catch( Exception& e ) 
+  {
+                #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+        MessageBox( NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+                #else
+        fprintf(stderr, "An exception has occurred: %s\n",e.getFullDescription().c_str());
+                #endif
   }
-
   return 0;
 }