Changeset 1524 for code/branches/input/src/core

Timestamp:

Jun 3, 2008, 12:20:36 AM (17 years ago)

Author:

rgrieder

Message:

• moved Tickable to objects again
• network, audio and core now have their own tick routine
• Sequence is defined in Orxonox.cc

Location:

code/branches/input/src/core

Files:

• CMakeLists.txt (modified) (2 diffs)
• Core.cc (moved) (moved from code/branches/input/src/core/CoreSettings.cc) (13 diffs)
• Core.h (moved) (moved from code/branches/input/src/core/CoreSettings.h) (3 diffs)
• CorePrereqs.h (modified) (1 diff)
• Language.cc (modified) (3 diffs)
• Language.h (modified) (1 diff)
• OutputHandler.cc (modified) (2 diffs)
• Shell.cc (modified) (2 diffs)
• TclThreadManager.h (modified) (3 diffs)
• TheCore.cc (added)
• TheCore.h (added)
• input/InputManager.cc (modified) (3 diffs)
• input/InputManager.h (modified) (4 diffs)

code/branches/input/src/core/CMakeLists.txt

@@ -4 +4 @@
   ConfigFileManager.cc
   ConfigValueContainer.cc
-  CoreSettings.cc
+  Core.cc
   Error.cc
   Executor.cc
@@ -27 +27 @@
   SignalHandler.cc
   TclBind.cc
-  Tickable.cc
   XMLPort.cc
   TclThreadManager.cc

code/branches/input/src/core/Core.cc

@@ -28 +28 @@
 
 /**
-    @file CoreSettings.cc
-    @brief Implementation of the CoreSettings class.
+    @file Core.cc
+    @brief Implementation of the Core class.
 */
 
-#include "CoreSettings.h"
+#include "Core.h"
 #include "Language.h"
 #include "CoreIncludes.h"
 #include "ConfigValueIncludes.h"
+#include "input/InputManager.h"
+#include "TclThreadManager.h"
 
 namespace orxonox
@@ -43 +45 @@
         @param A reference to a global variable, used to avoid an infinite recursion in getSoftDebugLevel()
     */
-    CoreSettings::CoreSettings()
-    {
-        RegisterRootObject(CoreSettings);
+    Core::Core()
+    {
+        RegisterRootObject(Core);
         this->setConfigValues();
     }
@@ -52 +54 @@
         @brief Sets the bool to true to avoid static functions accessing a deleted object.
     */
-    CoreSettings::~CoreSettings()
+    Core::~Core()
     {
         isCreatingCoreSettings() = true;
@@ -58 +60 @@
 
     /**
-        @brief Returns true if the CoreSettings instance is not yet ready and the static functions have to return a default value.
-    */
-    bool& CoreSettings::isCreatingCoreSettings()
+        @brief Returns true if the Core instance is not yet ready and the static functions have to return a default value.
+    */
+    bool& Core::isCreatingCoreSettings()
     {
         static bool bCreatingCoreSettings = true;
@@ -67 +69 @@
         {
             bFirstTime = false;
-            CoreSettings::getInstance();
+            Core::getInstance();
         }
         return bCreatingCoreSettings;
@@ -73 +75 @@
 
     /**
-        @brief Returns a unique instance of CoreSettings.
+        @brief Returns a unique instance of Core.
         @return The instance
     */
-    CoreSettings& CoreSettings::getInstance()
-    {
-        static CoreSettings instance = CoreSettings();
+    Core& Core::getInstance()
+    {
+        static Core instance = Core();
 
         // If bCreatingSoftDebugLevelObject is true, we're just about to create an instance of the DebugLevel class
-        if (CoreSettings::isCreatingCoreSettings())
+        if (Core::isCreatingCoreSettings())
         {
             isCreatingCoreSettings() = false;
@@ -92 +94 @@
         @brief Function to collect the SetConfigValue-macro calls.
     */
-    void CoreSettings::setConfigValues()
+    void Core::setConfigValues()
     {
         SetConfigValue(softDebugLevelConsole_, 3).description("The maximal level of debug output shown in the console");
@@ -121 +123 @@
         @return The softDebugLevel
     */
-    int CoreSettings::getSoftDebugLevel(OutputHandler::OutputDevice device)
-    {
-        if (!CoreSettings::isCreatingCoreSettings())
+    int Core::getSoftDebugLevel(OutputHandler::OutputDevice device)
+    {
+        if (!Core::isCreatingCoreSettings())
         {
             if (device == OutputHandler::LD_All)
-                return CoreSettings::getInstance().softDebugLevel_;
+                return Core::getInstance().softDebugLevel_;
             else if (device == OutputHandler::LD_Console)
-                return CoreSettings::getInstance().softDebugLevelConsole_;
+                return Core::getInstance().softDebugLevelConsole_;
             else if (device == OutputHandler::LD_Logfile)
-                return CoreSettings::getInstance().softDebugLevelLogfile_;
+                return Core::getInstance().softDebugLevelLogfile_;
             else if (device == OutputHandler::LD_Shell)
-                return CoreSettings::getInstance().softDebugLevelShell_;
+                return Core::getInstance().softDebugLevelShell_;
         }
 
@@ -144 +146 @@
         @param level The level
     */
-     void CoreSettings::setSoftDebugLevel(OutputHandler::OutputDevice device, int level)
+     void Core::setSoftDebugLevel(OutputHandler::OutputDevice device, int level)
      {
-        if (!CoreSettings::isCreatingCoreSettings())
+        if (!Core::isCreatingCoreSettings())
         {
             if (device == OutputHandler::LD_All)
-                CoreSettings::getInstance().softDebugLevel_ = level;
+                Core::getInstance().softDebugLevel_ = level;
             else if (device == OutputHandler::LD_Console)
-                CoreSettings::getInstance().softDebugLevelConsole_ = level;
+                Core::getInstance().softDebugLevelConsole_ = level;
             else if (device == OutputHandler::LD_Logfile)
-                CoreSettings::getInstance().softDebugLevelLogfile_ = level;
+                Core::getInstance().softDebugLevelLogfile_ = level;
             else if (device == OutputHandler::LD_Shell)
-                CoreSettings::getInstance().softDebugLevelShell_ = level;
+                Core::getInstance().softDebugLevelShell_ = level;
         }
      }
@@ -162 +164 @@
         @brief Returns the configured language.
     */
-    const std::string& CoreSettings::getLanguage()
-    {
-        if (!CoreSettings::isCreatingCoreSettings())
-            return CoreSettings::getInstance().language_;
+    const std::string& Core::getLanguage()
+    {
+        if (!Core::isCreatingCoreSettings())
+            return Core::getInstance().language_;
 
         return Language::getLanguage().defaultLanguage_;
@@ -173 +175 @@
         @brief Sets the language in the config-file back to the default.
     */
-    void CoreSettings::resetLanguage()
-    {
-        CoreSettings::getInstance().resetLanguageIntern();
+    void Core::resetLanguage()
+    {
+        Core::getInstance().resetLanguageIntern();
     }
 
@@ -181 +183 @@
         @brief Sets the language in the config-file back to the default.
     */
-    void CoreSettings::resetLanguageIntern()
+    void Core::resetLanguageIntern()
     {
         ResetConfigValue(language_);
+    }
+
+    /**
+        @brief Ticks every core class in a specified sequence. Has to be called
+               every Orxonox tick!
+        @param dt Delta Time
+    */
+    void Core::tick(float dt)
+    {
+        TclThreadManager::getInstance().tick(dt);
+        InputManager::tick(dt);
     }
 }
@@ -193 +206 @@
 int getSoftDebugLevel()
 {
-    return orxonox::CoreSettings::getSoftDebugLevel();
+    return orxonox::Core::getSoftDebugLevel();
 }

code/branches/input/src/core/Core.h

@@ -28 +28 @@
 
 /**
-    @file CoreSettings.h
-    @brief Definition of the CoreSettings class.
+    @file Core.h
+    @brief Definition of the Core class.
 
-    The CoreSettings class is a singleton, only used to configure some variables
+    The Core class is a singleton, only used to configure some variables
     in the core through the config-file.
 */
@@ -45 +45 @@
 namespace orxonox
 {
-    //! The CoreSettings class is a singleton, only used to configure some config-values.
-    class _CoreExport CoreSettings : public OrxonoxClass
+    //! The Core class is a singleton, only used to configure some config-values.
+    class _CoreExport Core : public OrxonoxClass
     {
         public:
-            static CoreSettings& getInstance();
+            static Core& getInstance();
             static bool& isCreatingCoreSettings();
             void setConfigValues();
@@ -58 +58 @@
             static void resetLanguage();
 
+            static void tick(float dt);
+
         private:
             void resetLanguageIntern();
 
-            CoreSettings();
-            CoreSettings(const CoreSettings& other);
-            virtual ~CoreSettings();
+            Core();
+            Core(const Core& other);
+            virtual ~Core();
 
             int softDebugLevel_;                            //!< The debug level

code/branches/input/src/core/CorePrereqs.h

@@ -112 +112 @@
   class ConfigValueContainer;
   class ConsoleCommand;
-  class CoreSettings;
+  class Core;
   class Error;
   class Executor;

code/branches/input/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/branches/input/src/core/Language.h

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

code/branches/input/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/branches/input/src/core/Shell.cc

@@ -31 +31 @@
 #include "CoreIncludes.h"
 #include "ConfigValueIncludes.h"
-#include "CoreSettings.h"
+#include "Core.h"
 #include "ConsoleCommand.h"
 #include "input/InputInterfaces.h"
@@ -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/branches/input/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/branches/input/src/core/input/InputManager.cc

@@ -499 +499 @@
     @param dt Delta time
   */
-  void InputManager::tick(float dt)
+  void InputManager::_tick(float dt)
   {
     if (state_ == IS_UNINIT)
@@ -649 +649 @@
       activeHandlers_[iHandler].first->tickInput(dt, activeHandlers_[iHandler].second);
   }
-
+    
   void InputManager::_completeCalibration()
   {
@@ -1141 +1141 @@
   }
 
+  void InputManager::tick(float dt)
+  {
+    _getSingleton()._tick(dt);
+  }
+
   // ###### KeyHandler ######
 

code/branches/input/src/core/input/InputManager.h

@@ -43 +43 @@
 #include "ois/OIS.h"
 #include "util/Math.h"
-#include "core/Tickable.h"
+#include "core/OrxonoxClass.h"
 #include "InputInterfaces.h"
 
@@ -89 +89 @@
   */
   class _CoreExport InputManager
-        : public TickableReal,
+        : public OrxonoxClass,
           public OIS::KeyListener, public OIS::MouseListener, public OIS::JoyStickListener
   {
@@ -143 +143 @@
     static void calibrate();
 
+    static void tick(float dt);
+
     static bool addKeyHandler                 (KeyHandler* handler, const std::string& name);
     static bool removeKeyHandler              (const std::string& name);
@@ -191 +193 @@
     unsigned int _getJoystick(const OIS::JoyStickEvent& arg);
 
-    void tick(float dt);
+    void _tick(float dt);
 
     // input events