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

Added standard heading comment to the newly added file.

This commit is contained in:
Paolo Cignoni 2013-11-28 23:39:45 +00:00
parent a5f46ed452
commit fd09d6fee2
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vcg/complex/algorithms/cylinder_clipping.h
View File

@ -1,3 +1,25 @@
/****************************************************************************
* VCGLib o o *
* Visual and Computer Graphics Library o o *
* _ O _ *
* Copyright(C) 2004 \/)\/ *
* Visual Computing Lab /\/| *
* ISTI - Italian National Research Council | *
* \ *
* All rights reserved. *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
* for more details. *
* *
****************************************************************************/
#ifndef CYLINDER_CLIP_H #ifndef CYLINDER_CLIP_H
#define CYLINDER_CLIP_H #define CYLINDER_CLIP_H
#include <vcg/space/segment3.h> #include <vcg/space/segment3.h>
@ -234,7 +256,7 @@ public:
// Now check also against the caps // Now check also against the caps
CoordType pt; CoordType pt;
if(IntersectionPlaneSegment(pl0,edgeSeg,pt)){ if(IntersectionPlaneSegment(pl0,edgeSeg,pt)){
if((Distance(pt,origin)<radius+1.0*minEdgeLen) && if((Distance(pt,origin)<radius+2.0*minEdgeLen) &&
(Distance(pt,p0)>eps) && (Distance(pt,p1)>eps) ) (Distance(pt,p0)>eps) && (Distance(pt,p1)>eps) )
{ {
newPtMap[std::make_pair(p0,p1)] = pt; newPtMap[std::make_pair(p0,p1)] = pt;
@ -242,7 +264,7 @@ public:
} }
} }
if(IntersectionPlaneSegment(pl1,edgeSeg,pt)){ if(IntersectionPlaneSegment(pl1,edgeSeg,pt)){
if( (Distance(pt,end)<radius+1.0*minEdgeLen) && if( (Distance(pt,end)<radius+2.0*minEdgeLen) &&
(Distance(pt,p0)>eps) && (Distance(pt,p1)>eps) ) (Distance(pt,p0)>eps) && (Distance(pt,p1)>eps) )
{ {
newPtMap[std::make_pair(p0,p1)] = pt; newPtMap[std::make_pair(p0,p1)] = pt;