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

add std:: namespace...

This commit is contained in:
Paolo Cignoni 2006-01-19 14:06:37 +00:00
parent 3fc1eb7c2c
commit 56dbb91da2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcg/complex/intersection.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.7 2005/10/03 16:18:15 spinelli
add template parameter for spatialindexing struction
Revision 1.6 2005/05/30 09:11:20 ganovelli Revision 1.6 2005/05/30 09:11:20 ganovelli
header added, error in include header added, error in include
@ -37,6 +40,7 @@ added vcg header
****************************************************************************/ ****************************************************************************/
#include<vector> #include<vector>
#include <algorithm>
#include<vcg/space/point3.h> #include<vcg/space/point3.h>
#include<vcg/space/plane3.h> #include<vcg/space/plane3.h>
#include<vcg/space/segment3.h> #include<vcg/space/segment3.h>
@ -80,7 +84,7 @@ bool Intersect( GridType & grid,Plane3<ScalarType> plane, std::vector<typename
seg.P1()[axis1] = grid.bbox.min[axis1]+ (j+0.01) * grid.voxel[axis1]; seg.P1()[axis1] = grid.bbox.min[axis1]+ (j+0.01) * grid.voxel[axis1];
if ( Intersection(pl,seg,p)) if ( Intersection(pl,seg,p))
{ {
pi[axis] = min(max(0,(int)floor((p[axis ]-grid.bbox.min[axis])/grid.voxel[axis])),grid.siz[axis]); pi[axis] = std::min(std::max(0,(int)floor((p[axis ]-grid.bbox.min[axis])/grid.voxel[axis])),grid.siz[axis]);
pi[axis0] = i; pi[axis0] = i;
pi[axis1] = j; pi[axis1] = j;
grid.Grid(pi,axis,cells); grid.Grid(pi,axis,cells);