From 5f11437fd1a80a7f85f89dfffd9072daac62b4bf Mon Sep 17 00:00:00 2001 From: mtarini Date: Tue, 9 Mar 2004 16:47:32 +0000 Subject: [PATCH] Added "Normalize" flag --- vcg/space/line3.h | 52 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/vcg/space/line3.h b/vcg/space/line3.h index 6ecec6f0..2dfae4b5 100644 --- a/vcg/space/line3.h +++ b/vcg/space/line3.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.2 2004/03/08 19:46:47 tarini +First Version (tarini) + Revision 1.1 2004/03/08 16:15:48 tarini first version (tarini) @@ -47,8 +50,9 @@ Templated class for 3D lines. This is the class for infinite lines in 3D space. A Line is stored just as two Point3: an origin and a direction (not necessarily normalized). @param LineScalarType (template parameter) Specifies the type of scalar used to represent coords. + @param NORM: if on, the direction is always Normalized */ -template +template class Line3 { public: @@ -60,7 +64,7 @@ public: typedef Point3 PointType; /// The point type - typedef Line3 LineType; + typedef Line3 LineType; private: @@ -76,12 +80,14 @@ public: inline const PointType &Ori() const { return _ori; } inline const PointType &Dir() const { return _dir; } inline PointType &Ori() { return _ori; } - inline PointType &Dir() { return _dir; } - + inline PointType &Dir() { + assert(NORM); // Direction can't be set for NORMALIZED Rays! Use SetDir instead! + return _dir; + } /// The empty constructor Line3() {}; /// The (origin, direction) constructor - LineType(const PointType &ori, const PointType &dir) { _ori=ori; _dir=dir; }; + LineType(const PointType &ori, const PointType &dir) {SetOri(ori); SetDir(dir);}; /// Operator to compare two lines inline bool operator == ( LineType const & p ) const { return _ori==p._ori && _dir==p._dir; } @@ -90,23 +96,32 @@ public: { return _ori!=p._ori || _dir!=p._dir; } /// Projects a point on the line inline ScalarType Projection( const PointType &p ) const - { ScalarType l = dire.SquaredNorm(); - return ScalarType((p-_ori)*_dir/l); } - ///set up of the line. + { if (NORM) return ScalarType((p-_ori)*_dir); + else return ScalarType((p-_ori)*_dir/_dir.SquaredNorm()); + } + bool IsNorm() const {return NORM;}; + ///set the origin + void SetOri( const PointType & ori ) + { _ori=ori; } + ///set the direction + void SetDir( const PointType & dir) + { _dir=dir; if (NORM) _dir.Normalize(); } + ///set both the origina and direction. void Set( const PointType & ori, const PointType & dir ) - { _ori = ori; _dir=dir } + { SetOri(ori); SetDir(dir); } /// calculates the point of parameter t on the line. inline PointType P( const ScalarType t ) const { return orig + dire * t; } /// normalizes direction field - LineType &Normalize() - { _dir.Normalize(); return *this;} - static LineType &Normalize(LineType &p) - { p.Normalize(); return p;} + Line3 &Normalize() + { if (!NORM) _dir.Normalize(); return *((Line3*)this);} + static Line3 &Normalize(LineType &p) + { p.Normalize(); return *((Line3*)(&p));} /// importer for different line types - template - inline void Import( const Line3 & b ) - { _ori.Import( b._ori); _dir.Import( b._dir); + template + inline void Import( const Line3 & b ) + { _ori.Import( b._ori); _dir.Import( b._dir); + if ((NORM) && (!K)) _dir.Normalize(); } }; // end class definition @@ -117,6 +132,11 @@ typedef Line3 Line3i; typedef Line3 Line3f; typedef Line3 Line3d; +typedef Line3 Line3sN; +typedef Line3 Line3iN; +typedef Line3 Line3fN; +typedef Line3 Line3dN; + /*@}*/