diff --git a/vcg/complex/algorithms/bitquad_support.h b/vcg/complex/algorithms/bitquad_support.h index 553dc127..202f25aa 100644 --- a/vcg/complex/algorithms/bitquad_support.h +++ b/vcg/complex/algorithms/bitquad_support.h @@ -2,7 +2,6 @@ #define VCG_BITQUAD_SUPPORT #include #include -#include #include #include #include diff --git a/vcg/complex/algorithms/intersection.h b/vcg/complex/algorithms/intersection.h index 16b75e4b..6b47511f 100644 --- a/vcg/complex/algorithms/intersection.h +++ b/vcg/complex/algorithms/intersection.h @@ -27,11 +27,12 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include + #ifndef __VCGLIB_INTERSECTION_TRI_MESH #define __VCGLIB_INTERSECTION_TRI_MESH @@ -329,13 +330,13 @@ void IntersectionBallMesh( TriMeshType & m, const vcg::Sphere3 &bal std::pair info; if(tol == 0) tol = M_PI * ball.Radius() * ball.Radius() / 100000; - + tri::UpdateSelection::FaceClear(m); for(fi = m.face.begin(); fi != m.face.end(); ++fi) if(!(*fi).IsD() && IntersectionSphereTriangle(ball ,(*fi), witness , &info)) - closests.push_back(&(*fi)); + (*fi).SetS(); res.Clear(); - SubSet(res,closests); + tri::Append::Selected(res,m); int i =0; while(i -#include #include #include