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

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.h (moved) (moved from code/branches/input/src/core/CoreSettings.h) (3 diffs)

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