Changeset 228 for code/branches/merger

Timestamp:

Nov 20, 2007, 9:03:57 PM (17 years ago)

Author:

nicolasc

Message:

merged xml

Location:

code/branches/merger

Files:

• bin/run-script (modified) (2 diffs)
• src/misc (copied) (copied from code/branches/xml/src/misc)
• src/misc/String2Number.h (copied) (copied from code/branches/xml/src/misc/String2Number.h)
• src/orxonox.cc (modified) (2 diffs)
• src/tinyxml (copied) (copied from code/branches/xml/src/tinyxml)
• src/tinyxml/tinystr.cc (copied) (copied from code/branches/xml/src/tinyxml/tinystr.cc)
• src/tinyxml/tinystr.h (copied) (copied from code/branches/xml/src/tinyxml/tinystr.h)
• src/tinyxml/tinyxml.cc (copied) (copied from code/branches/xml/src/tinyxml/tinyxml.cc)
• src/tinyxml/tinyxml.h (copied) (copied from code/branches/xml/src/tinyxml/tinyxml.h)
• src/tinyxml/tinyxmlerror.cc (copied) (copied from code/branches/xml/src/tinyxml/tinyxmlerror.cc)
• src/tinyxml/tinyxmlparser.cc (copied) (copied from code/branches/xml/src/tinyxml/tinyxmlparser.cc)

code/branches/merger/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/merger/src/orxonox.cc

@@ -190 +190 @@
     void createScene(void)
     {
-
-      string levelFile = "sp_level_moonstation.oxw";
-      loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
+      
     }
     
@@ -200 +198 @@
       Camera *cam = mgr->createCamera("Camera");
       Viewport *vp = mRoot->getAutoCreatedWindow()->addViewport(cam);
+
+      string levelFile = "sp_level_moonstation.oxw";
+      loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
+      
+      mgr->setAmbientLight(Ogre::ColourValue(0.3,0.3,0.9));
+      mgr->setSkyBox(true,"Examples/SpaceSkyBox");
+
     }