git-svn-id: https://kforge.ros.org/fcl/fcl_ros@97 253336fb-580f-4252-a368-f3cef5a2a82b

trunk/fcl/include/fcl/math_details.h

@@ -116,7 +116,7 @@ static inline Vec3Data<T> cross_prod(const Vec3Data<T>& l, const Vec3Data<T>& r)
 }
 
 template <typename T>
-static inline T dot_prod(const Vec3Data<T>& l, const Vec3Data<T>& r)
+static inline T dot_prod3(const Vec3Data<T>& l, const Vec3Data<T>& r)
 {
   return l.vs[0] * r.vs[0] + l.vs[1] * r.vs[1] + l.vs[2] * r.vs[2];
 }

trunk/fcl/include/fcl/vec_3f.h

@@ -80,10 +80,10 @@ public:
   inline Vec3fX& operator /= (U t) { data /= t; return *this; }
   inline Vec3fX operator - () { return Vec3fX(-data); }
   inline Vec3fX cross(const Vec3fX& other) const { return Vec3fX(details::cross_prod(data, other.data)); }
-  inline U dot(const Vec3fX& other) const { return details::dot_prod(data, other.data); }
+  inline U dot(const Vec3fX& other) const { return details::dot_prod3(data, other.data); }
   inline bool normalize()
   {
-    U sqr_length = details::dot_prod(data, data);
+    U sqr_length = details::dot_prod3(data, data);
     if(sqr_length > 0)
     {
       *this /= (U)sqrt(sqr_length);
@@ -95,15 +95,15 @@ public:
 
   inline Vec3fX normalized() const
   {
-    U sqr_length = details::dot_prod(data, data);
+    U sqr_length = details::dot_prod3(data, data);
     if(sqr_length > 0)
       return *this / (U)sqrt(sqr_length);
     else
       return *this;
   }
 
-  inline U length() const { return sqrt(details::dot_prod(data, data)); }
-  inline U sqrLength() const { return details::dot_prod(data, data); }
+  inline U length() const { return sqrt(details::dot_prod3(data, data)); }
+  inline U sqrLength() const { return details::dot_prod3(data, data); }
   inline void setValue(U x, U y, U z) { data.setValue(x, y, z); }
   inline void setValue(U x) { data.setValue(x); }
   inline bool equal(const Vec3fX& other, U epsilon = std::numeric_limits<U>::epsilon() * 100) const { return details::equal(data, other.data, epsilon); }