Changeset 2541

Timestamp:

Dec 28, 2008, 7:45:36 PM (16 years ago)

Author:

rgrieder

Message:

Added OrxEnum which is a template class that helps to create enumerations with unlimited entries since they are ints.
The only usage so far is for the ConfigFileType since we have about three predefined ones, but the KeyBinder would like to get new enum entries at run time.

Location:

code/branches/presentation

Files:

• src/core/ConfigFileManager.h (modified) (1 diff)
• src/util/OrxEnum.h (added)
• visual_studio/vc8/util.vcproj (modified) (2 diffs)

code/branches/presentation/src/core/ConfigFileManager.h

@@ -38 +38 @@
 
 #include "util/Math.h"
+#include "util/OrxEnum.h"
 
 namespace orxonox
 {
-    // Use unsigned int as config file type to have an arbitrary number of files
-    class ConfigFileType
-    {
-    public:
-        ConfigFileType() { }
-        ConfigFileType(unsigned int type)              { type_ = type; }
-        ConfigFileType(const ConfigFileType& instance) { type_ = instance.type_; }
-
-        operator unsigned int() { return type_; }
-        ConfigFileType& operator =(unsigned int type) { type_ = type; return *this; }
-        bool operator <(const ConfigFileType& right) const   { return (type_ < right.type_); }
-
-        /* *** Put the different config file types here *** */
-        static const unsigned int NoType              = 0;
-        static const unsigned int Settings            = 1;
-        static const unsigned int JoyStickCalibration = 2;
-
-        static const unsigned int numberOfReservedTypes = 1024;
-
-    private:
-        unsigned int type_;
+    // Use int as config file type to have an arbitrary number of files
+    struct ConfigFileType : OrxEnum<ConfigFileType>
+    {
+        OrxEnumConstructors(ConfigFileType);
+
+        static const int NoType              = 0;
+        static const int Settings            = 1;
+        static const int JoyStickCalibration = 2;
+
+        static const int numberOfReservedTypes = 1024;
     };
 

code/branches/presentation/visual_studio/vc8/util.vcproj

@@ -173 +173 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\util\OrxEnum.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\util\OutputBuffer.cc"
                                 >
@@ -247 +251 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\util\OrxEnum.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\util\OrxonoxPlatform.h"
                                 >