Changeset 2053 for code/branches/lod/src/orxonox

Timestamp:

Oct 29, 2008, 3:39:35 PM (17 years ago)

Author:

runom

Message:

Added planets class

Location:

code/branches/lod/src/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• OrxonoxPrereqs.h (modified) (1 diff)
• OrxonoxStableHeaders.h (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (3 diffs)
• objects/Planet.cc (added)
• objects/Planet.h (added)

code/branches/lod/src/orxonox/CMakeLists.txt

@@ -57 +57 @@
   objects/Tickable.cc
   objects/WorldEntity.cc
+  objects/Planet.cc
 
   objects/Projectile.cc
@@ -93 +94 @@
     objects/SpaceShip.cc
     objects/WorldEntity.cc
+    objects/Planet.cc
   )
 

code/branches/lod/src/orxonox/OrxonoxPrereqs.h

@@ -91 +91 @@
     class SpaceShipAI;
     class WorldEntity;
+    class Planet;
 
     class Projectile;

code/branches/lod/src/orxonox/OrxonoxStableHeaders.h

@@ -46 +46 @@
 #endif
 #include <Ogre.h>
+#include <OgreProgressiveMesh.h>
 #include <CEGUI.h>
 #include <boost/thread/recursive_mutex.hpp>

code/branches/lod/src/orxonox/gamestates/GSLevel.cc

@@ -38 +38 @@
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"
-#include "core/CommandLine.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
@@ -50 +49 @@
 namespace orxonox
 {
-    SetCommandLineArgument(level, "sample.oxw").setShortcut("l");
-
     GSLevel::GSLevel(const std::string& name)
         : GameState<GSGraphics>(name)
@@ -160 +157 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        std::string levelName;
-        CommandLine::getValue("level", &levelName);
-        startLevel_ = new Level(Settings::getDataPath() + std::string("levels/") + levelName);
+        startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw");
         Loader::open(startLevel_);
     }