Changeset 434 for code/branches/objecthierarchy

Timestamp:

Dec 8, 2007, 5:37:26 PM (17 years ago)

Author:

landauf

Message:

added a config-file-parser and a makro ( SetConfigValue(variable, defaultvalue) ) to get user-modified values from the config-file (or to write the defaultvalue into it if the variable isn't yet in the file).

Location:

code/branches/objecthierarchy/src

Files:

• CMakeLists.txt (modified) (1 diff)
• orxonox/core/ConfigValueContainer.cc (added)
• orxonox/core/ConfigValueContainer.h (added)
• orxonox/core/Identifier.h (modified) (3 diffs)
• orxonox/core/IdentifierIncludes.h (modified) (2 diffs)
• orxonox/core/OrxonoxClass.h (modified) (1 diff)
• orxonox/objects/Tickable.h (modified) (1 diff)
• orxonox/objects/Timer.h (modified) (1 diff)
• orxonox/objects/test3.cc (modified) (2 diffs)
• orxonox/objects/test3.h (modified) (1 diff)
• orxonox/orxonox.cc (modified) (1 diff)

code/branches/objecthierarchy/src/CMakeLists.txt

@@ -2 +2 @@
 
 # create a few variables to simplify life
-SET(SRC_FILES orxonox/orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc orxonox/core/IdentifierList.cc orxonox/core/Identifier.cc orxonox/core/MetaObjectList.cc orxonox/core/Factory.cc orxonox/core/OrxonoxClass.cc orxonox/objects/BaseObject.cc orxonox/objects/test1.cc orxonox/objects/test2.cc orxonox/objects/test3.cc)
-SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h orxonox/core/IdentifierIncludes.h orxonox/core/Identifier.h orxonox/core/Factory.h orxonox/core/ClassFactory.h orxonox/core/IdentifierList.h orxonox/core/ObjectList.h orxonox/core/MetaObjectList.h orxonox/core/Iterator.h orxonox/core/OrxonoxClass.h orxonox/objects/BaseObject.h orxonox/objects/Test.h orxonox/objects/test1.h orxonox/objects/test2.h orxonox/objects/test3.h orxonox/objects/Tickable.h orxonox/objects/Timer.h)
+SET(SRC_FILES orxonox/orxonox.cc loader/LevelLoader.cc xml/xmlParser.cc orxonox/core/IdentifierList.cc orxonox/core/Identifier.cc orxonox/core/MetaObjectList.cc orxonox/core/Factory.cc orxonox/core/OrxonoxClass.cc orxonox/core/ConfigValueContainer.cc orxonox/objects/BaseObject.cc orxonox/objects/test1.cc orxonox/objects/test2.cc orxonox/objects/test3.cc)
+SET(INC_FILES loader/LevelLoader.h xml/xmlParser.h orxonox/core/IdentifierIncludes.h orxonox/core/Identifier.h orxonox/core/Factory.h orxonox/core/ClassFactory.h orxonox/core/IdentifierList.h orxonox/core/ObjectList.h orxonox/core/MetaObjectList.h orxonox/core/Iterator.h orxonox/core/OrxonoxClass.h orxonox/core/ConfigValueContainer.h orxonox/objects/BaseObject.h orxonox/objects/Test.h orxonox/objects/test1.h orxonox/objects/test2.h orxonox/objects/test3.h orxonox/objects/Tickable.h orxonox/objects/Timer.h)
 
 #Creates an executable

code/branches/objecthierarchy/src/orxonox/core/Identifier.h

@@ -25 +25 @@
 
 #include <iostream>
+#include <map>
 
 #include "IdentifierList.h"
 #include "ObjectList.h"
 #include "Factory.h"
-
-#define HIERARCHY_VERBOSE false
+#include "ConfigValueContainer.h"
+
+#define HIERARCHY_VERBOSE 0
 
 
@@ -93 +95 @@
             void setNetworkID(unsigned int id);
 
+            inline ConfigValueContainer* getConfigValueContainer(const std::string& varname)
+                { return this->configValues_[varname]; }
+
+            inline void setConfigValueContainer(const std::string& varname, ConfigValueContainer* container)
+                { this->configValues_[varname] = container; }
+
         private:
             Identifier();
@@ -121 +129 @@
             }
 
-            IdentifierList parents_;                    //!< The Parents of the class the Identifier belongs to
-            IdentifierList* children_;                  //!< The Children of the class the Identifier belongs to
-
-            std::string name_;                          //!< The name of the class the Identifier belongs to
-
-            BaseFactory* factory_;                      //!< The Factory, able to create new objects of the given class
-            bool bCreatedOneObject_;                    //!< True if at least one object of the given type was created (used to determine the need of storing the parents)
-            static int hierarchyCreatingCounter_s;      //!< Bigger than zero if at least one Identifier stores its parents (its an int instead of a bool to avoid conflicts with multithreading)
-            static unsigned int classIDcounter_s;       //!< The number of unique Identifiers
-            unsigned int classID_;                      //!< The networkID to identify a class through the network
+            IdentifierList parents_;                                    //!< The Parents of the class the Identifier belongs to
+            IdentifierList* children_;                                  //!< The Children of the class the Identifier belongs to
+
+            std::string name_;                                          //!< The name of the class the Identifier belongs to
+
+            BaseFactory* factory_;                                      //!< The Factory, able to create new objects of the given class
+            bool bCreatedOneObject_;                                    //!< True if at least one object of the given type was created (used to determine the need of storing the parents)
+            static int hierarchyCreatingCounter_s;                      //!< Bigger than zero if at least one Identifier stores its parents (its an int instead of a bool to avoid conflicts with multithreading)
+            static unsigned int classIDcounter_s;                       //!< The number of unique Identifiers
+            unsigned int classID_;                                      //!< The networkID to identify a class through the network
+            std::map<std::string, ConfigValueContainer*> configValues_;
     };
 

code/branches/objecthierarchy/src/orxonox/core/IdentifierIncludes.h

@@ -16 +16 @@
 #include "Iterator.h"
 #include "OrxonoxClass.h"
+#include "ConfigValueContainer.h"
 
+#include "OgreVector3.h"
+#include "OgreColourValue.h"
+
+namespace orxonox
+{
+    typedef Ogre::Vector3 Vector3;
+    typedef Ogre::ColourValue ColourValue;
+}
 
 // Intern macro, containing the common parts of RegisterObject and RegisterRootObject
@@ -62 +71 @@
 #define ID(StringOrInt) \
     Factory::getIdentifier(StringOrInt)
+
+// bla
+#define SetConfigValue(varname, defvalue) \
+    ConfigValueContainer* container##varname = this->getIdentifier()->getConfigValueContainer(#varname); \
+    if (!container##varname) \
+    { \
+        container##varname = new ConfigValueContainer(this->getIdentifier()->getName(), #varname, defvalue); \
+        this->getIdentifier()->setConfigValueContainer(#varname, container##varname); \
+    } \
+    this->varname = container##varname->getValue(varname)

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

@@ -27 +27 @@
             OrxonoxClass();
             virtual ~OrxonoxClass();
+
+            void setConfigValues() {};
 
             /** @returns the Identifier of the object */

code/branches/objecthierarchy/src/orxonox/objects/Tickable.h

@@ -3 +3 @@
 
 #include "../core/IdentifierIncludes.h"
-#include "Ogre.h"
+#include "OgreFrameListener.h"
 
 namespace orxonox

code/branches/objecthierarchy/src/orxonox/objects/Timer.h

@@ -3 +3 @@
 
 #include "../core/IdentifierIncludes.h"
-#include "Ogre.h"
+#include "OgreFrameListener.h"
 
 namespace orxonox

code/branches/objecthierarchy/src/orxonox/objects/test3.cc

@@ -10 +10 @@
     {
         RegisterObject(Test3);
+
+        this->setConfigValues();
+    }
+
+    void Test3::setConfigValues()
+    {
+        SetConfigValue(value_int_, -100);
+        SetConfigValue(value_double_, 10.555678);
+        SetConfigValue(value_bool_, true);
+        SetConfigValue(value_string_, "Dies ist ein Test");
+        SetConfigValue(value_vector3_, Vector3(13, 26, 39));
+        SetConfigValue(value_colourvalue_, ColourValue(1.0, 0.5, 0.25, 0.887));
     }
 
@@ -15 +27 @@
     {
     }
+
+    void Test3::configOutput()
+    {
+        std::cout << this->value_int_ << std::endl;
+        std::cout << this->value_double_ << std::endl;
+        std::cout << this->value_bool_ << std::endl;
+        std::cout << this->value_string_ << std::endl;
+        std::cout << this->value_vector3_ << std::endl;
+        std::cout << this->value_colourvalue_ << std::endl;
+    }
+
         #define testandcout(code) \
           std::cout << #code << " " << code << "\n"

code/branches/objecthierarchy/src/orxonox/objects/test3.h

@@ -15 +15 @@
             virtual ~Test3();
 
+            void setConfigValues();
+
             void usefullClassesIsATest(Test1* test1);
             void usefullClassesIsATest(Test2* test2);
+
+            void configOutput();
+
+        private:
+            int                 value_int_;
+            double              value_double_;
+            bool                value_bool_;
+            std::string         value_string_;
+            Vector3             value_vector3_;
+            ColourValue         value_colourvalue_;
     };
 }

code/branches/objecthierarchy/src/orxonox/orxonox.cc

@@ -623 +623 @@
 
         std::cout << "2\n";
+        Test2* test11_2 = new Test2;
 */
 
-        Test2* test11_2 = new Test2;
         std::cout << "3\n";
+        Test3* test11_3 = new Test3;
+        test11_3->configOutput();
+
+        std::cout << "4\n";
 
         startRenderLoop();