[Bf-blender-cvs] [31a71467e4f] soc-2019-npr: LANPR: Fixing function prefixes.

YimingWu noreply at git.blender.org
Mon Jul 15 10:46:26 CEST 2019


Commit: 31a71467e4f987626b6d3ec7a7b7ea4e8c1a9cc0
Author: YimingWu
Date:   Mon Jul 15 15:55:14 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB31a71467e4f987626b6d3ec7a7b7ea4e8c1a9cc0

LANPR: Fixing function prefixes.

===================================================================

M	source/blender/draw/engines/lanpr/lanpr_access.h
M	source/blender/draw/engines/lanpr/lanpr_chain_draw.c
M	source/blender/draw/engines/lanpr/lanpr_engine.c
M	source/blender/draw/engines/lanpr/lanpr_ops.c
M	source/blender/editors/lanpr/lanpr_chain.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 0c9b1ee55a9..03c061422dd 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ b/source/blender/draw/engines/lanpr/lanpr_access.h
@@ -22,7 +22,7 @@ void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
 
 void ED_lanpr_update_data_for_external(Depsgraph *depsgraph);
 
-int lanpr_count_chain(LANPR_RenderLineChain *rlc);
+int ED_lanpr_count_chain(LANPR_RenderLineChain *rlc);
 
 void ED_lanpr_chain_clear_picked_flag(struct LANPR_RenderBuffer *rb);
 
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
index 511b4e78dfe..e1bac0a8600 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
@@ -26,7 +26,7 @@
 
 #include <math.h>
 
-int lanpr_count_chain(LANPR_RenderLineChain *rlc);
+int ED_lanpr_count_chain(LANPR_RenderLineChain *rlc);
 
 float lanpr_compute_chain_length_draw(LANPR_RenderLineChain *rlc, float *lengths, int begin_index)
 {
@@ -92,7 +92,7 @@ void lanpr_chain_generate_draw_command(LANPR_RenderBuffer *rb)
   GPUVertBuf *vbo = GPU_vertbuf_create_with_format(&format);
 
   for (rlc = rb->chains.first; rlc; rlc = rlc->next) {
-    int count = lanpr_count_chain(rlc);
+    int count = ED_lanpr_count_chain(rlc);
     /*  printf("seg contains %d verts\n", count); */
     vert_count += count;
   }
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 64e6297708c..ed71e9c5655 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -185,7 +185,7 @@ static void lanpr_engine_free(void)
 void lanpr_calculate_normal_object_vector(LANPR_LineLayer *ll, float *normal_object_direction);
 int lanpr_dpix_texture_size(SceneLANPR *lanpr);
 
-void lanpr_rebuild_all_command(SceneLANPR *lanpr);
+void ED_lanpr_rebuild_all_command(SceneLANPR *lanpr);
 
 static void lanpr_cache_init(void *vedata)
 {
@@ -437,7 +437,7 @@ static void lanpr_cache_init(void *vedata)
   }
 
   if (updated) {
-    lanpr_rebuild_all_command(&draw_ctx->scene->lanpr);
+    ED_lanpr_rebuild_all_command(&draw_ctx->scene->lanpr);
   }
 }
 
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c
index e70acd81af2..4d126c8bf75 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -161,7 +161,7 @@ void lanpr_rebuild_render_draw_command(LANPR_RenderBuffer *rb, LANPR_LineLayer *
   /*  later implement .... */
   /* } */
 }
-void lanpr_rebuild_all_command(SceneLANPR *lanpr)
+void ED_lanpr_rebuild_all_command(SceneLANPR *lanpr)
 {
   LANPR_LineLayer *ll;
   if (!lanpr || !lanpr_share.render_buffer_shared) {
@@ -290,7 +290,7 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
   static float camdx, camdy, camzoom;
 
   if (is_render) {
-    lanpr_rebuild_all_command(lanpr);
+    ED_lanpr_rebuild_all_command(lanpr);
   }
   else {
     if (lanpr_during_render()) {
diff --git a/source/blender/editors/lanpr/lanpr_chain.c b/source/blender/editors/lanpr/lanpr_chain.c
index ccaf51fbf7f..d9ce1c5b0f1 100644
--- a/source/blender/editors/lanpr/lanpr_chain.c
+++ b/source/blender/editors/lanpr/lanpr_chain.c
@@ -16,12 +16,7 @@
 
 #include <math.h>
 
-int lanpr_get_line_bounding_areas(LANPR_RenderBuffer *rb,
-                                  LANPR_RenderLine *rl,
-                                  int *rowBegin,
-                                  int *rowEnd,
-                                  int *colBegin,
-                                  int *colEnd);
+
 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)
@@ -201,7 +196,7 @@ void lanpr_reduce_render_line_chain_recursive(LANPR_RenderLineChain *rlc,
 
 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)
+void ED_lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
 {
   LANPR_RenderLineChain *rlc;
   LANPR_RenderLineChainItem *rlci;
@@ -517,7 +512,7 @@ void lanpr_link_chain_with_bounding_areas(LANPR_RenderBuffer *rb, LANPR_RenderLi
   }
 }
 
-void lanpr_split_chains_for_fixed_occlusion(LANPR_RenderBuffer *rb)
+void ED_lanpr_split_chains_for_fixed_occlusion(LANPR_RenderBuffer *rb)
 {
   LANPR_RenderLineChain *rlc, *new_rlc;
   LANPR_RenderLineChainItem *rlci, *next_rlci;
@@ -601,7 +596,7 @@ void lanpr_connect_two_chains(LANPR_RenderBuffer *rb,
 
 /*  this only does head-tail connection. */
 /*  overlapping / tiny isolated segment / loop reduction not implemented here yet. */
-void lanpr_connect_chains(LANPR_RenderBuffer *rb, int do_geometry_space)
+void ED_lanpr_connect_chains(LANPR_RenderBuffer *rb, int do_geometry_space)
 {
   LANPR_RenderLineChain *rlc, *new_rlc;
   LANPR_RenderLineChainItem *rlci, *next_rlci;
@@ -746,7 +741,7 @@ float lanpr_compute_chain_length(LANPR_RenderLineChain *rlc)
   return offset_accum;
 }
 
-void lanpr_discard_short_chains(LANPR_RenderBuffer *rb, float threshold)
+void ED_lanpr_discard_short_chains(LANPR_RenderBuffer *rb, float threshold)
 {
   LANPR_RenderLineChain *rlc, *next_rlc;
   for (rlc = rb->chains.first; rlc; rlc = next_rlc) {
@@ -757,7 +752,7 @@ void lanpr_discard_short_chains(LANPR_RenderBuffer *rb, float threshold)
   }
 }
 
-int lanpr_count_chain(LANPR_RenderLineChain *rlc)
+int ED_lanpr_count_chain(LANPR_RenderLineChain *rlc)
 {
   LANPR_RenderLineChainItem *rlci;
   int Count = 0;
diff --git a/source/blender/editors/lanpr/lanpr_ops.c b/source/blender/editors/lanpr/lanpr_ops.c
index 915a9053ee8..3895ee6aa7a 100644
--- a/source/blender/editors/lanpr/lanpr_ops.c
+++ b/source/blender/editors/lanpr/lanpr_ops.c
@@ -69,23 +69,24 @@ extern LANPR_SharedResource lanpr_share;
 extern const char *RE_engine_id_BLENDER_LANPR;
 struct Object;
 
-void ED_lanpr_update_data_for_external(struct Depsgraph *depsgraph);
+/* External defines */
 
-int lanpr_count_chain(LANPR_RenderLineChain *rlc);
+void ED_lanpr_update_data_for_external(struct Depsgraph *depsgraph);
 
+int ED_lanpr_count_chain(LANPR_RenderLineChain *rlc);
 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 ED_lanpr_destroy_render_data(struct LANPR_RenderBuffer *rb);
 
-bool ED_lanpr_dpix_shader_error();
+void ED_lanpr_copy_data(struct Scene *from, struct Scene *to);
+void ED_lanpr_free_everything(struct Scene *s);
+void ED_lanpr_rebuild_all_command(SceneLANPR *lanpr);
 
+bool ED_lanpr_dpix_shader_error();
 bool ED_lanpr_disable_edge_splits(struct Scene *s);
 
-void ED_lanpr_copy_data(struct Scene *from, struct Scene *to);
-
-void ED_lanpr_free_everything(struct Scene *s);
+/* Own functions */
 
 static LANPR_BoundingArea *lanpr_get_first_possible_bounding_area(LANPR_RenderBuffer *rb,
                                                            LANPR_RenderLine *rl);
@@ -281,13 +282,13 @@ static int lanpr_delete_line_component_exec(struct bContext *C, struct wmOperato
 
   return OPERATOR_FINISHED;
 }
-void lanpr_rebuild_all_command(SceneLANPR *lanpr);
+
 static int lanpr_rebuild_all_commands_exec(struct bContext *C, struct wmOperator *op)
 {
   Scene *scene = CTX_data_scene(C);
   SceneLANPR *lanpr = &scene->lanpr;
 
-  lanpr_rebuild_all_command(lanpr);
+  ED_lanpr_rebuild_all_command(lanpr);
 
   DEG_id_tag_update(&scene->id, ID_RECALC_COPY_ON_WRITE);
 
@@ -349,7 +350,7 @@ static int lanpr_auto_create_line_layer_exec(struct bContext *C, struct wmOperat
 
   lanpr_enable_all_line_types_exec(C, op);
 
-  lanpr_rebuild_all_command(lanpr);
+  ED_lanpr_rebuild_all_command(lanpr);
 
   return OPERATOR_FINISHED;
 }
@@ -444,7 +445,6 @@ void SCENE_OT_lanpr_delete_line_component(struct wmOperatorType *ot)
 
 int use_smooth_contour_modifier_contour = 0; /*  debug purpose */
 
-
 static void lanpr_cut_render_line(LANPR_RenderBuffer *rb, LANPR_RenderLine *rl, real Begin, real End)
 {
   LANPR_RenderLineSegment *rls = rl->segments.first, *irls;
@@ -1820,6 +1820,7 @@ static int lanpr_object_has_feature_line_modifier(Object *o)
   }
   return 0;
 }
+
 int ED_lanpr_object_collection_usage_check(Collection *c, Object *o)
 {
   CollectionChild *cc;
@@ -4046,10 +4047,10 @@ static LANPR_BoundingArea *lanpr_get_first_possible_bounding_area(LANPR_RenderBu
 
 /* Calculations */
 
-void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb);
-void lanpr_split_chains_for_fixed_occlusion(LANPR_RenderBuffer *rb);
-void lanpr_connect_chains(LANPR_RenderBuffer *rb, int do_geometry_space);
-void lanpr_discard_short_chains(LANPR_RenderBuffer *rb, float threshold);
+void ED_lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb);
+void ED_lanpr_split_chains_for_fixed_occlusion(LANPR_RenderBuffer *rb);
+void ED_lanpr_connect_chains(LANPR_RenderBuffer *rb, int do_geometry_space);
+void ED_lanpr_discard_short_chains(LANPR_RenderBuffer *rb, float threshold);
 
 int ED_lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int intersectons_only)
 {
@@ -4099,26 +4100,26 @@ int ED_lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int intersecto
     float t_image = rb->scene->lanpr.chaining_image_threshold;
     float t_geom = rb->scene->lanpr.chaining_geometry_threshold;
 
-    lanpr_NO_THREAD_chain_feature_lines(rb);
-    lanpr_split_chains_for_fixed_occlusion(rb);
+    ED_lanpr_NO_THREAD_chain_feature_lines(rb);
+    ED_lanpr_split_chains_for_fixed_occlusion(rb);
 
     if (t_image < FLT_EPSILON && t_geom < FLT_EPSILON) {
       t_geom = 0.0f;
       t_image = 0.01f;
     }
 
-    lanpr_connect_chains(rb, 1);
-    lanpr_connect_chains(rb, 0);
+    ED_lanpr_connect_chains(rb, 1);
+    ED_lanpr_connect_chains(rb, 0);
 
     /* This configuration ensures there won't be accidental lost of short segments */
-    lanpr_discard_short_chains(rb, MIN3(t_image, t_geom, 0.01f) - FLT_EPSILON);
+    ED_lanp

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list