Changeset 1320

Timestamp:

May 19, 2008, 2:18:55 AM (17 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.

Location:

code/branches/console/src/util

Files:

• MultiTypeMath.cc (modified) (1 diff)
• MultiTypeMath.h (modified) (1 diff)
• MultiTypePrimitive.cc (modified) (1 diff)
• MultiTypePrimitive.h (modified) (1 diff)
• MultiTypeString.cc (modified) (1 diff)
• MultiTypeString.h (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);
 }
 

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

@@ -164 +164 @@
         virtual bool fromString(const std::string value);
 
-        virtual void assimilate(const MultiTypeMath& mtm);
+        virtual bool assimilate(const MultiTypeMath& mtm, const MultiTypeMath& defvalue = MultiTypeMath());
 
     protected:

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

@@ -266 +266 @@
 }
 
-void MultiTypePrimitive::assimilate(const MultiTypePrimitive& mtp)
+bool MultiTypePrimitive::assimilate(const MultiTypePrimitive& mtp, const MultiTypePrimitive& defvalue)
 {
     if (this->type_ == MT_void)
-        this->value_.void_ = mtp;
+        return ConvertValue(&this->value_.void_, mtp, defvalue.value_.void_);
     else if (this->type_ == MT_int)
-        this->value_.int_ = mtp;
+        return ConvertValue(&this->value_.int_, mtp, defvalue.value_.int_);
     else if (this->type_ == MT_uint)
-        this->value_.uint_ = mtp;
+        return ConvertValue(&this->value_.uint_, mtp, defvalue.value_.uint_);
     else if (this->type_ == MT_char)
-        this->value_.char_ = mtp;
+        return ConvertValue(&this->value_.char_, mtp, defvalue.value_.char_);
     else if (this->type_ == MT_uchar)
-        this->value_.uchar_ = mtp;
+        return ConvertValue(&this->value_.uchar_, mtp, defvalue.value_.uchar_);
     else if (this->type_ == MT_short)
-        this->value_.short_ = mtp;
+        return ConvertValue(&this->value_.short_, mtp, defvalue.value_.short_);
     else if (this->type_ == MT_ushort)
-        this->value_.ushort_ = mtp;
+        return ConvertValue(&this->value_.ushort_, mtp, defvalue.value_.ushort_);
     else if (this->type_ == MT_long)
-        this->value_.long_ = mtp;
+        return ConvertValue(&this->value_.long_, mtp, defvalue.value_.long_);
     else if (this->type_ == MT_ulong)
-        this->value_.ulong_ = mtp;
+        return ConvertValue(&this->value_.ulong_, mtp, defvalue.value_.ulong_);
     else if (this->type_ == MT_float)
-        this->value_.float_ = mtp;
+        return ConvertValue(&this->value_.float_, mtp, defvalue.value_.float_);
     else if (this->type_ == MT_double)
-        this->value_.double_ = mtp;
+        return ConvertValue(&this->value_.double_, mtp, defvalue.value_.double_);
     else if (this->type_ == MT_longdouble)
-        this->value_.longdouble_ = mtp;
+        return ConvertValue(&this->value_.longdouble_, mtp, defvalue.value_.longdouble_);
     else if (this->type_ == MT_bool)
-        this->value_.bool_ = mtp;
+        return ConvertValue(&this->value_.bool_, mtp, defvalue.value_.bool_);
+    else
+        return false;
+
 }
 

code/branches/console/src/util/MultiTypePrimitive.h

@@ -187 +187 @@
         virtual bool fromString(const std::string value);
 
-        virtual void assimilate(const MultiTypePrimitive& mtp);
+        virtual bool assimilate(const MultiTypePrimitive& mtp, const MultiTypePrimitive& defvalue = MultiTypePrimitive());
 
     protected:

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

@@ -136 +136 @@
 }
 
-void MultiTypeString::assimilate(const MultiTypeString& mts)
+bool MultiTypeString::assimilate(const MultiTypeString& mts, const MultiTypeString& defvalue)
 {
     if (this->type_ == MT_constchar)
-        this->string_ = mts.toString();
+        return ConvertValue(&this->string_, mts, defvalue.string_);
     else if (this->type_ == MT_string)
-        this->string_ = mts.toString();
+        return ConvertValue(&this->string_, mts, defvalue.string_);
     else
-        MultiTypePrimitive::assimilate(mts);
+        return MultiTypePrimitive::assimilate(mts, defvalue);
 }
 

code/branches/console/src/util/MultiTypeString.h

@@ -117 +117 @@
         virtual bool fromString(const std::string value);
 
-        virtual void assimilate(const MultiTypeString& mts);
+        virtual bool assimilate(const MultiTypeString& mts, const MultiTypeString& defvalue = MultiTypeString());
 
     protected: