diff --git a/vcg/complex/algorithms/bitquad_support.h b/vcg/complex/algorithms/bitquad_support.h index 3e82b644..553dc127 100644 --- a/vcg/complex/algorithms/bitquad_support.h +++ b/vcg/complex/algorithms/bitquad_support.h @@ -204,7 +204,7 @@ static void FlipDiag(FaceType &f){ // given a vertex (i.e. a face and a wedge), -// this function tells us how the totale edge lenght around a vertex would change +// this function tells us how the totale edge length around a vertex would change // if that vertex is rotated static ScalarType EdgeLenghtVariationIfVertexRotated(const FaceType &f, int w0) { @@ -239,7 +239,7 @@ static ScalarType EdgeLenghtVariationIfVertexRotated(const FaceType &f, int w0) } // given a vertex (i.e. a face and a wedge), -// this function tells us how the totale edge lenght around a vertex would change +// this function tells us how the totale edge length around a vertex would change // if that vertex is rotated static ScalarType QuadQualityVariationIfVertexRotated(const FaceType &f, int w0) { diff --git a/vcg/complex/algorithms/clustering.h b/vcg/complex/algorithms/clustering.h index 642b3efb..b1c396cc 100644 --- a/vcg/complex/algorithms/clustering.h +++ b/vcg/complex/algorithms/clustering.h @@ -270,13 +270,13 @@ class Clustering // The init function Take two parameters // _size is the approximate total number of cells composing the grid surrounding the objects (usually a large number) // eg _size==1.000.000 means a 100x100x100 grid - // _cellsize is the absolute lenght of the edge of the grid cell. + // _cellsize is the absolute length of the edge of the grid cell. // eg _cellsize==2.0 means that all the vertexes in a 2.0x2.0x2.0 cell are clustered togheter // Notes: // _size is used only if the cell edge IS zero. // _cellsize gives you an absolute measure of the maximum error introduced - // during the simplification (e.g. half of the cell edge lenght) + // during the simplification (e.g. half of the cell edge length) void Init(Box3 _mbb, int _size, ScalarType _cellsize=0) diff --git a/vcg/space/intersection2.h b/vcg/space/intersection2.h index 366287d0..dc108045 100644 --- a/vcg/space/intersection2.h +++ b/vcg/space/intersection2.h @@ -130,11 +130,11 @@ namespace vcg { if(!RayLineIntersection(line2,r,p_inters)) return false; ///then test if intersection point is nearest - ///to both extremes then lenght of the segment + ///to both extremes then length of the segment SCALAR_TYPE d0=(seg.P1()-p_inters).Norm(); SCALAR_TYPE d1=(seg.P0()-p_inters).Norm(); - SCALAR_TYPE lenght=(seg.P0()-seg.P1()).Norm(); - return ((d0 & seg, //first set both directions of ray vcg::Line3 line; vcg::Point3 dir; - ScalarType lenght=seg.Length(); + ScalarType length=seg.Length(); dir=(seg.P1()-seg.P0()); dir.Normalize(); line.Set(seg.P0(),dir); ScalarType orig_dist; if(IntersectionLineTriangle(line,vert0,vert1,vert2,orig_dist,a,b)) - return (orig_dist<=lenght); + return (orig_dist<=length); return false; } /** diff --git a/vcg/space/segment3.h b/vcg/space/segment3.h index 57f258a0..de550aee 100644 --- a/vcg/space/segment3.h +++ b/vcg/space/segment3.h @@ -127,7 +127,7 @@ public: /// returns segment length ScalarType Length() const { return (_p0 - _p1).Norm(); } - /// return segment squared lenght + /// return segment squared length ScalarType SquaredLength() const { return (_p0 - _p1).SquaredNorm(); } /// flips: a-b becomes b-a