Changeset 848 for code/branches/core/src/util/MultiTypeMath.h

Timestamp:

Mar 5, 2008, 1:29:47 AM (16 years ago)

Author:

landauf

Message:

several changes:

• XMLPort is now theoretically able to load something (but still buggy)
• Expanded Convert with several partial template specializations
• Expanded all MultiTypes with new functions, mostly to convert values
• Expanded SubString with a new functionality: chars inside parentheses aren't split

It's not yet working as it should (at least not in all cases - loading the objects name works)

File:

• code/branches/core/src/util/MultiTypeMath.h (modified) (3 diffs)

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

@@ -88 +88 @@
         bool operator!=(const MultiTypeMath& mtm) const;
 
-        inline operator orxonox::Vector2()     const { return this->vector2_;     }
-        inline operator orxonox::Vector3()     const { return this->vector3_;     }
-        inline operator orxonox::ColourValue() const { return this->colourvalue_; }
-        inline operator orxonox::Quaternion()  const { return this->quaternion_;  }
-        inline operator orxonox::Radian()      const { return this->radian_;      }
-        inline operator orxonox::Degree()      const { return this->degree_;      }
+        operator orxonox::Vector2()     const;
+        operator orxonox::Vector3()     const;
+        operator orxonox::ColourValue() const;
+        operator orxonox::Quaternion()  const;
+        operator orxonox::Radian()      const;
+        operator orxonox::Degree()      const;
 
         using MultiTypeString::setValue;
@@ -103 +103 @@
         inline void setValue(const orxonox::Degree&      value) { this->type_ = MT_degree;      this->degree_      = value; }
         void setValue(const MultiTypeMath& mtm);
+
+        inline orxonox::Vector2     getVector2()     const { return this->vector2_;     }
+        inline orxonox::Vector3     getVector3()     const { return this->vector3_;     }
+        inline orxonox::ColourValue getColourValue() const { return this->colourvalue_; }
+        inline orxonox::Quaternion  getQuaternion()  const { return this->quaternion_;  }
+        inline orxonox::Radian      getRadian()      const { return this->radian_;      }
+        inline orxonox::Degree      getDegree()      const { return this->degree_;      }
 
         inline orxonox::Vector2&     getVector2()     { return this->vector2_;     }
@@ -119 +126 @@
         inline void getValue(orxonox::Degree*      variable) const { (*variable) = orxonox::Degree      (this->degree_);      }
 
+        std::string toString() const;
+        bool fromString(const std::string value);
+
     protected:
         orxonox::Vector2      vector2_;