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

Small gcc compiling issues

This commit is contained in:
Paolo Cignoni 2007-05-31 10:08:16 +00:00
parent f354a9f445
commit e4aa42118a
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vcg/complex/edgemesh/unify.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.8 2005/10/03 16:16:54 spinelli
used new version of grid query
Revision 1.7 2005/09/19 13:10:12 spinelli Revision 1.7 2005/09/19 13:10:12 spinelli
fixed bugs fixed bugs
@ -106,7 +109,7 @@ namespace vcg
return v->IsD(); return v->IsD();
} }
}; };
typedef typename GridStaticPtr< PVertex > GridType; typedef GridStaticPtr< PVertex > GridType;
static void Join(PVertex pv0,PVertex & pv1){ static void Join(PVertex pv0,PVertex & pv1){
pv1.e->V(pv1.z) = pv0.v; pv1.e->V(pv1.z) = pv0.v;
@ -185,4 +188,4 @@ namespace vcg
} // end namespace } // end namespace
#endif #endif

24
vcg/complex/vertexmesh/closest.h
View File

@ -77,15 +77,15 @@ namespace vcg {
typename MESH::VertexType * GetClosestVertex( MESH & mesh,GRID & gr,const typename GRID::CoordType & _p, typename MESH::VertexType * GetClosestVertex( MESH & mesh,GRID & gr,const typename GRID::CoordType & _p,
const typename GRID::ScalarType & _maxDist,typename GRID::ScalarType & _minDist ) const typename GRID::ScalarType & _maxDist,typename GRID::ScalarType & _minDist )
{ {
typedef GRID::ScalarType ScalarType; typedef typename GRID::ScalarType ScalarType;
typedef Point3<ScalarType> Point3x; typedef Point3<ScalarType> Point3x;
typedef VertTmark<MESH> MarkerVert; typedef VertTmark<MESH> MarkerVert;
MarkerVert mv; MarkerVert mv;
mv.SetMesh(&mesh); mv.SetMesh(&mesh);
typedef vcg::vertex::PointDistanceFunctor VDistFunct; typedef PointDistanceFunctor VDistFunct;
_minDist=_maxDist; _minDist=_maxDist;
Point3x _closestPt; Point3x _closestPt;
return (gr.GetClosest<VDistFunct,MarkerVert>(VDistFunct(),mv,_p,_maxDist,_minDist,_closestPt)); return (gr.GetClosest(PointDistanceFunctor(),mv,_p,_maxDist,_minDist,_closestPt));
} }
@ -98,7 +98,7 @@ namespace vcg {
MarkerVert mv; MarkerVert mv;
mv.SetMesh(&mesh); mv.SetMesh(&mesh);
typedef vcg::vertex::PointDistanceFunctor VDistFunct; typedef vcg::vertex::PointDistanceFunctor VDistFunct;
return (gr.GetKClosest<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER> return (gr.GetKClosest/*<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
(VDistFunct(),mv,_k,_p,_maxDist,_objectPtrs,_distances,_points)); (VDistFunct(),mv,_k,_p,_maxDist,_objectPtrs,_distances,_points));
} }
@ -115,7 +115,7 @@ namespace vcg {
MarkerVert mv; MarkerVert mv;
mv.SetMesh(&mesh); mv.SetMesh(&mesh);
typedef vcg::vertex::PointDistanceFunctor VDistFunct; typedef vcg::vertex::PointDistanceFunctor VDistFunct;
return (gr.GetInSphere<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER> return (gr.GetInSphere/*<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
(VDistFunct(),mv,_p,_r,_objectPtrs,_distances,_points)); (VDistFunct(),mv,_p,_r,_objectPtrs,_distances,_points));
} }
@ -129,21 +129,21 @@ namespace vcg {
typedef VertTmark<MESH> MarkerVert; typedef VertTmark<MESH> MarkerVert;
MarkerVert mv; MarkerVert mv;
mv.SetMesh(&mesh); mv.SetMesh(&mesh);
return(gr.GetInBox<MarkerVert,OBJPTRCONTAINER>(mv,_bbox,_objectPtrs)); return(gr.GetInBox(mv,_bbox,_objectPtrs));
} }
//**ITERATORS DEFINITION**// //**ITERATORS DEFINITION**//
template <class GRID,class MESH> template <class GRID,class MESH>
class ClosestVertexIterator:public vcg::ClosestIterator<GRID,vcg::vertex::PointDistanceFunctor,typename VertTmark<MESH> > class ClosestVertexIterator:public vcg::ClosestIterator<GRID,vcg::vertex::PointDistanceFunctor, VertTmark<MESH> >
{ {
public: public:
typedef typename GRID GridType; typedef GRID GridType;
typedef typename MESH MeshType; typedef MESH MeshType;
typedef typename VertTmark<MESH> MarkerVert; typedef VertTmark<MESH> MarkerVert;
typedef typename vcg::vertex::PointDistanceFunctor VDistFunct; typedef vcg::vertex::PointDistanceFunctor VDistFunct;
typedef typename vcg::ClosestIterator<GRID,VDistFunct,typename VertTmark<MESH> > ClosestBaseType; typedef vcg::ClosestIterator<GRID,VDistFunct, VertTmark<MESH> > ClosestBaseType;
ClosestVertexIterator(GridType &_Si):ClosestBaseType(_Si,VDistFunct()){} ClosestVertexIterator(GridType &_Si):ClosestBaseType(_Si,VDistFunct()){}