Changeset 1003 for code/branches/core2/src/util/MultiTypeMath.cc

Timestamp:

Apr 8, 2008, 7:02:46 PM (16 years ago)

Author:

landauf

Message:

hopefully solved the conversion problem

it's a lot of metaprogramming now but this reduces the risk getting unnecessary compiler errors:
if (convert(a, b))

return true;

else

return convertFallback(a, b);

if convert(a, b) is defined and always used you could still get an error if convertFallback(a, b) uses something (like stream << object) that isn't supported for a or b. but with some template tricks it's possible to not even consider using convertFallback(a, b) at compiletime and avoid the error as long as convert(a, b) is implemented.

util/Conver.h is now opened for curious coders

File:

• code/branches/core2/src/util/MultiTypeMath.cc (modified) (2 diffs)

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

@@ -165 +165 @@
 
     if (this->type_ == MT_vector2)
-        ConvertValue(&output, this->vector2_, CP_FromType);
+        ConvertValue(&output, this->vector2_);
     else if (this->type_ == MT_vector3)
-        ConvertValue(&output, this->vector3_, CP_FromType);
+        ConvertValue(&output, this->vector3_);
     else if (this->type_ == MT_colourvalue)
     { std::cout << "3_1\n";
-        ConvertValue(&output, this->colourvalue_, CP_FromType);}
+        ConvertValue(&output, this->colourvalue_);}
     else if (this->type_ == MT_quaternion)
-        ConvertValue(&output, this->quaternion_, CP_FromType);
+        ConvertValue(&output, this->quaternion_);
     else if (this->type_ == MT_radian)
         ConvertValue(&output, this->radian_);
@@ -186 +186 @@
 {
     if (this->type_ == MT_vector2)
-        return ConvertValue(&this->vector2_, value, orxonox::Vector2(0, 0), CP_FromType);
+        return ConvertValue(&this->vector2_, value, orxonox::Vector2(0, 0));
     else if (this->type_ == MT_vector3)
-        return ConvertValue(&this->vector3_, value, orxonox::Vector3(0, 0, 0), CP_FromType);
+        return ConvertValue(&this->vector3_, value, orxonox::Vector3(0, 0, 0));
     else if (this->type_ == MT_colourvalue)
     { std::cout << "4_1\n";
-        return ConvertValue(&this->colourvalue_, value, orxonox::ColourValue(0, 0, 0, 0), CP_FromType); }
+        return ConvertValue(&this->colourvalue_, value, orxonox::ColourValue(0, 0, 0, 0)); }
     else if (this->type_ == MT_quaternion)
-        return ConvertValue(&this->quaternion_, value, orxonox::Quaternion(1, 0, 0, 0), CP_FromType);
+        return ConvertValue(&this->quaternion_, value, orxonox::Quaternion(1, 0, 0, 0));
     else if (this->type_ == MT_radian)
         return ConvertValue(&this->radian_, value, orxonox::Radian(0));