[Bf-blender-cvs] [ef16f198453] soc-2019-npr: LANPR: Fixing local functions.
YimingWu
noreply at git.blender.org
Sat Jul 13 10:28:46 CEST 2019
Commit: ef16f1984535ebcafd9e642d47d9d912696fba8b
Author: YimingWu
Date: Sat Jul 13 16:28:22 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBef16f1984535ebcafd9e642d47d9d912696fba8b
LANPR: Fixing local functions.
===================================================================
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/include/ED_lanpr.h
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 0dc803f4233..0c9b1ee55a9 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ b/source/blender/draw/engines/lanpr/lanpr_access.h
@@ -28,7 +28,7 @@ void ED_lanpr_chain_clear_picked_flag(struct LANPR_RenderBuffer *rb);
int ED_lanpr_compute_feature_lines_internal(struct Depsgraph *depsgraph, int instersections_only);
-void lanpr_destroy_render_data(struct LANPR_RenderBuffer *rb);
+void ED_lanpr_destroy_render_data(struct LANPR_RenderBuffer *rb);
bool ED_lanpr_dpix_shader_error();
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c b/source/blender/draw/engines/lanpr/lanpr_chain.c
index 7121a6e6079..7701333a5ad 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain.c
@@ -32,7 +32,7 @@ int lanpr_get_line_bounding_areas(LANPR_RenderBuffer *rb,
int *rowEnd,
int *colBegin,
int *colEnd);
-LANPR_BoundingArea *lanpr_get_point_bounding_area(LANPR_RenderBuffer *rb, real x, real y);
+LANPR_BoundingArea *ED_lanpr_get_point_bounding_area(LANPR_RenderBuffer *rb, real x, real y);
#define LANPR_OTHER_RV(rl, rv) ((rv) == (rl)->l ? (rl)->r : (rl)->l)
@@ -209,7 +209,7 @@ void lanpr_reduce_render_line_chain_recursive(LANPR_RenderLineChain *rlc,
}
}
-LANPR_BoundingArea *lanpr_get_point_bounding_area_deep(LANPR_RenderBuffer *rb, real x, real y);
+LANPR_BoundingArea *ED_lanpr_get_point_bounding_area_deep(LANPR_RenderBuffer *rb, real x, real y);
void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
{
@@ -254,7 +254,7 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
}
/* step 1: grow left */
- ba = lanpr_get_point_bounding_area_deep(rb, rl->l->fbcoord[0], rl->l->fbcoord[1]);
+ ba = ED_lanpr_get_point_bounding_area_deep(rb, rl->l->fbcoord[0], rl->l->fbcoord[1]);
new_rv = rl->l;
rls = rl->segments.first;
lanpr_push_render_line_chain_point(rb,
@@ -334,7 +334,7 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
new_rl->flags,
last_occlusion);
}
- ba = lanpr_get_point_bounding_area_deep(rb, new_rv->fbcoord[0], new_rv->fbcoord[1]);
+ ba = ED_lanpr_get_point_bounding_area_deep(rb, new_rv->fbcoord[0], new_rv->fbcoord[1]);
}
/* step 2: this line */
@@ -360,7 +360,7 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
last_occlusion);
/* step 3: grow right */
- ba = lanpr_get_point_bounding_area_deep(rb, rl->r->fbcoord[0], rl->r->fbcoord[1]);
+ ba = ED_lanpr_get_point_bounding_area_deep(rb, rl->r->fbcoord[0], rl->r->fbcoord[1]);
new_rv = rl->r;
/* below already done in step 2 */
/* lanpr_push_render_line_chain_point(rb,rlc,new_rv->fbcoord[0],new_rv->fbcoord[1],rl->flags,0);
@@ -425,12 +425,12 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
new_rl->flags,
last_occlusion);
}
- ba = lanpr_get_point_bounding_area_deep(rb, new_rv->fbcoord[0], new_rv->fbcoord[1]);
+ ba = ED_lanpr_get_point_bounding_area_deep(rb, new_rv->fbcoord[0], new_rv->fbcoord[1]);
}
}
}
-LANPR_BoundingArea *lanpr_get_point_bounding_area(LANPR_RenderBuffer *rb, real x, real y);
+LANPR_BoundingArea *ED_lanpr_get_point_bounding_area(LANPR_RenderBuffer *rb, real x, real y);
LANPR_BoundingArea *lanpr_get_rlci_bounding_area_recursive(LANPR_RenderBuffer *rb,
LANPR_BoundingArea *root,
LANPR_RenderLineChainItem *rlci)
@@ -462,7 +462,7 @@ LANPR_BoundingArea *lanpr_get_rlci_bounding_area_recursive(LANPR_RenderBuffer *r
LANPR_BoundingArea *lanpr_get_end_point_bounding_area(LANPR_RenderBuffer *rb,
LANPR_RenderLineChainItem *rlci)
{
- LANPR_BoundingArea *root = lanpr_get_point_bounding_area(rb, rlci->pos[0], rlci->pos[1]);
+ LANPR_BoundingArea *root = ED_lanpr_get_point_bounding_area(rb, rlci->pos[0], rlci->pos[1]);
if (!root) {
return NULL;
}
@@ -516,8 +516,8 @@ void lanpr_link_chain_with_bounding_areas(LANPR_RenderBuffer *rb, LANPR_RenderLi
{
LANPR_RenderLineChainItem *pl = rlc->chain.first;
LANPR_RenderLineChainItem *pr = rlc->chain.last;
- LANPR_BoundingArea *ba1 = lanpr_get_point_bounding_area(rb, pl->pos[0], pl->pos[1]);
- LANPR_BoundingArea *ba2 = lanpr_get_point_bounding_area(rb, pr->pos[0], pr->pos[1]);
+ LANPR_BoundingArea *ba1 = ED_lanpr_get_point_bounding_area(rb, pl->pos[0], pl->pos[1]);
+ LANPR_BoundingArea *ba2 = ED_lanpr_get_point_bounding_area(rb, pr->pos[0], pr->pos[1]);
if (ba1) {
lanpr_link_point_with_bounding_area_recursive(rb, ba1, rlc, pl);
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 0e5e1cc6030..64e6297708c 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -176,7 +176,7 @@ static void lanpr_engine_free(void)
}
if (lanpr_share.render_buffer_shared) {
- lanpr_destroy_render_data(lanpr_share.render_buffer_shared);
+ ED_lanpr_destroy_render_data(lanpr_share.render_buffer_shared);
MEM_freeN(lanpr_share.render_buffer_shared);
lanpr_share.render_buffer_shared = NULL;
}
@@ -441,7 +441,7 @@ static void lanpr_cache_init(void *vedata)
}
}
-int lanpr_object_collection_usage_check(Collection *c, Object *o);
+int ED_lanpr_object_collection_usage_check(Collection *c, Object *o);
static void lanpr_cache_populate(void *vedata, Object *ob)
{
@@ -467,7 +467,7 @@ static void lanpr_cache_populate(void *vedata, Object *ob)
if (geom) {
if (dpix_ok = (lanpr->master_mode == LANPR_MASTER_MODE_DPIX && lanpr->active_layer &&
!lanpr_share.dpix_shader_error)) {
- usage = lanpr_object_collection_usage_check(draw_ctx->scene->master_collection, ob);
+ usage = ED_lanpr_object_collection_usage_check(draw_ctx->scene->master_collection, ob);
if (usage == OBJECT_FEATURE_LINE_EXCLUDE) {
return;
}
@@ -661,7 +661,7 @@ static void lanpr_render_matrices_init(RenderEngine *engine, Depsgraph *depsgrap
}
int ED_lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int instersections_only);
-LANPR_RenderBuffer *lanpr_create_render_buffer();
+LANPR_RenderBuffer *ED_lanpr_create_render_buffer();
extern DrawEngineType draw_engine_lanpr_type;
@@ -701,7 +701,7 @@ static void lanpr_render_to_image(LANPR_Data *vedata,
if (lanpr->master_mode == LANPR_MASTER_MODE_SOFTWARE ||
(lanpr->master_mode == LANPR_MASTER_MODE_DPIX && lanpr->enable_intersections)) {
if (!lanpr_share.render_buffer_shared) {
- lanpr_create_render_buffer();
+ ED_lanpr_create_render_buffer();
}
if (lanpr_share.render_buffer_shared->cached_for_frame != scene->r.cfra ||
LANPR_GLOBAL_update_tag) {
diff --git a/source/blender/editors/include/ED_lanpr.h b/source/blender/editors/include/ED_lanpr.h
index 42d1c78aa49..ff395760530 100644
--- a/source/blender/editors/include/ED_lanpr.h
+++ b/source/blender/editors/include/ED_lanpr.h
@@ -680,7 +680,7 @@ BLI_INLINE void tMatVectorConvert3fd(tnsVector3f from, tnsVector3d to)
to[2] = from[2];
}
-int lanpr_point_inside_triangled(tnsVector2d v, tnsVector2d v0, tnsVector2d v1, tnsVector2d v2);
+int ED_lanpr_point_inside_triangled(tnsVector2d v, tnsVector2d v0, tnsVector2d v1, tnsVector2d v2);
real lanpr_LinearInterpolate(real l, real r, real T);
void lanpr_LinearInterpolate2dv(real *l, real *r, real T, real *Result);
void lanpr_LinearInterpolate3dv(real *l, real *r, real T, real *Result);
diff --git a/source/blender/editors/lanpr/lanpr_ops.c b/source/blender/editors/lanpr/lanpr_ops.c
index b04d70cc98c..915a9053ee8 100644
--- a/source/blender/editors/lanpr/lanpr_ops.c
+++ b/source/blender/editors/lanpr/lanpr_ops.c
@@ -77,7 +77,7 @@ void ED_lanpr_chain_clear_picked_flag(struct LANPR_RenderBuffer *rb);
int ED_lanpr_compute_feature_lines_internal(struct Depsgraph *depsgraph, int instersections_only);
-void lanpr_destroy_render_data(struct LANPR_RenderBuffer *rb);
+void ED_lanpr_destroy_render_data(struct LANPR_RenderBuffer *rb);
bool ED_lanpr_dpix_shader_error();
@@ -87,14 +87,14 @@ void ED_lanpr_copy_data(struct Scene *from, struct Scene *to);
void ED_lanpr_free_everything(struct Scene *s);
-LANPR_BoundingArea *lanpr_get_first_possible_bounding_area(LANPR_RenderBuffer *rb,
+static LANPR_BoundingArea *lanpr_get_first_possible_bounding_area(LANPR_RenderBuffer *rb,
LANPR_RenderLine *rl);
-void lanpr_link_line_with_bounding_area(LANPR_RenderBuffer *rb,
+static void lanpr_link_line_with_bounding_area(LANPR_RenderBuffer *rb,
LANPR_BoundingArea *RootBoundingArea,
LANPR_RenderLine *rl);
-LANPR_BoundingArea *lanpr_get_next_bounding_area(LANPR_BoundingArea *This,
+static LANPR_BoundingArea *lanpr_get_next_bounding_area(LANPR_BoundingArea *This,
LANPR_RenderLine *rl,
real x,
real y,
@@ -103,7 +103,7 @@ LANPR_BoundingArea *lanpr_get_next_bounding_area(LANPR_BoundingArea *This,
int PositiveY,
real *NextX,
real *NextY);
-int lanpr_triangle_line_imagespace_intersection_v2(SpinLock *spl,
+static int lanpr_triangle_line_imagespace_intersection_v2(SpinLock *spl,
LANPR_RenderTriangle *rt,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list