Changeset 2053

Timestamp:

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

Author:

runom

Message:

Added planets class

Location:

code/branches/lod

Files:

• bin/def_keybindings.ini (modified) (1 diff)
• src/core/XMLPort.h (modified) (1 diff)
• src/core/input/InputManager.cc (modified) (3 diffs)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/OrxonoxStableHeaders.h (modified) (1 diff)
• src/orxonox/gamestates/GSLevel.cc (modified) (3 diffs)
• src/orxonox/objects/Planet.cc (added)
• src/orxonox/objects/Planet.h (added)
• src/util/OrxonoxPlatform.h (modified) (1 diff)

code/branches/lod/bin/def_keybindings.ini

@@ -254 +254 @@
 
 [MouseAxes]
-MouseXNeg="scale 1 moveYaw"
-MouseXPos="scale -1 moveYaw"
-MouseYNeg="scale 1 movePitch"
-MouseYPos="scale -1 movePitch"
+MouseXNeg=
+MouseXPos=
+MouseYNeg=
+MouseYPos=
 

code/branches/lod/src/core/XMLPort.h

@@ -468 +468 @@
                             for (ticpp::Iterator<ticpp::Element> child = xmlsubelement->FirstChildElement(false); child != child.end(); child++)
                             {
+                                COUT(2) << child->Value() << std::endl;
                                 Identifier* identifier = ClassByName(child->Value());
                                 if (identifier)

code/branches/lod/src/core/input/InputManager.cc

@@ -47 +47 @@
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"
-#include "core/CommandLine.h"
 #include "util/Debug.h"
 
@@ -63 +62 @@
     SetConsoleCommand(InputManager, calibrate, true);
     SetConsoleCommand(InputManager, reload, false);
-    SetCommandLineSwitch(keyboard_no_grab);
 
     std::string InputManager::bindingCommmandString_s = "";
@@ -155 +153 @@
 #if defined OIS_LINUX_PLATFORM
             paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
-            paramList.insert(std::make_pair(std::string("x11_mouse_grab"), "true"));
-            paramList.insert(std::make_pair(std::string("x11_mouse_hide"), "true"));
-            bool kbNoGrab;
-            CommandLine::getValue("keyboard_no_grab", &kbNoGrab);
-            if (kbNoGrab)
-                paramList.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("false")));
-            else
-                paramList.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("true")));
 #endif
 

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_);
     }

code/branches/lod/src/util/OrxonoxPlatform.h

@@ -137 +137 @@
 }
 
-//-----------------------------------------------------------------------
-// Version Information
-//-----------------------------------------------------------------------
-
-#define ORXONOX_VERSION_MAJOR 0
-#define ORXONOX_VERSION_MINOR 1
-#define ORXONOX_VERSION_PATCH 2
-#define ORXONOX_VERSION_SUFFIX ""
-#define ORXONOX_VERSION_NAME "Bellatrix"
-
-#define ORXONOX_VERSION ((ORXONOX_VERSION_MAJOR << 16) | (ORXONOX_VERSION_MINOR << 8) | ORXONOX_VERSION_PATCH)