Commit: 665ffa5dca1455e5630debddb7962d93c41eded4
Author: Campbell Barton
Date: Thu Aug 27 18:53:02 2020 +1000
Branches: newboolean
https://developer.blender.org/rB665ffa5dca1455e5630debddb7962d93c41eded4
Cleanup: more spelling corrections
===================================================================
M source/blender/blenlib/BLI_math_mpq.hh
M source/blender/blenlib/intern/delaunay_2d.cc
M source/blender/blenlib/intern/math_vec.cc
M source/blender/blenlib/intern/mesh_boolean.cc
M source/blender/blenlib/intern/mesh_intersect.cc
===================================================================
diff --git a/source/blender/blenlib/BLI_math_mpq.hh
b/source/blender/blenlib/BLI_math_mpq.hh
index dd973bf9f64..3d8c6349187 100644
--- a/source/blender/blenlib/BLI_math_mpq.hh
+++ b/source/blender/blenlib/BLI_math_mpq.hh
@@ -22,9 +22,9 @@
#ifdef WITH_GMP
-/* This file uses an external file header to define the multiprecision
+/* This file uses an external file header to define the multi-precision
* rational type, mpq_class.
- * This class keeps separate multiprecision integer numerator and
+ * This class keeps separate multi-precision integer numerator and
* denominator, reduced to lowest terms after each arithmetic operation.
* It can be used where it is important to have exact arithmetic results.
*
diff --git a/source/blender/blenlib/intern/delaunay_2d.cc
b/source/blender/blenlib/intern/delaunay_2d.cc
index 69c453f1dd9..9bc81d2cbb6 100644
--- a/source/blender/blenlib/intern/delaunay_2d.cc
+++ b/source/blender/blenlib/intern/delaunay_2d.cc
@@ -934,8 +934,9 @@ template<typename T> bool site_lexicographic_sort(const
SiteInfo<T> &a, const Si
return a.orig_index < b.orig_index;
}
-/* Find series of equal vertices in the sorted sites array
- * and use the vertice's merge_to_index to indicate that
+/**
+ * Find series of equal vertices in the sorted sites array
+ * and use the vertices merge_to_index to indicate that
* all vertices after the first merge to the first.
*/
template<typename T> void find_site_merges(Array<SiteInfo<T>> &sites)
@@ -973,7 +974,7 @@ inline bool dc_tri_valid(SymEdge<T> *se, SymEdge<T> *basel,
SymEdge<T> *basel_sy
/**
* Delaunay triangulate sites[start} to sites[end-1].
* Assume sites are lexicographically sorted by coordinate.
- * Return #SymEdge of ccw convex hull at left-most point in *r_le
+ * Return #SymEdge of CCW convex hull at left-most point in *r_le
* and that of right-most point of cw convex null in *r_re.
*/
template<typename T>
@@ -1208,7 +1209,7 @@ template<typename T> void
dc_triangulate(CDTArrangement<T> *cdt, Array<SiteInfo<
* and the Computation of Voronoi Diagrams" paper.
* The data structure here is similar to but not exactly the same as
* the quad-edge structure described in that paper.
- * If T is not exact arithmetic, incircle and ccw tests are done using
+ * If T is not exact arithmetic, incircle and CCW tests are done using
* Shewchuk's exact primitives, so that this routine is robust.
*
* As a preprocessing step, we want to merge all vertices that the same.
@@ -2051,7 +2052,9 @@ template<typename T> void
remove_non_constraint_edges(CDT_state<T> *cdt_state)
* direct path from an outer face to an inner hole face.
*/
-/* For sorting edges by decreasing length (squared). */
+/**
+ * For sorting edges by decreasing length (squared).
+ */
template<typename T> struct EdgeToSort {
T len_squared = T(0);
CDTEdge<T> *e{nullptr};
@@ -2113,9 +2116,8 @@ template<typename T> void
remove_non_constraint_edges_leave_valid_bmesh(CDT_stat
CDTFace<T> *fright = sym(se)->face;
if (fleft != cdt->outer_face && fright != cdt->outer_face &&
(fleft->input_ids != nullptr || fright->input_ids != nullptr)) {
- /* Is there another symedge with same left and right faces?
- * Or is there a vertex not part of e touching the same left and right
faces?
- */
+ /* Is there another #SymEdge with same left and right faces?
+ * Or is there a vertex not part of e touching the same left and right
faces? */
for (SymEdge<T> *se2 = se->next; dissolve && se2 != se; se2 = se2->next)
{
if (sym(se2)->face == fright ||
(se2->vert != se->next->vert && vert_touches_face(se2->vert,
fright))) {
@@ -2231,8 +2233,7 @@ CDT_result<T> get_cdt_output(CDT_state<T> *cdt_state,
/* All verts without a merge_to_index will be output.
* vert_to_output_map[i] will hold the output vertex index
* corresponding to the vert in position i in cdt->verts.
- * This first loop sets vert_to_output_map for unmerged verts.
- */
+ * This first loop sets vert_to_output_map for un-merged verts. */
int verts_size = cdt->verts.size();
Array<int> vert_to_output_map(verts_size);
int nv = 0;
@@ -2248,8 +2249,7 @@ CDT_result<T> get_cdt_output(CDT_state<T> *cdt_state,
}
/* Now we can set vert_to_output_map for merged verts,
* and also add the input indices of merged verts to the input_ids
- * list of the merge target if they were an original input id.
- */
+ * list of the merge target if they were an original input id. */
if (nv < verts_size) {
for (int i = 0; i < verts_size; ++i) {
CDTVert<T> *v = cdt->verts[i];
@@ -2322,7 +2322,9 @@ CDT_result<T> get_cdt_output(CDT_state<T> *cdt_state,
return result;
}
-/* Add all the input verts into cdt. This will dedup, setting vert's
merge_to_index to show merges.
+/**
+ * Add all the input verts into cdt. This will deduplicate,
+ * setting vertices merge_to_index to show merges.
*/
template<typename T> void add_input_verts(CDT_state<T> *cdt_state, const
CDT_input<T> &input)
{
diff --git a/source/blender/blenlib/intern/math_vec.cc
b/source/blender/blenlib/intern/math_vec.cc
index 1194f3ed30e..86905a03480 100644
--- a/source/blender/blenlib/intern/math_vec.cc
+++ b/source/blender/blenlib/intern/math_vec.cc
@@ -373,7 +373,7 @@ static RobustInitCaller init_caller;
* reference. Each of these macros requires certain variables to be
* defined in the calling routine. The variables `bvirt', `c', `abig',
* `_i', `_j', `_k', `_l', `_m', and `_n' are declared `INEXACT' because
- * they store the result of an operation that may incur roundoff error.
+ * they store the result of an operation that may incur round-off error.
* The input parameter `x' (or the highest numbered `x_' parameter) must
* also be declared `INEXACT'.
*/
@@ -578,8 +578,8 @@ static RobustInitCaller init_caller;
Two_Two_Sum(_j, _1, _l, _2, x5, x4, x3, x2)
static double splitter; /* = 2^ceiling(p / 2) + 1. Used to split floats in
half. */
-static double epsilon; /* = 2^(-p). Used to estimate roundoff errors. */
-/* A set of coefficients used to calculate maximum roundoff errors. */
+static double epsilon; /* = 2^(-p). Used to estimate round-off errors. */
+/* A set of coefficients used to calculate maximum round-off errors. */
static double resulterrbound;
static double ccwerrboundA, ccwerrboundB, ccwerrboundC;
static double o3derrboundA, o3derrboundB, o3derrboundC;
@@ -785,7 +785,7 @@ static double estimate(int elen, const double *e)
}
/**
- * orient2dfast() Approximate 2D orientation test. Nonrobust.
+ * orient2dfast() Approximate 2D orientation test. Non-robust.
* orient2d() Adaptive exact 2D orientation test. Robust.
* Return a positive value if the points pa, pb, and pc occur
* in counterclockwise order; a negative value if they occur
@@ -1438,12 +1438,12 @@ double orient3d(const double *pa, const double *pb,
const double *pc, const doub
}
/**
- * incirclefast() Approximate 2D incircle test. Nonrobust.
+ * incirclefast() Approximate 2D incircle test. Non-robust.
* incircle()
*
* Return a positive value if the point pd lies inside the
* circle passing through pa, pb, and pc; a negative value if
- * it lies outside; and zero if the four points are cocircular.
+ * it lies outside; and zero if the four points are co-circular.
* The points pa, pb, and pc must be in counterclockwise
* order, or the sign of the result will be reversed.
*
@@ -1452,7 +1452,7 @@ double orient3d(const double *pa, const double *pb, const
double *pc, const doub
* this determinant is computed adaptively, in the sense that exact
* arithmetic is used only to the degree it is needed to ensure that the
* returned value has the correct sign. Hence, incircle() is usually quite
- * fast, but will run more slowly when the input points are cocircular or
+ * fast, but will run more slowly when the input points are co-circular or
* nearly so.
*/
@@ -2047,13 +2047,13 @@ double incircle(const double *pa, const double *pb,
const double *pc, const doub
}
/**
- * inspherefast() Approximate 3D insphere test. Nonrobust.
+ * inspherefast() Approximate 3D insphere test. Non-robust.
* insphere() Adaptive exact 3D insphere test. Robust.
*
* Return a positive value if the point pe lies inside the
* sphere passing through pa, pb, pc, and pd; a negative value
* if it lies outside; and zero if the five points are
- * cospherical. The points pa, pb, pc, and pd must be ordered
+ * co-spherical. The points pa, pb, pc, and pd must be ordered
* so that they have a positive orientation (as defined by
* orient3d()), or the sign of the result will be reversed.
*
@@ -2062,7 +2062,7 @@ double incircle(const double *pa, const double *pb, const
double *pc, const doub
* this determinant is computed adaptively, in the sense that exact
* arithmetic is used only to the degree it is needed to ensure that the
* returned value has the correct sign. Hence, insphere() is usually quite
- * fast, but will run more slowly when the input points are cospherical or
+ * fast, but will run more slowly when the input points are co-spherical or
* nearly so.
*/
diff --git a/source/blender/blenlib/intern/mesh_boolean.cc
b/source/blender/blenlib/intern/mesh_boolean.cc
index 2196680141a..a8fbb130a62 100644
--- a/source/blender/blenlib/intern/mesh_boolean.cc
+++ b/source/blender/blenlib/intern/mesh_boolean.cc
@@ -1473,7 +1473,7 @@ static int find_ambient_cell(const IMesh &tm,
/**
* We need an edge on the convex hull of the edges incident on \a closestp
* in order to sort around, including a dummy triangle that has \a testp and
- * the sorting edge vertices. So we don't want an edge that is co-llinear
+ * the sorting edge vertices. So we don't want an edge that is co-linear
* with the line through \a testp and \a closestp.
* The method is to project onto a plane that contains `testp-closestp`,
* and then choose the edge tha
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
