diff options
Diffstat (limited to 'source/blender/freestyle/intern/geometry/GeomCleaner.h')
| -rw-r--r-- | source/blender/freestyle/intern/geometry/GeomCleaner.h | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.h b/source/blender/freestyle/intern/geometry/GeomCleaner.h index 5fedf94b479..253d3553010 100644 --- a/source/blender/freestyle/intern/geometry/GeomCleaner.h +++ b/source/blender/freestyle/intern/geometry/GeomCleaner.h @@ -45,20 +45,24 @@ class GeomCleaner { /*! Sorts an array of Indexed vertices * iVertices - * Array of vertices to sort. It is organized as a float series of vertex coordinates: XYZXYZXYZ... + * Array of vertices to sort. + * It is organized as a float series of vertex coordinates: XYZXYZXYZ... * iVSize * The size of iVertices array. * iIndices - * The array containing the vertex indices (used to refer to the vertex coordinates in an indexed face). Each - * element is an unsignedeger multiple of 3. + * The array containing the vertex indices + * (used to refer to the vertex coordinates in an indexed face). + * Each element is an unsignedeger multiple of 3. * iISize * The size of iIndices array * oVertices - * Output of sorted vertices. A vertex v1 precedes another one v2 in this array if v1.x<v2.x, - * or v1.x=v2.x && v1.y < v2.y or v1.x=v2.y && v1.y=v2.y && v1.z < v2.z. + * Output of sorted vertices. + * A vertex v1 precedes another one v2 in this array + * if v1.x<v2.x, or v1.x=v2.x && v1.y < v2.y or v1.x=v2.y && v1.y=v2.y && v1.z < v2.z. * The array is organized as a 3-float serie giving the vertices coordinates: XYZXYZXYZ... * oIndices - * Output corresponding to the iIndices array but reorganized in order to match the sorted vertex array. + * Output corresponding to the iIndices array but reorganized in + * order to match the sorted vertex array. */ static void SortIndexedVertexArray(const float *iVertices, unsigned iVSize, @@ -67,13 +71,16 @@ class GeomCleaner { float **oVertices, unsigned **oIndices); - /*! Compress a SORTED indexed vertex array by eliminating multiple appearing occurences of a single vertex. + /*! Compress a SORTED indexed vertex array by eliminating multiple + * appearing occurences of a single vertex. * iVertices - * The SORTED vertex array to compress. It is organized as a float series of vertex coordinates: XYZXYZXYZ... + * The SORTED vertex array to compress. + * It is organized as a float series of vertex coordinates: XYZXYZXYZ... * iVSize * The size of iVertices array. * iIndices - * The array containing the vertex indices (used to refer to the vertex coordinates in an indexed face). + * The array containing the vertex indices + * (used to refer to the vertex coordinates in an indexed face). * Each element is an unsignedeger multiple of 3. * iISize * The size of iIndices array @@ -100,7 +107,8 @@ class GeomCleaner { * iVSize * The size of iVertices array. * iIndices - * The array containing the vertex indices (used to refer to the vertex coordinates in an indexed face). + * The array containing the vertex indices + * (used to refer to the vertex coordinates in an indexed face). * Each element is an unsignedeger multiple of 3. * iISize * The size of iIndices array @@ -120,15 +128,16 @@ class GeomCleaner { unsigned *oVSize, unsigned **oIndices); - /*! Cleans an indexed vertex array. (Identical to SortAndCompress except that we use here a hash table - * to create the new array.) + /*! Cleans an indexed vertex array. + * (Identical to SortAndCompress except that we use here a hash table to create the new array.) * iVertices * The vertex array to sort then compress. It is organized as a float series of * vertex coordinates: XYZXYZXYZ... * iVSize * The size of iVertices array. * iIndices - * The array containing the vertex indices (used to refer to the vertex coordinates in an indexed face). + * The array containing the vertex indices + * (used to refer to the vertex coordinates in an indexed face). * Each element is an unsignedeger multiple of 3. * iISize * The size of iIndices array @@ -154,9 +163,10 @@ class GeomCleaner { }; /*! Binary operators */ -//inline bool operator<(const IndexedVertex& iv1, const IndexedVertex& iv2); +// inline bool operator<(const IndexedVertex& iv1, const IndexedVertex& iv2); -/*! Class Indexed Vertex. Used to represent an indexed vertex by storing the vertex coordinates as well as its index */ +/*! Class Indexed Vertex. Used to represent an indexed vertex by storing the vertex coordinates as + * well as its index */ class IndexedVertex { private: Vec3f _Vector; @@ -223,7 +233,7 @@ class IndexedVertex { return _Vector[i]; } - //friend inline bool operator<(const IndexedVertex& iv1, const IndexedVertex& iv2); + // friend inline bool operator<(const IndexedVertex& iv1, const IndexedVertex& iv2); inline bool operator<(const IndexedVertex &v) const { return (_Vector < v._Vector); |