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

some std::and typename missing (CRS4)

This commit is contained in:
ganovelli 2005-05-17 21:19:37 +00:00
parent 145b8a757c
commit 973c48fb76
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.4 2004/10/28 00:47:42 cignoni
Better Doxygen documentation
Revision 1.3 2004/09/20 09:30:03 cignoni Revision 1.3 2004/09/20 09:30:03 cignoni
Better Doxygen docs Better Doxygen docs
@ -86,8 +89,8 @@ class EdgeMesh{
Box3<ScalarType> bbox; Box3<ScalarType> bbox;
/// Nomi di textures /// Nomi di textures
//vector<string> textures; //std::vector<string> textures;
//vector<string> normalmaps; //std::vector<string> normalmaps;
/// La camera /// La camera
//Camera<ScalarType> camera; //Camera<ScalarType> camera;

13
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.2 2005/03/08 14:42:22 ganovelli
added vcg header
****************************************************************************/ ****************************************************************************/
@ -33,7 +36,7 @@ $Log: not supported by cvs2svn $
#include <vcg/space/index/grid_static_ptr.h> #include <vcg/space/index/grid_static_ptr.h>
#include <vcg/space/box3.h> #include <vcg/space/box3.h>
#include <vcg/complex/edgemesh/update/bounding.h> #include <vcg/complex/edgemesh/update/bounding.h>
#include <vector> #include <std::vector>
namespace vcg namespace vcg
{ {
@ -74,7 +77,7 @@ namespace vcg
return v->IsD(); return v->IsD();
} }
}; };
typedef typename GridStaticPtr< std::vector<PVertex> > GridType; typedef typename GridStaticPtr< std::std::vector<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;
@ -84,19 +87,19 @@ namespace vcg
static GridType & Grid(){static GridType grid; return grid; } static GridType & Grid(){static GridType grid; return grid; }
static void Vertices(EdgeMeshType & em, ScalarType epsilon){ static void Vertices(EdgeMeshType & em, ScalarType epsilon){
EdgeMeshType::EdgeIterator ei; typename EdgeMeshType::EdgeIterator ei;
bool lastRound ; bool lastRound ;
if(em.vn){ if(em.vn){
vcg::edge::UpdateBounding<EdgeMeshType>::Box(em); vcg::edge::UpdateBounding<EdgeMeshType>::Box(em);
Grid().SetBBox(em.bbox); Grid().SetBBox(em.bbox);
vector<PVertex> pv; std::vector<PVertex> pv;
for(ei = em.edges.begin(); ei != em.edges.end();++ei){ for(ei = em.edges.begin(); ei != em.edges.end();++ei){
pv.push_back(PVertex(&*ei,0)); pv.push_back(PVertex(&*ei,0));
pv.push_back(PVertex(&*ei,1)); pv.push_back(PVertex(&*ei,1));
} }
Grid().Set(pv); Grid().Set(pv);
vector<PVertex>::iterator pvi; typename std::vector<PVertex>::iterator pvi;
Point3<ScalarType> p; Point3<ScalarType> p;
PVertex * closest; PVertex * closest;
do{ do{