[Bf-blender-cvs] [eb8cc3f33dd] temp-lineart-contained: LineArt: rename tl, tr to t1, t2
YimingWu
noreply at git.blender.org
Thu Mar 18 10:49:00 CET 2021
Commit: eb8cc3f33dd9dab935e1ce31acaf76d318c2b9c5
Author: YimingWu
Date: Thu Mar 18 17:45:49 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBeb8cc3f33dd9dab935e1ce31acaf76d318c2b9c5
LineArt: rename tl,tr to t1,t2
===================================================================
M source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
M source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
index 899d64724ce..97f4459072f 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
+++ b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
@@ -142,7 +142,7 @@ typedef struct LineartEdge {
/* Local vertex index for two ends, not puting in RenderVert because all verts are loaded, so as
* long as fewer than half of the mesh edges are becoming a feature line, we save more memory. */
int v1_obindex, v2_obindex;
- struct LineartTriangle *tl, *tr;
+ struct LineartTriangle *t1, *t2;
ListBase segments;
char min_occ;
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
index 9e60090c4eb..fae5bcd7c2e 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
@@ -215,17 +215,17 @@ void MOD_lineart_chain_feature_lines(LineartRenderBuffer *rb)
LineartVert *new_rv;
float N[3] = {0};
- if (e->tl) {
- N[0] += e->tl->gn[0];
- N[1] += e->tl->gn[1];
- N[2] += e->tl->gn[2];
+ if (e->t1) {
+ N[0] += e->t1->gn[0];
+ N[1] += e->t1->gn[1];
+ N[2] += e->t1->gn[2];
}
- if (e->tr) {
- N[0] += e->tr->gn[0];
- N[1] += e->tr->gn[1];
- N[2] += e->tr->gn[2];
+ if (e->t2) {
+ N[0] += e->t2->gn[0];
+ N[1] += e->t2->gn[1];
+ N[2] += e->t2->gn[2];
}
- if (e->tl || e->tr) {
+ if (e->t1 || e->t2) {
normalize_v3(N);
}
@@ -246,17 +246,17 @@ void MOD_lineart_chain_feature_lines(LineartRenderBuffer *rb)
while (ba && (new_e = lineart_line_get_connected(ba, new_rv, &new_rv, e->flags))) {
new_e->flags |= LRT_EDGE_FLAG_CHAIN_PICKED;
- if (new_e->tl || new_e->tr) {
+ if (new_e->t1 || new_e->t2) {
zero_v3(N);
- if (new_e->tl) {
- N[0] += new_e->tl->gn[0];
- N[1] += new_e->tl->gn[1];
- N[2] += new_e->tl->gn[2];
+ if (new_e->t1) {
+ N[0] += new_e->t1->gn[0];
+ N[1] += new_e->t1->gn[1];
+ N[2] += new_e->t1->gn[2];
}
- if (new_e->tr) {
- N[0] += new_e->tr->gn[0];
- N[1] += new_e->tr->gn[1];
- N[2] += new_e->tr->gn[2];
+ if (new_e->t2) {
+ N[0] += new_e->t2->gn[0];
+ N[1] += new_e->t2->gn[1];
+ N[2] += new_e->t2->gn[2];
}
normalize_v3(N);
}
@@ -321,17 +321,17 @@ void MOD_lineart_chain_feature_lines(LineartRenderBuffer *rb)
}
/* Restore normal value. */
- if (e->tl || e->tr) {
+ if (e->t1 || e->t2) {
zero_v3(N);
- if (e->tl) {
- N[0] += e->tl->gn[0];
- N[1] += e->tl->gn[1];
- N[2] += e->tl->gn[2];
+ if (e->t1) {
+ N[0] += e->t1->gn[0];
+ N[1] += e->t1->gn[1];
+ N[2] += e->t1->gn[2];
}
- if (e->tr) {
- N[0] += e->tr->gn[0];
- N[1] += e->tr->gn[1];
- N[2] += e->tr->gn[2];
+ if (e->t2) {
+ N[0] += e->t2->gn[0];
+ N[1] += e->t2->gn[1];
+ N[2] += e->t2->gn[2];
}
normalize_v3(N);
}
@@ -376,17 +376,17 @@ void MOD_lineart_chain_feature_lines(LineartRenderBuffer *rb)
while (ba && (new_e = lineart_line_get_connected(ba, new_rv, &new_rv, e->flags))) {
new_e->flags |= LRT_EDGE_FLAG_CHAIN_PICKED;
- if (new_e->tl || new_e->tr) {
+ if (new_e->t1 || new_e->t2) {
zero_v3(N);
- if (new_e->tl) {
- N[0] += new_e->tl->gn[0];
- N[1] += new_e->tl->gn[1];
- N[2] += new_e->tl->gn[2];
+ if (new_e->t1) {
+ N[0] += new_e->t1->gn[0];
+ N[1] += new_e->t1->gn[1];
+ N[2] += new_e->t1->gn[2];
}
- if (new_e->tr) {
- N[0] += new_e->tr->gn[0];
- N[1] += new_e->tr->gn[1];
- N[2] += new_e->tr->gn[2];
+ if (new_e->t2) {
+ N[0] += new_e->t2->gn[0];
+ N[1] += new_e->t2->gn[1];
+ N[2] += new_e->t2->gn[2];
}
normalize_v3(N);
}
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 99abc18a5c0..41b269c836d 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -774,16 +774,16 @@ static void lineart_triangle_cull_single(LineartRenderBuffer *rb,
e->v2 = (v2_link); \
e->flags = new_flag; \
e->object_ref = ob; \
- e->tl = ((old_e->tl == rt) ? (newrt) : (old_e->tl)); \
- e->tr = ((old_e->tr == rt) ? (newrt) : (old_e->tr)); \
+ e->t1 = ((old_e->t1 == rt) ? (newrt) : (old_e->t1)); \
+ e->t2 = ((old_e->t2 == rt) ? (newrt) : (old_e->t2)); \
lineart_add_edge_to_list(rb, e); \
}
#define RELINK_RL(e_num, newrt) \
if (rta->e[e_num]) { \
old_e = rta->e[e_num]; \
- old_e->tl = ((old_e->tl == rt) ? (newrt) : (old_e->tl)); \
- old_e->tr = ((old_e->tr == rt) ? (newrt) : (old_e->tr)); \
+ old_e->t1 = ((old_e->t1 == rt) ? (newrt) : (old_e->t1)); \
+ old_e->t2 = ((old_e->t2 == rt) ? (newrt) : (old_e->t2)); \
}
#define REMOVE_TRIANGLE_RL \
@@ -865,7 +865,7 @@ static void lineart_triangle_cull_single(LineartRenderBuffer *rb,
e->v2 = &rv[0];
/* Only one adjacent triangle, because the other side is the near plane. */
/* Use tl or tr doesn't matter. */
- e->tl = rt1;
+ e->t1 = rt1;
e->object_ref = ob;
/* New line connecting original point 0 and a new point, only when it's a selected line. */
@@ -909,7 +909,7 @@ static void lineart_triangle_cull_single(LineartRenderBuffer *rb,
}
e->v1 = &rv[0];
e->v2 = &rv[1];
- e->tl = rt1;
+ e->t1 = rt1;
e->object_ref = ob;
SELECT_RL(2, rt->v[2], &rv[0], rt1)
@@ -950,7 +950,7 @@ static void lineart_triangle_cull_single(LineartRenderBuffer *rb,
}
e->v1 = &rv[1];
e->v2 = &rv[0];
- e->tl = rt1;
+ e->t1 = rt1;
e->object_ref = ob;
SELECT_RL(1, rt->v[1], &rv[0], rt1)
@@ -1022,7 +1022,7 @@ static void lineart_triangle_cull_single(LineartRenderBuffer *rb,
}
e->v1 = &rv[1];
e->v2 = &rv[0];
- e->tl = rt1;
+ e->t1 = rt1;
e->object_ref = ob;
/* New line connects new point 0 and old point 1,
@@ -1075,7 +1075,7 @@ static void lineart_triangle_cull_single(LineartRenderBuffer *rb,
}
e->v1 = &rv[1];
e->v2 = &rv[0];
- e->tl = rt1;
+ e->t1 = rt1;
e->object_ref = ob;
SELECT_RL(1, rt->v[2], &rv[0], rt1)
@@ -1123,7 +1123,7 @@ static void lineart_triangle_cull_single(LineartRenderBuffer *rb,
}
e->v1 = &rv[1];
e->v2 = &rv[0];
- e->tl = rt1;
+ e->t1 = rt1;
e->object_ref = ob;
SELECT_RL(2, rt->v[0], &rv[0], rt1)
@@ -1691,12 +1691,12 @@ static void lineart_geometry_object_load(Depsgraph *dg,
la_e->v2_obindex = la_e->v2->index - global_i;
if (e->l) {
int findex = BM_elem_index_get(e->l->f);
- la_e->tl = lineart_triangle_from_index(rb, ort, findex);
- lineart_triangle_adjacent_assign(la_e->tl, &orta[findex], la_e);
+ la_e->t1 = lineart_triangle_from_index(rb, ort, findex);
+ lineart_triangle_adjacent_assign(la_e->t1, &orta[findex], la_e);
if (e->l->radial_next && e->l->radial_next != e->l) {
findex = BM_elem_index_get(e->l->radial_next->f);
- la_e->tr = lineart_triangle_from_index(rb, ort, findex);
- lineart_triangle_adjacent_assign(la_e->tr, &orta[findex], la_e);
+ la_e->t2 = lineart_triangle_from_index(rb, ort, findex);
+ lineart_triangle_adjacent_assign(la_e->t2, &orta[findex], la_e);
}
}
la_e->flags = e->head.hflag;
@@ -1880,7 +1880,7 @@ static bool lineart_edge_from_triangle(const LineartTriangle *rt,
bool allow_overlapping_edges)
{
/* Normally we just determine from the pointer address. */
- if (e->tl == rt || e->tr == rt) {
+ if (e->t1 == rt || e->t2 == rt) {
return true;
}
/* If allows overlapping, then we compare the vertex coordinates one by one to determine if one
@@ -2459,8 +2459,8 @@ static LineartEdge *lineart_triangle_intersect(LineartRenderBuffer *rb,
result = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartEdge));
result->v1 = v1;
result->v2 = v2;
- result->tl = rt;
- result->tr = testing;
+ result->t1 = rt;
+ result->t2 = testing;
LineartLineSegment *rls = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartLineSegment));
BLI_addtail(&result->segments, rls);
More information about the Bf-blender-cvs
mailing list