diff --git a/vcg/math/similarity.h b/vcg/math/similarity.h index 831abbb5..63e62c96 100644 --- a/vcg/math/similarity.h +++ b/vcg/math/similarity.h @@ -134,6 +134,8 @@ public: S sca; }; + + template Similarity &Invert(Similarity &m); template Similarity Inverse(const Similarity &m); template Point3 operator*(const Similarity &m, const Point3 &p); @@ -231,9 +233,9 @@ template Similarity Inverse(const S template Similarity Interpolate(const Similarity &a, const Similarity &b, const S t) { Similarity r; - r.rot = interpolate(a.rot, b.rot, t); - r.tra = t * a.tra + (1-t) * b.tra; - r.sca = t * a.sca + (1-t) * b.sca; + r.rot = Interpolate(a.rot, b.rot, t); + r.tra = a.tra * t + b.tra * (1-t); + r.sca = a.sca * t + b.sca * (1-t); return r; } @@ -246,6 +248,7 @@ template Point3 operator*(const Similarity Similarityf; //typedef SimilaritySimilarityd;