Changeset 1535

Timestamp:

Jun 4, 2008, 8:54:43 PM (16 years ago)

Author:

rgrieder

Message:

merged input branch back to trunk

Location:

code/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• bin/media.cfg (deleted)
• bin/quake3settings.cfg (deleted)
• src/audio/AudioManager.h (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (3 diffs)
• src/core/Core.cc (copied) (copied from code/branches/input/src/core/Core.cc)
• src/core/Core.h (copied) (copied from code/branches/input/src/core/Core.h)
• src/core/CorePrereqs.h (modified) (2 diffs)
• src/core/CoreSettings.cc (deleted)
• src/core/CoreSettings.h (deleted)
• src/core/InputBuffer.cc (deleted)
• src/core/InputBuffer.h (deleted)
• src/core/InputInterfaces.h (deleted)
• src/core/InputManager.cc (deleted)
• src/core/InputManager.h (deleted)
• src/core/KeyBinder.cc (deleted)
• src/core/KeyBinder.h (deleted)
• src/core/Language.cc (modified) (3 diffs)
• src/core/Language.h (modified) (1 diff)
• src/core/OutputHandler.cc (modified) (2 diffs)
• src/core/Shell.cc (modified) (2 diffs)
• src/core/Shell.h (modified) (1 diff)
• src/core/TclThreadManager.h (modified) (3 diffs)
• src/core/Tickable.cc (deleted)
• src/core/Tickable.h (deleted)
• src/core/input (copied) (copied from code/branches/input/src/core/input)
• src/core/input/Button.cc (copied) (copied from code/branches/input/src/core/input/Button.cc)
• src/core/input/Button.h (copied) (copied from code/branches/input/src/core/input/Button.h)
• src/core/input/CalibratorCallback.cc (copied) (copied from code/branches/input/src/core/input/CalibratorCallback.cc)
• src/core/input/CalibratorCallback.h (copied) (copied from code/branches/input/src/core/input/CalibratorCallback.h)
• src/core/input/HalfAxis.cc (copied) (copied from code/branches/input/src/core/input/HalfAxis.cc)
• src/core/input/HalfAxis.h (copied) (copied from code/branches/input/src/core/input/HalfAxis.h)
• src/core/input/InputBuffer.cc (copied) (copied from code/branches/input/src/core/input/InputBuffer.cc)
• src/core/input/InputBuffer.h (copied) (copied from code/branches/input/src/core/input/InputBuffer.h)
• src/core/input/InputCommands.cc (copied) (copied from code/branches/input/src/core/input/InputCommands.cc)
• src/core/input/InputCommands.h (copied) (copied from code/branches/input/src/core/input/InputCommands.h)
• src/core/input/InputInterfaces.h (copied) (copied from code/branches/input/src/core/input/InputInterfaces.h)
• src/core/input/InputManager.cc (copied) (copied from code/branches/input/src/core/input/InputManager.cc)
• src/core/input/InputManager.h (copied) (copied from code/branches/input/src/core/input/InputManager.h)
• src/core/input/KeyBinder.cc (copied) (copied from code/branches/input/src/core/input/KeyBinder.cc)
• src/core/input/KeyBinder.h (copied) (copied from code/branches/input/src/core/input/KeyBinder.h)
• src/core/input/KeyDetector.cc (copied) (copied from code/branches/input/src/core/input/KeyDetector.cc)
• src/core/input/KeyDetector.h (copied) (copied from code/branches/input/src/core/input/KeyDetector.h)
• src/network/Client.h (modified) (2 diffs)
• src/network/Server.h (modified) (2 diffs)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/GraphicsEngine.cc (modified) (11 diffs)
• src/orxonox/GraphicsEngine.h (modified) (4 diffs)
• src/orxonox/Main.cc (modified) (1 diff)
• src/orxonox/Orxonox.cc (modified) (8 diffs)
• src/orxonox/Orxonox.h (modified) (2 diffs)
• src/orxonox/OrxonoxStableHeaders.h (modified) (2 diffs)
• src/orxonox/Settings.cc (copied) (copied from code/branches/input/src/orxonox/Settings.cc)
• src/orxonox/Settings.h (copied) (copied from code/branches/input/src/orxonox/Settings.h)
• src/orxonox/console/InGameConsole.cc (modified) (1 diff)
• src/orxonox/console/InGameConsole.h (modified) (1 diff)
• src/orxonox/hud/HUD.h (modified) (1 diff)
• src/orxonox/hud/RadarOverlayElement.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.h (modified) (1 diff)
• src/orxonox/objects/Tickable.cc (copied) (copied from code/branches/input/src/orxonox/objects/Tickable.cc)
• src/orxonox/objects/Tickable.h (copied) (copied from code/branches/input/src/orxonox/objects/Tickable.h)
• src/orxonox/objects/WorldEntity.h (modified) (1 diff)
• src/orxonox/tools/Timer.h (modified) (1 diff)
• src/util/ArgReader.cc (modified) (2 diffs)
• src/util/ArgReader.h (modified) (3 diffs)
• visual_studio/vc8/core.vcproj (modified) (5 diffs)
• visual_studio/vc8/orxonox.vcproj (modified) (4 diffs)

code/trunk/CMakeLists.txt

@@ -67 +67 @@
 # FIND_PACKAGE(CEGUI_OGRE)
 FIND_PACKAGE(ENet)
-FIND_PACKAGE(Boost REQUIRED thread)
-FIND_PACKAGE(Boost REQUIRED filesystem)
+FIND_PACKAGE(Boost REQUIRED thread filesystem)
+#FIND_PACKAGE(Boost REQUIRED filesystem)
 FIND_PACKAGE(OpenAL)
 FIND_PACKAGE(ALUT)

code/trunk/src/audio/AudioManager.h

@@ -35 +35 @@
 #include <string>
 
-#include "core/Tickable.h"
-
 namespace audio
 {
-  class _AudioExport AudioManager : public orxonox::Tickable
+  class _AudioExport AudioManager
         {
         public:

code/trunk/src/core/CMakeLists.txt

@@ -4 +4 @@
   ConfigFileManager.cc
   ConfigValueContainer.cc
-  CoreSettings.cc
+  Core.cc
   Error.cc
   Executor.cc
@@ -10 +10 @@
   Identifier.cc
   IdentifierDistributor.cc
-  InputManager.cc
-  KeyBinder.cc
   OutputBuffer.cc
-  InputBuffer.cc
   Shell.cc
   CommandExecutor.cc
@@ -30 +27 @@
   SignalHandler.cc
   TclBind.cc
-  Tickable.cc
   XMLPort.cc
   TclThreadManager.cc
   IRC.cc
+
+  input/Button.cc
+  input/CalibratorCallback.cc
+  input/HalfAxis.cc
+  input/InputBuffer.cc
+  input/InputCommands.cc
+  input/InputManager.cc
+  input/KeyBinder.cc
+  input/KeyDetector.cc
+
   tolua/tolua_bind.cc
 )

code/trunk/src/core/CorePrereqs.h

@@ -112 +112 @@
   class ConfigValueContainer;
   class ConsoleCommand;
-  class CoreSettings;
+  class Core;
   class Error;
   class Executor;
@@ -162 +162 @@
   // input
   //class GUIInputHandler;
-  class Calibrator;
+  class BaseCommand;
+  class BufferedParamCommand;
+  class Button;
   class CalibratorCallback;
+  class HalfAxis;
   class InputBuffer;
-  class InputBufferListener;
   class InputManager;
   class JoyStickHandler;
+  class MouseHandler;
   class KeyBinder;
   class KeyDetector;
-  class MouseHandler;
-
+  class KeyHandler;
+  class ParamCommand;
+  class SimpleCommand;
 }
 

code/trunk/src/core/Language.cc

@@ -36 +36 @@
 #include <fstream>
 
-#include "CoreSettings.h"
+#include "Core.h"
 
 #include "Debug.h"
@@ -245 +245 @@
     void Language::readTranslatedLanguageFile()
     {
-        COUT(4) << "Read translated language file (" << CoreSettings::getLanguage() << ")." << std::endl;
+        COUT(4) << "Read translated language file (" << Core::getLanguage() << ")." << std::endl;
 
         // Open the file
         std::ifstream file;
-        file.open(getFileName(CoreSettings::getLanguage()).c_str(), std::fstream::in);
+        file.open(getFileName(Core::getLanguage()).c_str(), std::fstream::in);
 
         if (!file.is_open())
         {
             COUT(1) << "An error occurred in Language.cc:" << std::endl;
-            COUT(1) << "Error: Couldn't open file " << getFileName(CoreSettings::getLanguage()) << " to read the translated language entries!" << std::endl;
-            CoreSettings::resetLanguage();
+            COUT(1) << "Error: Couldn't open file " << getFileName(Core::getLanguage()) << " to read the translated language entries!" << std::endl;
+            Core::resetLanguage();
             COUT(3) << "Info: Reset language to " << this->defaultLanguage_ << "." << std::endl;
             return;
@@ -286 +286 @@
                 else
                 {
-                    COUT(2) << "Warning: Invalid language entry \"" << lineString << "\" in " << getFileName(CoreSettings::getLanguage()) << std::endl;
+                    COUT(2) << "Warning: Invalid language entry \"" << lineString << "\" in " << getFileName(Core::getLanguage()) << std::endl;
                 }
             }

code/trunk/src/core/Language.h

@@ -113 +113 @@
     class _CoreExport Language
     {
-        friend class CoreSettings;
+        friend class Core;
 
         public:

code/trunk/src/core/OutputHandler.cc

@@ -33 +33 @@
 
 #include "OutputHandler.h"
-#include "CoreSettings.h"
+#include "Core.h"
 #include "ConsoleCommand.h"
 #include "Shell.h"
@@ -83 +83 @@
     int OutputHandler::getSoftDebugLevel(OutputHandler::OutputDevice device)
     {
-        return CoreSettings::getSoftDebugLevel(device);
+        return Core::getSoftDebugLevel(device);
     }
 

code/trunk/src/core/Shell.cc

@@ -31 +31 @@
 #include "CoreIncludes.h"
 #include "ConfigValueIncludes.h"
-#include "CoreSettings.h"
+#include "Core.h"
 #include "ConsoleCommand.h"
-#include "InputInterfaces.h"
+#include "input/InputInterfaces.h"
 
 #define SHELL_UPDATE_LISTENERS(function) \
@@ -67 +67 @@
     Shell& Shell::createShell()
     {
-        int level = CoreSettings::getSoftDebugLevel(OutputHandler::LD_Shell);
-        CoreSettings::setSoftDebugLevel(OutputHandler::LD_Shell, -1);
+        int level = Core::getSoftDebugLevel(OutputHandler::LD_Shell);
+        Core::setSoftDebugLevel(OutputHandler::LD_Shell, -1);
         static Shell instance;
-        CoreSettings::setSoftDebugLevel(OutputHandler::LD_Shell, level);
+        Core::setSoftDebugLevel(OutputHandler::LD_Shell, level);
         return instance;
     }

code/trunk/src/core/Shell.h

@@ -36 +36 @@
 
 #include "OrxonoxClass.h"
-#include "InputBuffer.h"
+#include "input/InputBuffer.h"
 #include "OutputBuffer.h"
 

code/trunk/src/core/TclThreadManager.h

@@ -30 +30 @@
 #define _TclThreadManager_H__
 
+#include "CorePrereqs.h"
+
 #include <queue>
 #include <map>
@@ -38 +40 @@
 #include <boost/thread/thread.hpp>
 
-#include "CorePrereqs.h"
-#include "Tickable.h"
 #include "cpptcl/CppTcl.h"
+#include "core/OrxonoxClass.h"
 
 namespace orxonox
@@ -68 +69 @@
     };
 
-    class _CoreExport TclThreadManager : public Tickable
+    class _CoreExport TclThreadManager : public OrxonoxClass
     {
         public:

code/trunk/src/network/Client.h

@@ -46 +46 @@
 #include <string>
 
-#include "core/Tickable.h"
 #include "ClientConnection.h"
 #include "PacketManager.h"
@@ -63 +62 @@
   *
   */
-  class _NetworkExport Client : PacketDecoder, public orxonox::Tickable{
+  class _NetworkExport Client : PacketDecoder{
   public:
     

code/trunk/src/network/Server.h

@@ -46 +46 @@
 #include <string>
 
-#include "core/Tickable.h"
 #include "PacketManager.h"
 
@@ -59 +58 @@
   * It implements all functions necessary for a Server
   */
-  class _NetworkExport Server : public PacketDecoder, public orxonox::Tickable{
+  class _NetworkExport Server : public PacketDecoder{
   public:
     static Server *createSingleton();

code/trunk/src/orxonox/CMakeLists.txt

@@ -3 +3 @@
   Main.cc
   Orxonox.cc
+  Settings.cc
 
   console/InGameConsole.cc
@@ -29 +30 @@
   objects/SpaceShip.cc
   objects/SpaceShipAI.cc
+  objects/Tickable.cc
   objects/WorldEntity.cc
 

code/trunk/src/orxonox/GraphicsEngine.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
+ *      Reto Grieder
  *   Co-authors:
- *      Reto Grieder
+ *      Benjamin Knecht <beni_at_orxonox.net>, (C) 2007, Felix Schulthess
  *
  */
@@ -35 +35 @@
 #include "GraphicsEngine.h"
 
+#include <OgreConfigFile.h>
+#include <OgreException.h>
+#include <OgreLogManager.h>
 #include <OgreRoot.h>
-#include <OgreException.h>
-#include <OgreConfigFile.h>
-#include <OgreLogManager.h>
+#include <OgreSceneManager.h>
 #include <OgreTextureManager.h>
-#include "core/InputManager.h"
+#include <OgreViewport.h>
+
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/Debug.h"
 #include "core/CommandExecutor.h"
-#include "core/TclBind.h"
+#include "core/ConsoleCommand.h"
+#include "core/input/InputManager.h"
+
 #include "console/InGameConsole.h"
-
-#include "core/ConsoleCommand.h"
-#include <OgreSceneManager.h>
-#include <OgreCompositorManager.h>
-#include <OgreViewport.h>
+#include "Settings.h"
+
 
 namespace orxonox {
@@ -70 +71 @@
     root_(0),
     scene_(0),
-    renderWindow_(0),
-    //configPath_(""),
-    dataPath_(""),
-    ogreLogfile_("")
+    renderWindow_(0)
   {
     RegisterObject(GraphicsEngine);
@@ -83 +81 @@
   void GraphicsEngine::setConfigValues()
   {
-    SetConfigValue(dataPath_, "../../Media/").description("relative path to media data");
-    SetConfigValue(ogreLogfile_, "ogre.log").description("Logfile for messages from Ogre. Use \"\" to suppress log file creation.");
+    SetConfigValue(resourceFile_,    "resources.cfg").description("Location of the resources file in the data path.");
+    SetConfigValue(ogreConfigFile_,  "ogre.cfg").description("Location of the Ogre config file");
+    SetConfigValue(ogrePluginsFile_, "plugins.cfg").description("Location of the Ogre plugins file");
+    SetConfigValue(ogreLogFile_,     "ogre.log").description("Logfile for messages from Ogre. \
+                                                             Use \"\" to suppress log file creation.");
     SetConfigValue(ogreLogLevelTrivial_ , 5).description("Corresponding orxonox debug level for ogre Trivial");
     SetConfigValue(ogreLogLevelNormal_  , 4).description("Corresponding orxonox debug level for ogre Normal");
     SetConfigValue(ogreLogLevelCritical_, 2).description("Corresponding orxonox debug level for ogre Critical");
-
-    TclBind::getInstance().setDataPath(this->dataPath_);
   }
 
@@ -126 +125 @@
     @brief Creates the Ogre Root object and sets up the ogre log.
   */
-  bool GraphicsEngine::setup(std::string& dataPath)
+  bool GraphicsEngine::setup()
   {
     CCOUT(3) << "Setting up..." << std::endl;
     // temporary overwrite of dataPath, change ini file for permanent change
-    if (dataPath != "")
-      dataPath_ = dataPath;
-    if (dataPath_ == "")
-      return false;
-    if (dataPath_[dataPath_.size() - 1] != '/')
-      dataPath_ += "/";
-
-    //TODO: Check if file exists (maybe not here)
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && defined(_DEBUG)
-    std::string plugin_filename = "plugins_d.cfg";
-#else
-    std::string plugin_filename = "plugins.cfg";
-#endif
 
 // TODO: LogManager doesn't work on specific systems. The why is unknown yet.
@@ -154 +140 @@
     // create our own log that we can listen to
     Ogre::Log *myLog;
-    if (this->ogreLogfile_ == "")
+    if (this->ogreLogFile_ == "")
       myLog = logger->createLog("ogre.log", true, false, true);
     else
-      myLog = logger->createLog(this->ogreLogfile_, true, false, false);
+      myLog = logger->createLog(this->ogreLogFile_, true, false, false);
     CCOUT(4) << "Ogre Log created" << std::endl;
 
@@ -167 +153 @@
     CCOUT(4) << "Creating Ogre Root..." << std::endl;
 
-    root_ = new Ogre::Root(plugin_filename, "ogre.cfg", this->ogreLogfile_);
+    if (ogrePluginsFile_ == "")
+    {
+      COUT(1) << "Error: Ogre plugins file set to \"\". Cannot load." << std::endl;
+      return false;
+    }
+    if (ogreConfigFile_ == "")
+    {
+      COUT(1) << "Error: Ogre config file set to \"\". Cannot load." << std::endl;
+      return false;
+    }
+    if (ogreLogFile_ == "")
+    {
+      COUT(1) << "Error: Ogre log file set to \"\". Cannot load." << std::endl;
+      return false;
+    }
+
+    try
+    {
+      root_ = new Ogre::Root(ogrePluginsFile_, ogreConfigFile_, ogreLogFile_);
+    }
+    catch (Ogre::Exception ex)
+    {
+      COUT(2) << "Error: There was an exception when creating Ogre Root." << std::endl;
+      return false;
+    }
+
+    if (!root_->getInstalledPlugins().size())
+    {
+      COUT(1) << "Error: No plugins declared. Cannot load Ogre." << std::endl;
+      COUT(0) << "Is the plugins file correctly declared?" << std::endl;
+      return false;
+    }
 
 #if 0
@@ -180 +197 @@
 
     // specify where Ogre has to look for resources. This call doesn't parse anything yet!
-    declareRessourceLocations();
+    if (!declareRessourceLocations())
+      return false;
 
     CCOUT(3) << "Set up done." << std::endl;
@@ -186 +204 @@
   }
 
-  void GraphicsEngine::declareRessourceLocations()
+  bool GraphicsEngine::declareRessourceLocations()
   {
     CCOUT(4) << "Declaring Resources" << std::endl;
     //TODO: Specify layout of data file and maybe use xml-loader
     //TODO: Work with ressource groups (should be generated by a special loader)
+
+    if (resourceFile_ == "")
+    {
+      COUT(1) << "Error: Resource file set to \"\". Cannot load." << std::endl;
+      return false;
+    }
+
     // Load resource paths from data file using configfile ressource type
     Ogre::ConfigFile cf;
-    cf.load(dataPath_ + "resources.cfg");
+    try
+    {
+      cf.load(Settings::getDataPath() + resourceFile_);
+    }
+    catch (Ogre::Exception ex)
+    {
+      COUT(1) << "Error: Could not load resources.cfg in path " << Settings::getDataPath() << std::endl;
+      COUT(0) << "Have you forgotten to set the data path in orxnox.ini?" << std::endl;
+      return false;
+    }
 
     // Go through all sections & settings in the file
@@ -201 +235 @@
     while (seci.hasMoreElements())
     {
-      secName = seci.peekNextKey();
-      Ogre::ConfigFile::SettingsMultiMap *settings = seci.getNext();
-      Ogre::ConfigFile::SettingsMultiMap::iterator i;
-      for (i = settings->begin(); i != settings->end(); ++i)
+      try
       {
-        typeName = i->first; // for instance "FileSystem" or "Zip"
-        archName = i->second; // name (and location) of archive
-
-        Ogre::ResourceGroupManager::getSingleton().addResourceLocation(
-                                           std::string(dataPath_ + archName),
-                                           typeName, secName);
+        secName = seci.peekNextKey();
+        Ogre::ConfigFile::SettingsMultiMap *settings = seci.getNext();
+        Ogre::ConfigFile::SettingsMultiMap::iterator i;
+        for (i = settings->begin(); i != settings->end(); ++i)
+        {
+          typeName = i->first; // for instance "FileSystem" or "Zip"
+          archName = i->second; // name (and location) of archive
+
+          Ogre::ResourceGroupManager::getSingleton().addResourceLocation(
+              std::string(Settings::getDataPath() + archName), typeName, secName);
+        }
       }
-    }
+      catch (Ogre::Exception ex)
+      {
+        COUT(2) << "Exception while reading resources.cfg. Proceeding.." << ex.getDescription() << std::endl;
+      }
+    }
+    return true;
   }
 
@@ -223 +264 @@
 
     CCOUT(4) << "Creating render window" << std::endl;
-    this->renderWindow_ = root_->initialise(true, "OrxonoxV2");
+    try
+    {
+      this->renderWindow_ = root_->initialise(true, "OrxonoxV2");
+    }
+    catch (Ogre::Exception ex)
+    {
+      COUT(2) << "Error: There was an exception when initialising Ogre Root." << std::endl;
+      return false;
+    }
+
     if (!root_->isInitialised())
     {
-      CCOUT(2) << "Error: Creating Ogre root object failed" << std::endl;
+      CCOUT(2) << "Error: Initialising Ogre root object failed." << std::endl;
       return false;
     }

code/trunk/src/orxonox/GraphicsEngine.h

@@ -21 +21 @@
  *
  *   Author:
- *      Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
+ *      Reto Grieder
  *   Co-authors:
- *      Reto Grieder
+ *      Benjamin Knecht <beni_at_orxonox.net>, (C) 2007, Felix Schulthess
  *
  */
@@ -56 +56 @@
         public:
             void setConfigValues();
-            bool setup(std::string& dataPath);
-            void declareRessourceLocations();
+            bool setup();
+            bool declareRessourceLocations();
             bool loadRenderer();
             bool initialiseResources();
@@ -65 +65 @@
 
             Ogre::SceneManager* getSceneManager() { return scene_; }
-            std::string& getDataPath() { return dataPath_; }
 
             // several window properties
@@ -95 +94 @@
                              bool, const std::string&);
 
-            Ogre::Root*         root_;        //!< Ogre's root
-            Ogre::SceneManager* scene_;       //!< scene manager of the game
-            Ogre::RenderWindow* renderWindow_;//!< the current render window
-            //bool               bOverwritePath_; //!< overwrites path
-            //std::string         configPath_;  //!< path to config file
-            std::string         dataPath_;    //!< path to data file
-            std::string         ogreLogfile_; //!< log file name for Ogre log messages
-            int ogreLogLevelTrivial_;         //!< Corresponding Orxonx debug level for LL_TRIVIAL
-            int ogreLogLevelNormal_;          //!< Corresponding Orxonx debug level for LL_NORMAL
-            int ogreLogLevelCritical_;        //!< Corresponding Orxonx debug level for LL_CRITICAL
+            Ogre::Root*         root_;              //!< Ogre's root
+            Ogre::SceneManager* scene_;             //!< scene manager of the game
+            Ogre::RenderWindow* renderWindow_;      //!< the current render window
+            std::string         resourceFile_;      //!< resources file name
+            std::string         ogreConfigFile_;    //!< ogre config file name
+            std::string         ogrePluginsFile_;   //!< ogre plugins file name
+            std::string         ogreLogFile_;       //!< log file name for Ogre log messages
+            int ogreLogLevelTrivial_;               //!< Corresponding Orxonx debug level for LL_TRIVIAL
+            int ogreLogLevelNormal_;                //!< Corresponding Orxonx debug level for LL_NORMAL
+            int ogreLogLevelCritical_;              //!< Corresponding Orxonx debug level for LL_CRITICAL
     };
 }

code/trunk/src/orxonox/Main.cc

@@ -82 +82 @@
     res = orx->init(argc, argv, macBundlePath());
 #else
-    res = orx->init(argc, argv, "");
+    res = orx->init(argc, argv);
 #endif
 

code/trunk/src/orxonox/Orxonox.cc

@@ -21 +21 @@
  *
  *   Author:
+ *      Reto Grieder
+ *   Co-authors:
  *      Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
- *   Co-authors:
- *      ...
  *
  */
@@ -57 +57 @@
 #include "core/Debug.h"
 #include "core/Loader.h"
-#include "core/Tickable.h"
-#include "core/InputManager.h"
+#include "core/input/InputManager.h"
 #include "core/TclBind.h"
+#include "core/Core.h"
 
 // audio
@@ -70 +70 @@
 // objects and tools
 #include "hud/HUD.h"
-#include <Ogre.h>
+#include "objects/Tickable.h"
 
 #include "GraphicsEngine.h"
+#include "Settings.h"
 
 // FIXME: is this really file scope?
 // globals for the server or client
-network::Client *client_g;
-network::Server *server_g;
+network::Client *client_g = 0;
+network::Server *server_g = 0;
 
 namespace orxonox
@@ -166 +167 @@
    * @param path path to config (in home dir or something)
    */
-  bool Orxonox::init(int argc, char **argv, std::string path)
-  {
-    //TODO: find config file (assuming executable directory)
-    //TODO: read config file
-    //TODO: give config file to Ogre
+  bool Orxonox::init(int argc, char **argv)
+  {
+#ifdef _DEBUG
+    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox_d.ini");
+#else
+    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
+#endif
+    Factory::createClassHierarchy();
+
     std::string mode;
-    std::string dataPath;
+    std::string tempDataPath;
 
     ArgReader ar(argc, argv);
-    ar.checkArgument("mode", mode, false);
-    ar.checkArgument("data", dataPath, false);
-    ar.checkArgument("ip", serverIp_, false);
-    ar.checkArgument("port", serverPort_, false);
+    ar.checkArgument("mode", &mode, false);
+    ar.checkArgument("data", &tempDataPath, false);
+    ar.checkArgument("ip",   &serverIp_, false);
+    ar.checkArgument("port", &serverPort_, false);
     if(ar.errorHandling())
+    {
+      COUT(1) << "Error while parsing command line arguments" << std::endl;
+      COUT(1) << ar.getErrorString();
+      COUT(0) << "Usage:" << std::endl << "orxonox [mode client|server|dedicated|standalone] "
+        << "[--data PATH] [--ip IP] [--port PORT]" << std::endl;
       return false;
+    }
 
     if (mode == "client")
@@ -190 +201 @@
     else
     {
-      mode = "standalone";
+      if (mode == "")
+        mode = "standalone";
+      if (mode != "standalone")
+      {
+        COUT(2) << "Warning: mode \"" << mode << "\" doesn't exist. "
+          << "Defaulting to standalone" << std::endl;
+        mode = "standalone";
+      }
       mode_ = STANDALONE;
     }
     COUT(3) << "Orxonox: Mode is " << mode << "." << std::endl;
+
+    if (tempDataPath != "")
+    {
+      if (tempDataPath[tempDataPath.size() - 1] != '/')
+        tempDataPath += "/";
+      Settings::tsetDataPath(tempDataPath);
+    }
+
+    // initialise TCL
+    TclBind::getInstance().setDataPath(Settings::getDataPath());
 
     //if (mode_ == DEDICATED)
@@ -202 +230 @@
     // procedure until the GUI is identical
 
-    ConfigFileManager::getSingleton()->setFile(CFT_Settings, "orxonox.ini");
-    Factory::createClassHierarchy();
-
     ogre_ = &GraphicsEngine::getSingleton();
-    if (!ogre_->setup(path))       // creates ogre root and other essentials
+    if (!ogre_->setup())       // creates ogre root and other essentials
       return false;
 
@@ -421 +446 @@
       }
 
+      // tick the core
+      Core::tick((float)evt.timeSinceLastFrame);
       // Call those objects that need the real time
       for (Iterator<TickableReal> it = ObjectList<TickableReal>::start(); it; ++it)
@@ -427 +454 @@
       for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
         it->tick((float)evt.timeSinceLastFrame * this->timefactor_);
+      //AudioManager::tick();
+      if (client_g)
+        client_g->tick((float)evt.timeSinceLastFrame);
+      if (server_g)
+        server_g->tick((float)evt.timeSinceLastFrame);
 
       // don't forget to call _fireFrameStarted in ogre to make sure

code/trunk/src/orxonox/Orxonox.h

@@ -21 +21 @@
  *
  *   Author:
- *      ...
+ *      Reto Grieder
  *   Co-authors:
- *      ...
+ *      Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
  *
  */
@@ -58 +58 @@
   {
     public:
-      bool init(int argc, char **argv, std::string path);
+      bool init(int argc, char **argv);
       bool start();
 

code/trunk/src/orxonox/OrxonoxStableHeaders.h

@@ -104 +104 @@
 #include "core/Debug.h"
 //#include "core/Executor.h"
-#include "core/Tickable.h"
 //#include "core/XMLPort.h"
 
@@ -111 +110 @@
 #include "OrxonoxPrereqs.h"
 #include "tools/Timer.h"
+#include "objects/Tickable.h"
 #include "objects/Model.h"
 #include "objects/WorldEntity.h"

code/trunk/src/orxonox/console/InGameConsole.cc

@@ -42 +42 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/ConsoleCommand.h"
-#include "core/InputManager.h"
+#include "core/input/InputManager.h"
 #include "util/Math.h"
 #include "GraphicsEngine.h"

code/trunk/src/orxonox/console/InGameConsole.h

@@ -36 +36 @@
 #include <OgreTextAreaOverlayElement.h>
 
-#include "core/Tickable.h"
 #include "core/Shell.h"
+#include "objects/Tickable.h"
 
 

code/trunk/src/orxonox/hud/HUD.h

@@ -36 +36 @@
 #include <OgreTextAreaOverlayElement.h>
 #include <OgreSceneNode.h>
-#include "core/Tickable.h"
+#include "objects/Tickable.h"
 #include "util/Math.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport HUD : public Tickable
+    class _OrxonoxExport HUD : public TickableReal
     {
       private:

code/trunk/src/orxonox/hud/RadarOverlayElement.cc

@@ -35 +35 @@
 
 #include "GraphicsEngine.h"
-#include "core/Tickable.h"
 #include "core/ConsoleCommand.h"
+#include "objects/Tickable.h"
 #include "objects/SpaceShip.h"
 #include "RadarObject.h"

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -42 +42 @@
 #include "core/Debug.h"
 #include "GraphicsEngine.h"
-#include "core/InputManager.h"
+#include "core/input/InputManager.h"
 #include "particle/ParticleInterface.h"
 #include "Projectile.h"

code/trunk/src/orxonox/objects/SpaceShip.h

@@ -34 +34 @@
 
 #include "util/Math.h"
-#include "core/InputInterfaces.h"
 #include "Camera.h"
 #include "Model.h"
-#include "../tools/BillboardSet.h"
+#include "tools/BillboardSet.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/WorldEntity.h

@@ -39 +39 @@
 #include "network/Synchronisable.h"
 #include "core/BaseObject.h"
-#include "core/Tickable.h"
+#include "Tickable.h"
 #include "../tools/Mesh.h"
 

code/trunk/src/orxonox/tools/Timer.h

@@ -62 +62 @@
 
 #include "OrxonoxPrereqs.h"
-#include "core/CorePrereqs.h"
-#include "core/Tickable.h"
+#include "objects/Tickable.h"
 
 namespace orxonox

code/trunk/src/util/ArgReader.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Benjamin Knecht <beni_at_orxonox.net>, (C) 2007
+ *      Reto Grieder
  *   Co-authors:
- *      ...
+ *      Benjamin Knecht <beni_at_orxonox.net>
  *
  */
@@ -33 +33 @@
 
 #include "ArgReader.h"
+#include "SubString.h"
 
-#include <iostream>
+ArgReader::ArgReader(int argc, char **argv)
+{
+  failure_ = false;
+  errorString_ = "";
+  CmdLineArg arg;
 
-ArgReader::ArgReader(int argc, char** argv)
-{
-  counter_ = argc;
-  arguments_ = argv;
-  fail_ = false;
-  errorStr_ = "";
-}
+  int i = 1;
+  while (i < argc)
+  {
+    if (argv[i][0] == '-' && argv[i][1] == '-') // name
+    {
+      if (argv[i][2] == '\0')
+      {
+        failure_ = true;
+        errorString_ += "Expected word after \"--\".\n";
+      }
+      arg.bChecked_ = false;
+      arg.name_ = argv[i] + 2;
+      arg.value_ = "";
+      arguments_.push_back(arg);
+    }
+    else // value
+    {
+      if (arguments_.size() == 0)
+      {
+        failure_ = true;
+        errorString_ += "Expected \"--\" in command line arguments.\n";
+        arg.bChecked_ = false;
+        arg.name_ = "";
+        arg.value_ = "";
+        arguments_.push_back(arg);
+      }
 
-void ArgReader::checkArgument(std::string option, std::string &string, bool must)
-{
-  int argpos = checkOption(option) + 1;
-  if(argpos != 0)
-  {
-    string = arguments_[argpos];
+      if (arguments_.back().value_ != "")
+        arguments_.back().value_ += " " + std::string(argv[i]);
+      else
+        arguments_.back().value_ = argv[i];
+    }
+    ++i;
   }
-  else
-  {
-    if(must) {
-      errorStr_ = errorStr_ + "Cannot find mandatory argument \"" + option + "\"\n";
-      fail_ = true;
-    }
-  }
-
-}
-
-void ArgReader::checkArgument(std::string option, int &integer, bool must)
-{
-  int argpos = checkOption(option) + 1;
-  if(argpos != 0)
-  {
-    integer = atoi(arguments_[argpos]);
-  }
-  else
-  {
-    if(must) {
-      errorStr_ = errorStr_ + "Cannot find mandatory argument \"" + option + "\"\n";
-      fail_ = true;
-    }
-  }
-}
-
-void ArgReader::checkArgument(std::string option, float &floating, bool must)
-{
-  int argpos = checkOption(option) + 1;
-  if(argpos != 0)
-  {
-    floating = (float)atof(arguments_[argpos]);
-  }
-  else
-  {
-    if(must) {
-      errorStr_ = errorStr_ + "Cannot find mandatory argument \"" + option + "\"\n";
-      fail_ = true;
-    }
-  }
-}
-
-int ArgReader::checkOption(std::string option)
-{
-  for(int i = 1; i < counter_; i++)
-  {
-    if(arguments_[i] == "--" + option)
-        return i;
-  }
-  return -1;
 }
 
 bool ArgReader::errorHandling()
 {
-  if(fail_)
-    std::cout << errorStr_;
-  return fail_;
+  bool argumentsChecked = true;
+  for (unsigned int i = 1; i < arguments_.size(); ++i)
+    argumentsChecked &= arguments_[i].bChecked_;
+
+  if (!argumentsChecked)
+    errorString_ += "Not all arguments could be matched.\n";
+
+  return !argumentsChecked || failure_;
 }
+
+const std::string& ArgReader::getErrorString()
+{
+  return errorString_;
+}

code/trunk/src/util/ArgReader.h

@@ -21 +21 @@
  *
  *   Author:
+ *      Reto Grieder
+ *   Co-authors:
  *      Benjamin Knecht <beni_at_orxonox.net>
- *   Co-authors:
- *      ...
  *
  */
@@ -39 +39 @@
 
 #include <string>
+#include <vector>
+#include "Convert.h"
+
+struct _UtilExport CmdLineArg
+{
+  std::string name_;
+  std::string value_;
+  bool bChecked_;
+};
 
 class _UtilExport ArgReader
@@ -44 +53 @@
   public:
     ArgReader(int argc, char **argv);
-    void checkArgument(std::string option, std::string& string, bool must=false);
-    void checkArgument(std::string option, int& integer, bool must=false);
-    void checkArgument(std::string option, float& floating, bool must=false);
+    template <class T>
+    void checkArgument(std::string option, T* value, bool must = false);
     bool errorHandling();
-  private:
-    int checkOption(std::string option);
+    const std::string& getErrorString();
 
   private:
-    int counter_;
-    char **arguments_;
-    bool fail_;
-    std::string errorStr_;
+    std::vector<CmdLineArg> arguments_;
+    bool failure_;
+    std::string errorString_;
 };
 
+template <class T>
+void ArgReader::checkArgument(std::string option, T* value, bool must)
+{
+  unsigned int iArg = 0;
+  while (iArg < arguments_.size())
+  {
+    if (arguments_[iArg].name_ == option)
+      break;
+    ++iArg;
+  }
+  if (iArg == arguments_.size())
+  {
+    if (must)
+    {
+      failure_ = true;
+      errorString_ += "Cannot find mandatory argument \"" + option + "\"\n";
+      return;
+    }
+    else
+      return;
+  }
+
+  arguments_[iArg].bChecked_ = true;
+
+  if (!convertValue(value, arguments_[iArg].value_))
+  {
+    failure_ = true;
+    errorString_ += "Cannot convert argument value for option \"" + option + "\"\n";
+  }
+}
+
+template <>
+void ArgReader::checkArgument(std::string option, bool* value, bool must)
+{
+  // for type bool, only check whether the option was set or not
+  unsigned int iArg = 0;
+  while (iArg < arguments_.size())
+  {
+    if (arguments_[iArg].name_ == option)
+    {
+      arguments_[iArg].bChecked_ = true;
+      *value = true;
+      break;
+    }
+    ++iArg;
+  }
+  if (iArg == arguments_.size())
+    *value = false;
+}
+
 #endif /* _ArgReader_H__ */

code/trunk/visual_studio/vc8/core.vcproj

@@ -157 +157 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\CoreSettings.cc"
+                                RelativePath="..\..\src\core\Core.cc"
                                 >
                         </File>
@@ -188 +188 @@
                                 >
                         </File>
-                        <File
-                                RelativePath="..\..\src\core\Tickable.cc"
-                                >
-                        </File>
                         <Filter
                                 Name="tolua"
@@ -280 +276 @@
                                 >
                                 <File
-                                        RelativePath="..\..\src\core\InputBuffer.cc"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\core\InputManager.cc"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\core\KeyBinder.cc"
+                                        RelativePath="..\..\src\core\input\Button.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\CalibratorCallback.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\HalfAxis.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\InputBuffer.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\InputCommands.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\InputManager.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\KeyBinder.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\KeyDetector.cc"
                                         >
                                 </File>
@@ -331 +347 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\core\Core.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\core\CorePrereqs.h"
                                 >
                         </File>
                         <File
-                                RelativePath="..\..\src\core\CoreSettings.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\core\Debug.h"
                                 >
@@ -374 +390 @@
                                 >
                         </File>
-                        <File
-                                RelativePath="..\..\src\core\Tickable.h"
-                                >
-                        </File>
                         <Filter
                                 Name="input"
                                 >
                                 <File
-                                        RelativePath="..\..\src\core\InputBuffer.h"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\core\InputInterfaces.h"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\core\InputManager.h"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\core\KeyBinder.h"
+                                        RelativePath="..\..\src\core\input\Button.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\CalibratorCallback.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\HalfAxis.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\InputBuffer.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\InputCommands.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\InputInterfaces.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\InputManager.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\KeyBinder.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\input\KeyDetector.h"
                                         >
                                 </File>

code/trunk/visual_studio/vc8/orxonox.vcproj

@@ -184 +184 @@
                                 </FileConfiguration>
                         </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\Settings.cc"
+                                >
+                        </File>
                         <Filter
                                 Name="hud"
@@ -253 +257 @@
                                 <File
                                         RelativePath="..\..\src\orxonox\objects\SpaceShipAI.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\objects\Tickable.cc"
                                         >
                                 </File>
@@ -466 +474 @@
                                 >
                         </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\Settings.h"
+                                >
+                        </File>
                         <Filter
                                 Name="hud"
@@ -539 +551 @@
                                 <File
                                         RelativePath="..\..\src\orxonox\objects\SpaceShipAI.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\objects\Tickable.h"
                                         >
                                 </File>