Changeset 1524 for code/branches/input/src/core/Core.cc

Timestamp:

Jun 3, 2008, 12:20:36 AM (16 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

File:

• code/branches/input/src/core/Core.cc (moved) (moved from code/branches/input/src/core/CoreSettings.cc) (13 diffs)

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