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

Timestamp:

Mar 5, 2008, 6:38:09 PM (16 years ago)

Author:

landauf

Message:

sync with notebook, there are some changes in the MultiTypes, XMLPort and the WorldEntity, but there's still a bug in some of the Converter-specializations

File:

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

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

@@ -59 +59 @@
         inline MultiTypeMath(const orxonox::Radian&      value) { this->setValue(value); }
         inline MultiTypeMath(const orxonox::Degree&      value) { this->setValue(value); }
-        MultiTypeMath(const MultiTypeMath& mtm);
+        inline MultiTypeMath(const MultiTypeMath& mtm)          { this->setValue(mtm);   }
 
         using MultiTypeString::operator=;
@@ -68 +68 @@
         inline MultiTypeMath& operator=(const orxonox::Radian&      value) { this->setValue(value); return *this; }
         inline MultiTypeMath& operator=(const orxonox::Degree&      value) { this->setValue(value); return *this; }
-        MultiTypeMath& operator=(const MultiTypeMath& mtm);
+        inline MultiTypeMath& operator=(const MultiTypeMath& mtm)          { this->setValue(mtm);   return *this; }
 
         using MultiTypeString::operator==;
@@ -97 +97 @@
         using MultiTypeString::setValue;
         inline void setValue(const orxonox::Vector2&     value) { this->type_ = MT_vector2;     this->vector2_     = value; }
-        inline void setValue(const orxonox::Vector3&     value) { this->type_ = MT_vector3;     this->vector3_     = value; }
+        inline void setValue(const orxonox::Vector3&     value) { std::cout << "4_4: setValue Vector3: " << value << std::endl; this->type_ = MT_vector3;     this->vector3_     = value; }
         inline void setValue(const orxonox::ColourValue& value) { this->type_ = MT_colourvalue; this->colourvalue_ = value; }
         inline void setValue(const orxonox::Quaternion&  value) { this->type_ = MT_quaternion;  this->quaternion_  = value; }