manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added typenames to compile with gcc

This commit is contained in:
ganovelli 2008-09-30 10:38:58 +00:00
parent 5d1bd20c33
commit cdb021e821
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vcg/simplex/edge/distance.h
View File

@ -44,12 +44,12 @@ namespace vcg {
typename EdgeType::ScalarType & dist, typename EdgeType::ScalarType & dist,
vcg::Point3<typename EdgeType::ScalarType> & p ) vcg::Point3<typename EdgeType::ScalarType> & p )
{ {
vcg::Segment3<EdgeType::ScalarType> s; vcg::Segment3<typename EdgeType::ScalarType> s;
s.P0()=e.V(0)->P(); s.P0()=e.V(0)->P();
s.P1()=e.V(1)->P(); s.P1()=e.V(1)->P();
EdgeType::CoordType near; typename EdgeType::CoordType near;
vcg::ClosestPoint<EdgeType::ScalarType>(s,near); vcg::ClosestPoint<typename EdgeType::ScalarType>(s,near);
EdgeType::ScalarType d=(q-p).Norm(); typename EdgeType::ScalarType d=(q-p).Norm();
if (d<dist){ if (d<dist){
dist=d; dist=d;
p=near; p=near;
@ -59,8 +59,13 @@ namespace vcg {
return false; return false;
} }
template <class S>
class PointDistanceFunctor { class PointDistanceFunctor {
public: public:
typedef S ScalarType;
typedef Point3<ScalarType> QueryType;
static inline const Point3<ScalarType> & Pos(const QueryType & qt) {return qt;}
template <class EDGETYPE, class SCALARTYPE> template <class EDGETYPE, class SCALARTYPE>
inline bool operator () (const EDGETYPE & e, const Point3<SCALARTYPE> & p, SCALARTYPE & minDist, Point3<SCALARTYPE> & q) { inline bool operator () (const EDGETYPE & e, const Point3<SCALARTYPE> & p, SCALARTYPE & minDist, Point3<SCALARTYPE> & q) {
const Point3<typename EDGETYPE::ScalarType> fp = Point3<typename EDGETYPE::ScalarType>::Construct(p); const Point3<typename EDGETYPE::ScalarType> fp = Point3<typename EDGETYPE::ScalarType>::Construct(p);