[Bf-blender-cvs] [5b3ab68ae78] soc-2019-npr: LANPR: Fixing local function and naming.
YimingWu
noreply at git.blender.org
Sat Jul 13 10:28:44 CEST 2019
Commit: 5b3ab68ae78999ba72cb3aabac2cfbaafffe8aaa
Author: YimingWu
Date: Sat Jul 13 16:19:55 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB5b3ab68ae78999ba72cb3aabac2cfbaafffe8aaa
LANPR: Fixing local function and naming.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_access.h
M source/blender/draw/engines/lanpr/lanpr_chain.c
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/editors/lanpr/lanpr_ops.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.h b/source/blender/draw/engines/lanpr/lanpr_access.h
index a68a4a7a98d..0dc803f4233 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ b/source/blender/draw/engines/lanpr/lanpr_access.h
@@ -24,9 +24,9 @@ void ED_lanpr_update_data_for_external(Depsgraph *depsgraph);
int lanpr_count_chain(LANPR_RenderLineChain *rlc);
-void lanpr_chain_clear_picked_flag(struct LANPR_RenderBuffer *rb);
+void ED_lanpr_chain_clear_picked_flag(struct LANPR_RenderBuffer *rb);
-int lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int instersections_only);
+int ED_lanpr_compute_feature_lines_internal(struct Depsgraph *depsgraph, int instersections_only);
void lanpr_destroy_render_data(struct LANPR_RenderBuffer *rb);
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c b/source/blender/draw/engines/lanpr/lanpr_chain.c
index b9e7c5ee840..7121a6e6079 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain.c
@@ -915,7 +915,7 @@ void lanpr_chain_generate_draw_command(LANPR_RenderBuffer *rb)
GPU_PRIM_LINES_ADJ, vbo, GPU_indexbuf_build(&elb), GPU_USAGE_DYNAMIC | GPU_BATCH_OWNS_VBO);
}
-void lanpr_chain_clear_picked_flag(LANPR_RenderBuffer *rb)
+void ED_lanpr_chain_clear_picked_flag(LANPR_RenderBuffer *rb)
{
LANPR_RenderLineChain *rlc;
if (!rb) {
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 819c1ea743a..0e5e1cc6030 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -428,11 +428,11 @@ static void lanpr_cache_init(void *vedata)
(!lanpr_share.render_buffer_shared ||
lanpr_share.render_buffer_shared->cached_for_frame != draw_ctx->scene->r.cfra)) {
if (draw_ctx->scene->lanpr.master_mode == LANPR_MASTER_MODE_SOFTWARE) {
- lanpr_compute_feature_lines_internal(draw_ctx->depsgraph, 0);
+ ED_lanpr_compute_feature_lines_internal(draw_ctx->depsgraph, 0);
updated = 1;
}
else if (draw_ctx->scene->lanpr.master_mode == LANPR_MASTER_MODE_DPIX) {
- lanpr_compute_feature_lines_internal(draw_ctx->depsgraph, 1);
+ ED_lanpr_compute_feature_lines_internal(draw_ctx->depsgraph, 1);
}
}
@@ -660,7 +660,7 @@ static void lanpr_render_matrices_init(RenderEngine *engine, Depsgraph *depsgrap
DRW_view_set_active(view);
}
-int lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int instersections_only);
+int ED_lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int instersections_only);
LANPR_RenderBuffer *lanpr_create_render_buffer();
extern DrawEngineType draw_engine_lanpr_type;
@@ -706,7 +706,7 @@ static void lanpr_render_to_image(LANPR_Data *vedata,
if (lanpr_share.render_buffer_shared->cached_for_frame != scene->r.cfra ||
LANPR_GLOBAL_update_tag) {
int intersections_only = (lanpr->master_mode != LANPR_MASTER_MODE_SOFTWARE);
- lanpr_compute_feature_lines_internal(draw_ctx->depsgraph, intersections_only);
+ ED_lanpr_compute_feature_lines_internal(draw_ctx->depsgraph, intersections_only);
}
}
diff --git a/source/blender/editors/lanpr/lanpr_ops.c b/source/blender/editors/lanpr/lanpr_ops.c
index b62bdf43b54..b04d70cc98c 100644
--- a/source/blender/editors/lanpr/lanpr_ops.c
+++ b/source/blender/editors/lanpr/lanpr_ops.c
@@ -73,9 +73,9 @@ void ED_lanpr_update_data_for_external(struct Depsgraph *depsgraph);
int lanpr_count_chain(LANPR_RenderLineChain *rlc);
-void lanpr_chain_clear_picked_flag(struct LANPR_RenderBuffer *rb);
+void ED_lanpr_chain_clear_picked_flag(struct LANPR_RenderBuffer *rb);
-int lanpr_compute_feature_lines_internal(struct Depsgraph *depsgraph, int instersections_only);
+int ED_lanpr_compute_feature_lines_internal(struct Depsgraph *depsgraph, int instersections_only);
void lanpr_destroy_render_data(struct LANPR_RenderBuffer *rb);
@@ -445,7 +445,7 @@ void SCENE_OT_lanpr_delete_line_component(struct wmOperatorType *ot)
int use_smooth_contour_modifier_contour = 0; /* debug purpose */
-void lanpr_cut_render_line(LANPR_RenderBuffer *rb, LANPR_RenderLine *rl, real Begin, real End)
+static void lanpr_cut_render_line(LANPR_RenderBuffer *rb, LANPR_RenderLine *rl, real Begin, real End)
{
LANPR_RenderLineSegment *rls = rl->segments.first, *irls;
LANPR_RenderLineSegment *begin_segment = 0, *end_segment = 0;
@@ -560,8 +560,7 @@ void lanpr_cut_render_line(LANPR_RenderBuffer *rb, LANPR_RenderLine *rl, real Be
}
rl->min_occ = min_occ;
}
-
-int lanpr_make_next_occlusion_task_info(LANPR_RenderBuffer *rb, LANPR_RenderTaskInfo *rti)
+static int lanpr_make_next_occlusion_task_info(LANPR_RenderBuffer *rb, LANPR_RenderTaskInfo *rti)
{
LinkData *data;
int i;
@@ -653,7 +652,7 @@ int lanpr_make_next_occlusion_task_info(LANPR_RenderBuffer *rb, LANPR_RenderTask
return res;
}
-void lanpr_calculate_single_line_occlusion(LANPR_RenderBuffer *rb,
+static void lanpr_calculate_single_line_occlusion(LANPR_RenderBuffer *rb,
LANPR_RenderLine *rl,
int thread_id)
{
@@ -704,7 +703,7 @@ void lanpr_calculate_single_line_occlusion(LANPR_RenderBuffer *rb,
nba = lanpr_get_next_bounding_area(nba, rl, x, y, k, PositiveX, PositiveY, &x, &y);
}
}
-void lanpr_THREAD_calculate_line_occlusion(TaskPool *__restrict pool,
+static void lanpr_THREAD_calculate_line_occlusion(TaskPool *__restrict pool,
LANPR_RenderTaskInfo *rti,
int threadid)
{
@@ -741,7 +740,7 @@ void lanpr_THREAD_calculate_line_occlusion(TaskPool *__restrict pool,
}
}
}
-void lanpr_THREAD_calculate_line_occlusion_begin(LANPR_RenderBuffer *rb)
+static void lanpr_THREAD_calculate_line_occlusion_begin(LANPR_RenderBuffer *rb)
{
int thread_count = rb->thread_count;
LANPR_RenderTaskInfo *rti = MEM_callocN(sizeof(LANPR_RenderTaskInfo) * thread_count,
@@ -766,8 +765,7 @@ void lanpr_THREAD_calculate_line_occlusion_begin(LANPR_RenderBuffer *rb)
MEM_freeN(rti);
}
-
-void lanpr_NO_THREAD_calculate_line_occlusion(LANPR_RenderBuffer *rb)
+static void lanpr_NO_THREAD_calculate_line_occlusion(LANPR_RenderBuffer *rb)
{
LinkData *lip;
@@ -792,39 +790,6 @@ void lanpr_NO_THREAD_calculate_line_occlusion(LANPR_RenderBuffer *rb)
}
}
-int lanpr_get_normal(
- tnsVector3d v1, tnsVector3d v2, tnsVector3d v3, tnsVector3d n, tnsVector3d Pos)
-{
- tnsVector3d vec1, vec2;
-
- tMatVectorMinus3d(vec1, v2, v1);
- tMatVectorMinus3d(vec2, v3, v1);
- tmat_vector_cross_3d(n, vec1, vec2);
- tmat_normalize_self_3d(n);
- if (Pos && (tmat_dot_3d(n, Pos, 1) < 0)) {
- tMatVectorMultiSelf3d(n, -1.0f);
- return 1;
- }
- return 0;
-}
-
-int lanpr_bound_box_crosses(tnsVector4d xxyy1, tnsVector4d xxyy2)
-{
- real XMax1 = MAX2(xxyy1[0], xxyy1[1]);
- real XMin1 = MIN2(xxyy1[0], xxyy1[1]);
- real YMax1 = MAX2(xxyy1[2], xxyy1[3]);
- real YMin1 = MIN2(xxyy1[2], xxyy1[3]);
- real XMax2 = MAX2(xxyy2[0], xxyy2[1]);
- real XMin2 = MIN2(xxyy2[0], xxyy2[1]);
- real YMax2 = MAX2(xxyy2[2], xxyy2[3]);
- real YMin2 = MIN2(xxyy2[2], xxyy2[3]);
-
- if ((XMax1 < XMin2 || XMin1 > XMax2) || (YMax1 < YMin2 || YMin1 > YMax2)) {
- return 0;
- }
-
- return 1;
-}
int lanpr_point_inside_triangled(tnsVector2d v, tnsVector2d v0, tnsVector2d v1, tnsVector2d v2)
{
double cl, c;
@@ -853,7 +818,7 @@ int lanpr_point_inside_triangled(tnsVector2d v, tnsVector2d v0, tnsVector2d v1,
return 1;
}
-int lanpr_point_on_lined(tnsVector2d v, tnsVector2d v0, tnsVector2d v1)
+static int lanpr_point_on_lined(tnsVector2d v, tnsVector2d v0, tnsVector2d v1)
{
real c1, c2;
@@ -866,7 +831,7 @@ int lanpr_point_on_lined(tnsVector2d v, tnsVector2d v0, tnsVector2d v1)
return 0;
}
-int lanpr_point_triangle_relation(tnsVector2d v, tnsVector2d v0, tnsVector2d v1, tnsVector2d v2)
+static int lanpr_point_triangle_relation(tnsVector2d v, tnsVector2d v0, tnsVector2d v1, tnsVector2d v2)
{
double cl, c;
real r;
@@ -905,7 +870,7 @@ int lanpr_point_triangle_relation(tnsVector2d v, tnsVector2d v0, tnsVector2d v1,
return 2;
}
-int lanpr_point_inside_triangle3d(tnsVector3d v, tnsVector3d v0, tnsVector3d v1, tnsVector3d v2)
+static int lanpr_point_inside_triangle3d(tnsVector3d v, tnsVector3d v0, tnsVector3d v1, tnsVector3d v2)
{
tnsVector3d l, r;
tnsVector3d N1, N2;
@@ -940,7 +905,7 @@ int lanpr_point_inside_triangle3d(tnsVector3d v, tnsVector3d v0, tnsVector3d v1,
return 1;
}
-int lanpr_point_inside_triangle3de(tnsVector3d v, tnsVector3d v0, tnsVector3d v1, tnsVector3d v2)
+static int lanpr_point_inside_triangle3de(tnsVector3d v, tnsVector3d v0, tnsVector3d v1, tnsVector3d v2)
{
tnsVector3d l, r;
tnsVector3d N1, N2;
@@ -988,7 +953,7 @@ int lanpr_point_inside_triangle3de(tnsVector3d v, tnsVector3d v0, tnsVector3d v1
return 1;
}
-LANPR_RenderElementLinkNode *lanpr_new_cull_triangle_space64(LANPR_RenderBuffer *rb)
+static LANPR_RenderElementLinkNode *lanpr_new_cull_triangle_space64(LANPR_RenderBuffer *rb)
{
LANPR_RenderElementLinkNode *reln;
@@ -1005,7 +970,7 @@ LANPR_RenderElementLinkNode *lanpr_new_cull_triangle_space64(LANPR_RenderBuffer
return reln;
}
-LANPR_RenderElementLinkNode *lanpr_new_cull_point_space64(LANPR_RenderBuffer *rb)
+static LANPR_RenderElementLinkNode *lanpr_new_cull_point_space64(LANPR_RenderBuffer *rb)
{
LANPR_RenderElementLinkNode *reln;
@@ -1022,8 +987,8 @@ LANPR_RenderElementLinkNode *lanpr_new_cull_point_space64(LANPR_RenderBuffer *rb
return reln;
}
-void lanpr_calculate_render_triangle_normal(LANPR_RenderTriangle *rt);
-void lanpr_assign_render_line_with_triangle(LANPR_RenderTriangle *rt)
+static void lanpr_calculate_render_triangle_normal(LANPR_RenderTriangle *rt);
+static void lanpr_assign_render_line_with_triangle(LANPR_RenderTriangle *rt)
{
if (!rt->rl[0]->tl) {
rt->rl[0]->tl = rt;
@@ -1046,7 +1011,7 @@ void lanpr_assign_render_line_with_triangle(LANPR_RenderTriangle *rt)
rt->rl[2]->tr = rt;
}
}
-void lanpr_post_triangle(LANPR_RenderTr
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list