From b3d63c7c643247668eff578d64611bbf8f54ae5e Mon Sep 17 00:00:00 2001 From: granzuglia Date: Wed, 6 Oct 2010 12:58:09 +0000 Subject: [PATCH] moved InterpolationParameters function after the Normal function definition --- vcg/space/triangle3.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/vcg/space/triangle3.h b/vcg/space/triangle3.h index b8ad2166..ceaa0992 100644 --- a/vcg/space/triangle3.h +++ b/vcg/space/triangle3.h @@ -203,14 +203,6 @@ bool InterpolationParameters(const TriangleType t, const Point3 & N, return InterpolationParameters(t,2,P,L); /* 2 > 1 ? 2 */ } } - -/// Handy Wrapper of the above one that calculate the normal on the triangle -template -bool InterpolationParameters(const TriangleType t, const Point3 & P, Point3 & L) -{ - Point3 N=vcg::Normal(t); - return (InterpolationParameters(t,N,P,L)); -} // Function that computes the barycentric coords of a 2D triangle. Used by the above function. @@ -446,6 +438,13 @@ Point3Type NormalizedNormal( Point3Type const &p0, Point3Type const & p1, Point } +/// Handy Wrapper of the above one that calculate the normal on the triangle +template +bool InterpolationParameters(const TriangleType t, const Point3 & P, Point3 & L) +{ + vcg::Point3 N=vcg::Normal(t); + return (InterpolationParameters(t,N,P,L)); +} /// Return the Double of area of the triangle // NOTE the old Area function has been removed to intentionally