Cleanup: clang-format, spelling

This commit is contained in:
Campbell Barton 2019-08-30 10:52:39 +10:00
parent 2fca31a5d6
commit a771fdb5dc
6 changed files with 24 additions and 11 deletions

View File

@ -91,7 +91,7 @@ int DiagSplit::T(Patch *patch, float2 Pstart, float2 Pend, bool recursive_resolv
int tmin = (int)ceilf(Lsum / params.dicing_rate);
int tmax = (int)ceilf((params.test_steps - 1) * Lmax /
params.dicing_rate); // XXX paper says N instead of N-1, seems wrong?
params.dicing_rate); // XXX paper says N instead of N-1, seems wrong?
int res = max(tmax, 1);
if (tmax - tmin > params.split_threshold) {

View File

@ -44,7 +44,7 @@ class DiagSplit {
deque<Edge> edges;
float3 to_world(Patch *patch, float2 uv);
int T(Patch *patch, float2 Pstart, float2 Pend, bool recursive_resolve=false);
int T(Patch *patch, float2 Pstart, float2 Pend, bool recursive_resolve = false);
void limit_edge_factor(int &T, Patch *patch, float2 Pstart, float2 Pend);
void resolve_edge_factors(Subpatch &sub);

View File

@ -128,21 +128,30 @@ class Subpatch {
};
struct Edge {
int T; /* Number of segments the edge will be diced into, see DiagSplit paper. */
/* Number of segments the edge will be diced into, see DiagSplit paper. */
int T;
/* top is edge adjacent to start, bottom is adjacent to end. */
Edge *top, *bottom;
Edge *top, *bottom; /* top is edge adjacent to start, bottom is adjacent to end. */
int top_offset, bottom_offset;
bool top_indices_decrease, bottom_indices_decrease;
int start_vert_index;
int end_vert_index;
int second_vert_index; /* Index of the second vert from this edges corner along the edge towards the next corner */
bool is_stitch_edge; /* Verties on edge are to be stitched. */
/* Key to match this edge with others to be stitched with. The ints in the pair are ordered stitching indices */
/* Index of the second vert from this edges corner along the edge towards the next corner. */
int second_vert_index;
/* Vertices on edge are to be stitched. */
bool is_stitch_edge;
/* Key to match this edge with others to be stitched with.
* The ints in the pair are ordered stitching indices */
pair<int, int> stitch_edge_key;
int stitch_edge_T; /* Full T along edge (may be larger than T for edges split from ngon edges) */
/* Full T along edge (may be larger than T for edges split from ngon edges) */
int stitch_edge_T;
int stitch_offset;
int stitch_top_offset;
int stitch_start_vert_index;

View File

@ -1363,7 +1363,7 @@ bool isect_seg_seg_v2_simple(const float v1[2],
* \returns intersection type:
* - ISECT_LINE_LINE_COLINEAR: collinear.
* - ISECT_LINE_LINE_EXACT: intersection at an endpoint of either.
* - ISECT_LINE_LINE_CROSS: interection, not at an endpoint.
* - ISECT_LINE_LINE_CROSS: interaction, not at an endpoint.
* - ISECT_LINE_LINE_NONE: no intersection.
* Also returns lambda and mu in r_lambda and r_mu.
*/

View File

@ -172,7 +172,7 @@ static bool isDisabled(GpencilModifierData *md, int UNUSED(userRenderParams))
/* The object type check is only needed here in case we have a placeholder
* object assigned (because the library containing the lattice is missing).
*
* In other cases it should be impossible to have a type missmatch.
* In other cases it should be impossible to have a type mismatch.
*/
return !mmd->object || mmd->object->type != OB_LATTICE;
}

View File

@ -1319,7 +1319,11 @@ static void rna_def_field(BlenderRNA *brna)
ICON_FORCE_CURVE,
"Curve Guide",
"Create a force along a curve object"},
{PFIELD_BOID, "BOID", ICON_FORCE_BOID, "Boid", "Create a force that acts as a boid's predators or target"},
{PFIELD_BOID,
"BOID",
ICON_FORCE_BOID,
"Boid",
"Create a force that acts as a boid's predators or target"},
{PFIELD_TURBULENCE,
"TURBULENCE",
ICON_FORCE_TURBULENCE,