Changeset 695

Timestamp:

Dec 27, 2007, 3:44:20 AM (16 years ago)

Author:

landauf

Message:

yet another version of the DebugLevel hack.
DebugLevel is an OrxonoxClass again, to make the softDebugLevel-variable changeable during the game. now there are 2 static bools to avoid an infinite recursion. i hope this works.
(btw: the ClassIdentifier seems to work now, finally)

Location:

code/branches/FICN/src/orxonox/core

Files:

• DebugLevel.cc (modified) (3 diffs)
• DebugLevel.h (modified) (1 diff)
• OrxonoxClass.cc (modified) (1 diff)
• OrxonoxClass.h (modified) (1 diff)

code/branches/FICN/src/orxonox/core/DebugLevel.cc

@@ -31 +31 @@
 */
 
-#include "ConfigValueContainer.h"
+#include "CoreIncludes.h"
 #include "Debug.h"
 #include "DebugLevel.h"
@@ -39 +39 @@
     /**
         @brief Constructor: Registers the object and sets the debug level.
+        @param A reference to a global variable, used to avoid an infinite recursion in getSoftDebugLevel()
     */
-    DebugLevel::DebugLevel()
+    DebugLevel::DebugLevel(bool& bReturnSoftDebugLevel)
     {
-        this->softDebugLevelContainer_ = new ConfigValueContainer(std::string("DebugLevel"), std::string("softDebugLevel_"), this->softDebugLevel_ = 2);
-        this->softDebugLevel_ = this->softDebugLevelContainer_->getValue(this->softDebugLevel_);
+        RegisterRootObject(DebugLevel);
+        this->setConfigValues();
+        bReturnSoftDebugLevel = true;
+    }
+
+    /**
+        @brief Function to collect the SetConfigValue-macro calls.
+    */
+    void DebugLevel::setConfigValues()
+    {
+        SetConfigValue(softDebugLevel_, 2);
     }
 
@@ -51 +61 @@
     int DebugLevel::getSoftDebugLevel()
     {
-        static DebugLevel theOneAndOnlyInstance = DebugLevel();
-        return theOneAndOnlyInstance.softDebugLevel_;
+        static bool bCreatingSoftDebugLevelObject = true;   // Static variable - used to enhance the performance
+        static bool bReturnSoftDebugLevel = false;          // Static variable - used to avoid an infinite recursion
+        static DebugLevel* theOnlyDebugLevelObject = 0;     // Static variable - will contain a pointer to the only instance of the DebugLevel class
+
+        // If bReturnSoftDebugLevel is true, the instance of DebugLevel was created (it's set to true at the end of the constructor, call by reference)
+        if (bReturnSoftDebugLevel)
+            return theOnlyDebugLevelObject->softDebugLevel_;
+
+        // If bCreatingSoftDebugLevelObject is true, we're just about to create an instance of the DebugLevel class
+        if (bCreatingSoftDebugLevelObject)
+        {
+            bCreatingSoftDebugLevelObject = false;
+            theOnlyDebugLevelObject = new DebugLevel(bReturnSoftDebugLevel);
+            return theOnlyDebugLevelObject->softDebugLevel_;
+        }
+
+        // Return a constant value while we're creating the object
+        return 4;
     }
-
 }
 

code/branches/FICN/src/orxonox/core/DebugLevel.h

@@ -38 +38 @@
 
 #include "CorePrereqs.h"
+#include "OrxonoxClass.h"
 
 namespace orxonox
 {
     //! The DebugLevel class is a singleton, only used to configure the amount of debug output.
-    class _CoreExport DebugLevel
+    class _CoreExport DebugLevel : public OrxonoxClass
     {
         public:
             static int getSoftDebugLevel();
+            void setConfigValues();
+
         private:
-            DebugLevel();                       // don't create
+            explicit DebugLevel(bool& bReturnSoftDebugLevel);
             DebugLevel(const DebugLevel& dl) {} // don't copy
             ~DebugLevel() {}                    // don't delete

code/branches/FICN/src/orxonox/core/OrxonoxClass.cc

@@ -43 +43 @@
         this->bActive_ = true;
         this->bVisible_ = true;
+
+        this->setConfigValues();
     }
 

code/branches/FICN/src/orxonox/core/OrxonoxClass.h

@@ -57 +57 @@
             virtual ~OrxonoxClass();
 
+            /** @brief Function to collect the SetConfigValue-macro calls. */
             void setConfigValues() {};