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

Timestamp:

May 19, 2008, 2:18:55 AM (16 years ago)

Author:

landauf

Message:

changed the previously implemented assimilate function to take an optional default-value and to return false if the conversion failed.

File:

• code/branches/console/src/util/MultiTypeMath.cc (modified) (1 diff)

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

@@ -216 +216 @@
 }
 
-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);
+bool MultiTypeMath::assimilate(const MultiTypeMath& mtm, const MultiTypeMath& defvalue)
+{
+    if (this->type_ == MT_vector2)
+        return ConvertValue(&this->vector2_, mtm, defvalue.vector2_);
+    else if (this->type_ == MT_vector3)
+        return ConvertValue(&this->vector3_, mtm, defvalue.vector3_);
+    else if (this->type_ == MT_vector4)
+        return ConvertValue(&this->vector4_, mtm, defvalue.vector4_);
+    else if (this->type_ == MT_colourvalue)
+        return ConvertValue(&this->colourvalue_, mtm, defvalue.colourvalue_);
+    else if (this->type_ == MT_quaternion)
+        return ConvertValue(&this->quaternion_, mtm, defvalue.quaternion_);
+    else if (this->type_ == MT_radian)
+        return ConvertValue(&this->radian_, mtm, defvalue.radian_);
+    else if (this->type_ == MT_degree)
+        return ConvertValue(&this->degree_, mtm, defvalue.degree_);
+    else
+        return MultiTypeString::assimilate(mtm, defvalue);
 }