Changeset 1319 for code/branches/console/src/util/MultiTypeMath.cc

Timestamp:

May 19, 2008, 12:55:41 AM (16 years ago)

Author:

landauf

Message:

added support for Vector4 to MultiTypeMath and added a new function called 'assimilate' that converts the stored value of a given MultiType to it's own type and assigns it.

File:

• code/branches/console/src/util/MultiTypeMath.cc (modified) (9 diffs)

code/branches/console/src/util/MultiTypeMath.cc

@@ -37 +37 @@
     else if (type == MT_vector3)
         this->vector3_ = orxonox::Vector3(0, 0, 0);
+    else if (type == MT_vector4)
+        this->vector4_ = orxonox::Vector4(0, 0, 0, 0);
     else if (type == MT_colourvalue)
         this->colourvalue_ = orxonox::ColourValue(0, 0, 0, 0);
@@ -55 +57 @@
         else if (this->type_ == MT_vector3)
             return (this->vector3_ == mtm.vector3_);
+        else if (this->type_ == MT_vector4)
+            return (this->vector4_ == mtm.vector4_);
         else if (this->type_ == MT_colourvalue)
             return (this->colourvalue_ == mtm.colourvalue_);
@@ -76 +80 @@
         else if (this->type_ == MT_vector3)
             return (this->vector3_ != mtm.vector3_);
+        else if (this->type_ == MT_vector4)
+            return (this->vector4_ != mtm.vector4_);
         else if (this->type_ == MT_colourvalue)
             return (this->colourvalue_ != mtm.colourvalue_);
@@ -123 +129 @@
 MultiTypeMath::operator orxonox::Vector3() const
 { return (this->type_ == MT_vector3) ? this->vector3_ : getConvertedValue<MultiTypeMath, orxonox::Vector3>(*this); }
+MultiTypeMath::operator orxonox::Vector4() const
+{ return (this->type_ == MT_vector4) ? this->vector4_ : getConvertedValue<MultiTypeMath, orxonox::Vector4>(*this); }
 MultiTypeMath::operator orxonox::Quaternion() const
 { return (this->type_ == MT_quaternion) ? this->quaternion_ : getConvertedValue<MultiTypeMath, orxonox::Quaternion>(*this); }
@@ -137 +145 @@
     this->vector2_ = mtm.vector2_;
     this->vector3_ = mtm.vector3_;
+    this->vector4_ = mtm.vector4_;
     this->quaternion_ = mtm.quaternion_;
     this->colourvalue_ = mtm.colourvalue_;
@@ -149 +158 @@
     else if (this->type_ == MT_vector3)
         return "Vector3";
+    else if (this->type_ == MT_vector4)
+        return "Vector4";
     else if (this->type_ == MT_colourvalue)
         return "ColourValue";
@@ -169 +180 @@
     else if (this->type_ == MT_vector3)
         ConvertValue(&output, this->vector3_);
+    else if (this->type_ == MT_vector4)
+        ConvertValue(&output, this->vector4_);
     else if (this->type_ == MT_colourvalue)
         ConvertValue(&output, this->colourvalue_);
@@ -189 +202 @@
     else if (this->type_ == MT_vector3)
         return ConvertValue(&this->vector3_, value, orxonox::Vector3(0, 0, 0));
+    else if (this->type_ == MT_vector4)
+        return ConvertValue(&this->vector4_, value, orxonox::Vector4(0, 0, 0, 0));
     else if (this->type_ == MT_colourvalue)
         return ConvertValue(&this->colourvalue_, value, orxonox::ColourValue(0, 0, 0, 0));
@@ -199 +214 @@
     else
         return MultiTypeString::fromString(value);
+}
+
+void MultiTypeMath::assimilate(const MultiTypeMath& mtm)
+{
+    if (this->type_ == MT_vector2)
+        this->vector2_ = mtm.operator orxonox::Vector2();
+    else if (this->type_ == MT_vector3)
+        this->vector3_ = mtm.operator orxonox::Vector3();
+    else if (this->type_ == MT_vector4)
+        this->vector4_ = mtm.operator orxonox::Vector4();
+    else if (this->type_ == MT_colourvalue)
+        this->colourvalue_ = mtm;
+    else if (this->type_ == MT_quaternion)
+        this->quaternion_ = mtm;
+    else if (this->type_ == MT_radian)
+        this->radian_ = mtm.operator orxonox::Radian();
+    else if (this->type_ == MT_degree)
+        this->degree_ = mtm.operator orxonox::Degree();
+    else
+        MultiTypeString::assimilate(mtm);
 }