[Bf-blender-cvs] [ac220268c8a] lanpr-under-gp: LineArt: cleanup function names.
YimingWu
noreply at git.blender.org
Mon Aug 3 15:41:36 CEST 2020
Commit: ac220268c8a73e7f5197ee50772d44169c52fad5
Author: YimingWu
Date: Mon Aug 3 21:41:15 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBac220268c8a73e7f5197ee50772d44169c52fad5
LineArt: cleanup function names.
===================================================================
M source/blender/editors/include/ED_lineart.h
M source/blender/editors/lineart/lineart_chain.c
M source/blender/editors/lineart/lineart_cpu.c
M source/blender/editors/lineart/lineart_intern.h
M source/blender/editors/lineart/lineart_util.c
===================================================================
diff --git a/source/blender/editors/include/ED_lineart.h b/source/blender/editors/include/ED_lineart.h
index 820fd8e6f2d..2124767bdf6 100644
--- a/source/blender/editors/include/ED_lineart.h
+++ b/source/blender/editors/include/ED_lineart.h
@@ -411,7 +411,7 @@ typedef struct LineartBoundingArea {
#define LRT_DOUBLE_CLOSE_ENOUGH(a, b) (((a) + DBL_EDGE_LIM) >= (b) && ((a)-DBL_EDGE_LIM) <= (b))
-BLI_INLINE double tmat_get_linear_ratio(double l, double r, double from_l);
+BLI_INLINE double lineart_get_linear_ratio(double l, double r, double from_l);
BLI_INLINE int lineart_LineIntersectTest2d(
const double *a1, const double *a2, const double *b1, const double *b2, double *aRatio)
{
@@ -427,14 +427,14 @@ BLI_INLINE int lineart_LineIntersectTest2d(
*aRatio = 0;
return 0;
}
- double r2 = tmat_get_linear_ratio(b1[0], b2[0], a1[0]);
+ double r2 = lineart_get_linear_ratio(b1[0], b2[0], a1[0]);
x = interpd(b2[0], b1[0], r2);
y = interpd(b2[1], b1[1], r2);
- *aRatio = ratio = tmat_get_linear_ratio(a1[1], a2[1], y);
+ *aRatio = ratio = lineart_get_linear_ratio(a1[1], a2[1], y);
}
else {
if (x_diff2 == 0) {
- ratio = tmat_get_linear_ratio(a1[0], a2[0], b1[0]);
+ ratio = lineart_get_linear_ratio(a1[0], a2[0], b1[0]);
x = interpd(a2[0], a1[0], ratio);
*aRatio = ratio;
}
@@ -466,7 +466,7 @@ BLI_INLINE int lineart_LineIntersectTest2d(
return 1;
}
-BLI_INLINE double tmat_get_linear_ratio(double l, double r, double from_l)
+BLI_INLINE double lineart_get_linear_ratio(double l, double r, double from_l)
{
double ra = (from_l - l) / (r - l);
return ra;
diff --git a/source/blender/editors/lineart/lineart_chain.c b/source/blender/editors/lineart/lineart_chain.c
index 21eda5c3d7b..b35f0b9b3d2 100644
--- a/source/blender/editors/lineart/lineart_chain.c
+++ b/source/blender/editors/lineart/lineart_chain.c
@@ -95,7 +95,7 @@ static LineartRenderLine *lineart_line_get_connected(LineartBoundingArea *ba,
static LineartRenderLineChain *lineart_chain_create(LineartRenderBuffer *rb)
{
LineartRenderLineChain *rlc;
- rlc = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineChain));
+ rlc = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartRenderLineChain));
BLI_addtail(&rb->chains, rlc);
@@ -139,7 +139,7 @@ static LineartRenderLineChainItem *lineart_chain_append_point(LineartRenderBuffe
return old_rlci;
}
- rlci = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineChainItem));
+ rlci = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartRenderLineChainItem));
rlci->pos[0] = x;
rlci->pos[1] = y;
@@ -173,7 +173,7 @@ static LineartRenderLineChainItem *lineart_chain_push_point(LineartRenderBuffer
return rlc->chain.first;
}
- rlci = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineChainItem));
+ rlci = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartRenderLineChainItem));
rlci->pos[0] = x;
rlci->pos[1] = y;
@@ -504,7 +504,7 @@ static void lineart_bounding_area_link_point_recursive(LineartRenderBuffer *rb,
LineartRenderLineChainItem *rlci)
{
if (root->child == NULL) {
- LineartChainRegisterEntry *cre = list_append_pointer_static_sized(
+ LineartChainRegisterEntry *cre = lineart_list_append_pointer_static_sized(
&root->linked_chains, &rb->render_data_pool, rlc, sizeof(LineartChainRegisterEntry));
cre->rlci = rlci;
diff --git a/source/blender/editors/lineart/lineart_cpu.c b/source/blender/editors/lineart/lineart_cpu.c
index b6deec21fd5..d083f85972d 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -163,7 +163,7 @@ static void lineart_render_line_cut(LineartRenderBuffer *rb,
irls = rls->next;
if (irls->at > start + 1e-09 && start > rls->at) {
start_segment = irls;
- ns = mem_static_aquire_thread(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
+ ns = lineart_mem_aquire_thread(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
break;
}
}
@@ -186,13 +186,13 @@ static void lineart_render_line_cut(LineartRenderBuffer *rb,
}
else if (rls->at > end) {
end_segment = rls;
- ns2 = mem_static_aquire_thread(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
+ ns2 = lineart_mem_aquire_thread(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
break;
}
}
if (ns == NULL) {
- ns = mem_static_aquire_thread(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
+ ns = lineart_mem_aquire_thread(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
}
if (ns2 == NULL) {
if (untouched) {
@@ -200,7 +200,7 @@ static void lineart_render_line_cut(LineartRenderBuffer *rb,
end_segment = ns2;
}
else
- ns2 = mem_static_aquire_thread(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
+ ns2 = lineart_mem_aquire_thread(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
}
if (start_segment) {
@@ -508,8 +508,8 @@ static int lineart_point_on_lined(double v[2], double v0[2], double v1[2])
{
double c1, c2;
- c1 = tmat_get_linear_ratio(v0[0], v1[0], v[0]);
- c2 = tmat_get_linear_ratio(v0[1], v1[1], v[1]);
+ c1 = lineart_get_linear_ratio(v0[0], v1[0], v[0]);
+ c2 = lineart_get_linear_ratio(v0[1], v1[1], v[1]);
if (LRT_DOUBLE_CLOSE_ENOUGH(c1, c2) && c1 >= 0 && c1 <= 1) {
return 1;
@@ -599,14 +599,14 @@ static LineartRenderElementLinkNode *lineart_memory_get_triangle_space(LineartRe
{
LineartRenderElementLinkNode *reln;
- LineartRenderTriangle *render_triangles = mem_static_aquire(
+ LineartRenderTriangle *render_triangles = lineart_mem_aquire(
&rb->render_data_pool,
64 * rb->triangle_size); /* CreateNewBuffer(LineartRenderTriangle, 64); */
- reln = list_append_pointer_static_sized(&rb->triangle_buffer_pointers,
- &rb->render_data_pool,
- render_triangles,
- sizeof(LineartRenderElementLinkNode));
+ reln = lineart_list_append_pointer_static_sized(&rb->triangle_buffer_pointers,
+ &rb->render_data_pool,
+ render_triangles,
+ sizeof(LineartRenderElementLinkNode));
reln->element_count = 64;
reln->additional = 1;
@@ -617,13 +617,13 @@ static LineartRenderElementLinkNode *lineart_memory_get_vert_space(LineartRender
{
LineartRenderElementLinkNode *reln;
- LineartRenderVert *render_vertices = mem_static_aquire(&rb->render_data_pool,
- sizeof(LineartRenderVert) * 64);
+ LineartRenderVert *render_vertices = lineart_mem_aquire(&rb->render_data_pool,
+ sizeof(LineartRenderVert) * 64);
- reln = list_append_pointer_static_sized(&rb->vertex_buffer_pointers,
- &rb->render_data_pool,
- render_vertices,
- sizeof(LineartRenderElementLinkNode));
+ reln = lineart_list_append_pointer_static_sized(&rb->vertex_buffer_pointers,
+ &rb->render_data_pool,
+ render_vertices,
+ sizeof(LineartRenderElementLinkNode));
reln->element_count = 64;
reln->additional = 1;
@@ -807,8 +807,8 @@ static void lineart_main_cull_triangles(LineartRenderBuffer *rb)
rt->rl[2]->next = rt->rl[2]->prev = 0;
/* New line connecting two new points */
- rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
- rls = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
+ rl = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
+ rls = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
BLI_addtail(&rl->segments, rls);
BLI_addtail(&rb->all_render_lines, rl);
/** note: inverting rl->l/r (left/right point) doesn't matter as long as
@@ -824,8 +824,8 @@ static void lineart_main_cull_triangles(LineartRenderBuffer *rb)
rl->object_ref = ob;
/* new line connecting original point 0 and a new point */
- rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
- rls = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
+ rl = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
+ rls = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
BLI_addtail(&rl->segments, rls);
BLI_addtail(&rb->all_render_lines, rl);
rl->l = &rv[1];
@@ -837,8 +837,8 @@ static void lineart_main_cull_triangles(LineartRenderBuffer *rb)
rl->object_ref = ob;
/* new line connecting original point 0 and another new point */
- rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
- rls = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
+ rl = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
+ rls = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
BLI_addtail(&rl->segments, rls);
BLI_addtail(&rb->all_render_lines, rl);
rl->l = rt->v[0];
@@ -884,8 +884,8 @@ static void lineart_main_cull_triangles(LineartRenderBuffer *rb)
BLI_remlink(&rb->all_render_lines, (void *)rt->rl[2]);
rt->rl[2]->next = rt->rl[2]->prev = 0;
- rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
- rls = mem_static_aquire(&rb->render_data_pool, sizeof(L
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list