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

Removed inclusion of subset.h

This commit is contained in:
Paolo Cignoni 2012-10-23 23:41:41 +00:00
parent 864f9cb9d7
commit 84b9387264
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vcg/complex/algorithms/bitquad_support.h
View File

@ -2,7 +2,6 @@
#define VCG_BITQUAD_SUPPORT #define VCG_BITQUAD_SUPPORT
#include <vector> #include <vector>
#include <set> #include <set>
#include <vcg/complex/algorithms/subset.h>
#include <vcg/simplex/face/jumping_pos.h> #include <vcg/simplex/face/jumping_pos.h>
#include <vcg/simplex/face/topology.h> #include <vcg/simplex/face/topology.h>
#include <vcg/space/planar_polygon_tessellation.h> #include <vcg/space/planar_polygon_tessellation.h>

13
vcg/complex/algorithms/intersection.h
View File

@ -27,11 +27,12 @@
#include<vcg/space/plane3.h> #include<vcg/space/plane3.h>
#include<vcg/space/segment3.h> #include<vcg/space/segment3.h>
#include<vcg/space/intersection3.h> #include<vcg/space/intersection3.h>
#include<vcg/complex/allocate.h> #include<vcg/complex/complex.h>
#include<vcg/complex/algorithms/subset.h> #include<vcg/complex/append.h>
#include<vcg/complex/algorithms/closest.h> #include<vcg/complex/algorithms/closest.h>
#include<vcg/complex/algorithms/update/quality.h> #include<vcg/complex/algorithms/update/quality.h>
#include<vcg/complex/complex.h> #include<vcg/complex/algorithms/update/selection.h>
#ifndef __VCGLIB_INTERSECTION_TRI_MESH #ifndef __VCGLIB_INTERSECTION_TRI_MESH
#define __VCGLIB_INTERSECTION_TRI_MESH #define __VCGLIB_INTERSECTION_TRI_MESH
@ -329,13 +330,13 @@ void IntersectionBallMesh( TriMeshType & m, const vcg::Sphere3<ScalarType> &bal
std::pair<ScalarType, ScalarType> info; std::pair<ScalarType, ScalarType> info;
if(tol == 0) tol = M_PI * ball.Radius() * ball.Radius() / 100000; if(tol == 0) tol = M_PI * ball.Radius() * ball.Radius() / 100000;
tri::UpdateSelection<TriMeshType>::FaceClear(m);
for(fi = m.face.begin(); fi != m.face.end(); ++fi) for(fi = m.face.begin(); fi != m.face.end(); ++fi)
if(!(*fi).IsD() && IntersectionSphereTriangle<ScalarType>(ball ,(*fi), witness , &info)) if(!(*fi).IsD() && IntersectionSphereTriangle<ScalarType>(ball ,(*fi), witness , &info))
closests.push_back(&(*fi)); (*fi).SetS();
res.Clear(); res.Clear();
SubSet(res,closests); tri::Append<TriMeshType,TriMeshType>::Selected(res,m);
int i =0; int i =0;
while(i<res.fn){ while(i<res.fn){
bool allIn = ( ball.IsIn(res.face[i].P(0)) && ball.IsIn(res.face[i].P(1))&&ball.IsIn(res.face[i].P(2))); bool allIn = ( ball.IsIn(res.face[i].P(0)) && ball.IsIn(res.face[i].P(1))&&ball.IsIn(res.face[i].P(2)));

1
vcg/complex/algorithms/polygon_support.h
View File

@ -25,7 +25,6 @@
#define __VCGLIB_POLYGON_SUPPORT #define __VCGLIB_POLYGON_SUPPORT
#include <vector> #include <vector>
#include <vcg/complex/algorithms/subset.h>
#include <vcg/simplex/face/jumping_pos.h> #include <vcg/simplex/face/jumping_pos.h>
#include <vcg/space/planar_polygon_tessellation.h> #include <vcg/space/planar_polygon_tessellation.h>