Changeset 925 for code/branches/core2/src/util/MultiTypeMath.h

Timestamp:

Mar 26, 2008, 1:36:35 AM (16 years ago)

Author:

landauf

Message:

• the MultiTypes can now handle pointers and xml-elements
• added a const keyword in the ticpp.h file (TinyXML++)

File:

• code/branches/core2/src/util/MultiTypeMath.h (modified) (4 diffs)

code/branches/core2/src/util/MultiTypeMath.h

@@ -38 +38 @@
 {
     public:
-        MultiTypeMath(MultiType      type = MT_null);
+        MultiTypeMath(MultiType type = MT_null);
+        inline MultiTypeMath(void*          value) : MultiTypeString(value) {}
         inline MultiTypeMath(int            value) : MultiTypeString(value) {}
         inline MultiTypeMath(unsigned int   value) : MultiTypeString(value) {}
@@ -51 +52 @@
         inline MultiTypeMath(long double    value) : MultiTypeString(value) {}
         inline MultiTypeMath(bool           value) : MultiTypeString(value) {}
-        inline MultiTypeMath(const char*        value) : MultiTypeString(value) {}
-        inline MultiTypeMath(const std::string& value) : MultiTypeString(value) {}
+        inline MultiTypeMath(const char*             value) : MultiTypeString(value) {}
+        inline MultiTypeMath(const std::string&      value) : MultiTypeString(value) {}
+        inline MultiTypeMath(const orxonox::Element& value) : MultiTypeString(value) {}
         inline MultiTypeMath(const orxonox::Vector2&     value) { this->setValue(value); }
         inline MultiTypeMath(const orxonox::Vector3&     value) { this->setValue(value); }
@@ -89 +91 @@
         bool operator!=(const MultiTypeMath& mtm) const;
 
+        virtual operator orxonox::BaseObject*()          const;
+        virtual operator void*()                const;
         virtual operator int()                  const;
         virtual operator unsigned int()         const;
@@ -103 +107 @@
         virtual operator std::string()          const;
         virtual operator const char*()          const;
+        virtual operator orxonox::Element()     const;
         virtual operator orxonox::Vector2()     const;
         virtual operator orxonox::Vector3()     const;