diff --git a/wrap/io_trimesh/util_dae.h b/wrap/io_trimesh/util_dae.h index 74fd95f0..815f4037 100644 --- a/wrap/io_trimesh/util_dae.h +++ b/wrap/io_trimesh/util_dae.h @@ -24,10 +24,6 @@ #include #include -#ifndef CALLBACK -#define CALLBACK __stdcall -#endif - #include namespace vcg { @@ -168,7 +164,7 @@ namespace io { std::vector vert; std::vector _pols; - void generatePointsVector(std::vector>& v) + void generatePointsVector(std::vector >& v) { for(PolygonalMesh::PolygonIterator itp = _pols.begin();itp != _pols.end();++itp) { @@ -193,10 +189,10 @@ namespace io { } } - template + template void triangulate(TRIMESH& mesh) { - std::vector> pl; + std::vector > pl; mesh.vert.resize(vert.size()); //PolygonalMesh's points been copied in TriangularMesh @@ -213,7 +209,7 @@ namespace io { for(size_t ii = 0;ii < pl.size();++ii) { std::vector tx; - std::vector> pl2(1); + std::vector > pl2(1); pl2[0] = pl[ii]; vcg::glu_tesselator::tesselate(pl2,tx); @@ -223,7 +219,7 @@ namespace io { //foreach triangle for(size_t tr = 0;tr < ntri;++tr) { - TRIMESH::FaceType f; + typename TRIMESH::FaceType f; for(unsigned int tt = 0;tt < 3; ++tt) f.V(tt) = &(mesh.vert[_pols[ii]._pv[tx[3 * tr + tt]] - &(vert[0])]); mesh.face.push_back(f);