[Bf-blender-cvs] [43a15ac5991] soc-2019-npr: Cleanup: ED Declareations move into ED_lanpr.h
YimingWu
noreply at git.blender.org
Mon Jul 15 11:06:24 CEST 2019
Commit: 43a15ac5991c52775bad1cbf0d5acc2a278ffdfd
Author: YimingWu
Date: Mon Jul 15 17:05:43 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB43a15ac5991c52775bad1cbf0d5acc2a278ffdfd
Cleanup: ED Declareations move into ED_lanpr.h
===================================================================
M source/blender/draw/engines/lanpr/lanpr_cpu.c
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/editors/include/ED_lanpr.h
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_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index 5cc62162c95..c6ea127d440 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -139,7 +139,7 @@ void lanpr_rebuild_render_draw_command(LANPR_RenderBuffer *rb, LANPR_LineLayer *
/* later implement .... */
/* } */
}
-void ED_lanpr_rebuild_all_command(SceneLANPR *lanpr)
+void lanpr_rebuild_all_command(SceneLANPR *lanpr)
{
LANPR_LineLayer *ll;
if (!lanpr || !lanpr_share.render_buffer_shared) {
@@ -268,7 +268,7 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
static float camdx, camdy, camzoom;
if (is_render) {
- ED_lanpr_rebuild_all_command(lanpr);
+ lanpr_rebuild_all_command(lanpr);
}
else {
if (lanpr_during_render()) {
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index ed71e9c5655..1e9afd5fed7 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -46,6 +46,10 @@ extern char datatoc_gpu_shader_2D_smooth_color_frag_glsl[];
LANPR_SharedResource lanpr_share;
+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);
+
static void lanpr_engine_init(void *ved)
{
lanpr_share.ved_viewport = ved;
@@ -155,6 +159,7 @@ static void lanpr_engine_init(void *ved)
lanpr_share.init_complete = 1;
}
+
static void lanpr_engine_free(void)
{
void *ved = lanpr_share.ved_viewport;
@@ -182,11 +187,6 @@ 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 ED_lanpr_rebuild_all_command(SceneLANPR *lanpr);
-
static void lanpr_cache_init(void *vedata)
{
@@ -437,12 +437,10 @@ static void lanpr_cache_init(void *vedata)
}
if (updated) {
- ED_lanpr_rebuild_all_command(&draw_ctx->scene->lanpr);
+ lanpr_rebuild_all_command(&draw_ctx->scene->lanpr);
}
}
-int ED_lanpr_object_collection_usage_check(Collection *c, Object *o);
-
static void lanpr_cache_populate(void *vedata, Object *ob)
{
@@ -786,6 +784,7 @@ static void lanpr_view_update(void *vedata)
lanpr->reloaded = 1; /* very bad solution, this will slow down animation. */
}
+/* This reserve for depsgraph auto updates. */
/* static void lanpr_id_update(void *vedata, ID *id){ */
/* const DRWContextState *draw_ctx = DRW_context_state_get(); */
/* SceneLANPR *lanpr = &DEG_get_evaluated_scene(draw_ctx->depsgraph)->lanpr; */
diff --git a/source/blender/editors/include/ED_lanpr.h b/source/blender/editors/include/ED_lanpr.h
index 5c4abd9187e..96cd144a671 100644
--- a/source/blender/editors/include/ED_lanpr.h
+++ b/source/blender/editors/include/ED_lanpr.h
@@ -809,4 +809,34 @@ void *lanpr_make_leveled_edge_vertex_array(LANPR_RenderBuffer *rb,
LANPR_LineLayer *ll,
float componet_id);
+struct Depsgraph;
+struct SceneLANPR;
+
+int ED_lanpr_object_collection_usage_check(struct Collection *c, struct Object *o);
+
+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_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);
+void ED_lanpr_copy_data(struct Scene *from, struct Scene *to);
+void ED_lanpr_free_everything(struct Scene *s);
+
+bool ED_lanpr_dpix_shader_error();
+bool ED_lanpr_disable_edge_splits(struct Scene *s);
+
+int ED_lanpr_max_occlusion_in_line_layers(struct SceneLANPR *lanpr);
+LANPR_LineLayer *ED_lanpr_new_line_layer(struct SceneLANPR *lanpr);
+LANPR_LineLayerComponent *ED_lanpr_new_line_component(struct SceneLANPR *lanpr);
+
+LANPR_BoundingArea* ED_lanpr_get_point_bounding_area(LANPR_RenderBuffer *rb, real x, real y);
+LANPR_BoundingArea *ED_lanpr_get_point_bounding_area_deep(LANPR_RenderBuffer *rb, real x, real y);
+
+
+
#endif /* __ED_LANPR_H__ */
diff --git a/source/blender/editors/lanpr/lanpr_chain.c b/source/blender/editors/lanpr/lanpr_chain.c
index ece0693d5ec..378a677aa24 100644
--- a/source/blender/editors/lanpr/lanpr_chain.c
+++ b/source/blender/editors/lanpr/lanpr_chain.c
@@ -16,9 +16,6 @@
#include <math.h>
-
-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)
LANPR_RenderLine *lanpr_get_connected_render_line(LANPR_BoundingArea *ba,
@@ -194,8 +191,6 @@ 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 ED_lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
{
LANPR_RenderLineChain *rlc;
@@ -415,7 +410,6 @@ void ED_lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
}
}
-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)
diff --git a/source/blender/editors/lanpr/lanpr_ops.c b/source/blender/editors/lanpr/lanpr_ops.c
index a482d68fb0a..e6f30315e78 100644
--- a/source/blender/editors/lanpr/lanpr_ops.c
+++ b/source/blender/editors/lanpr/lanpr_ops.c
@@ -71,18 +71,7 @@ struct Object;
/* External defines */
-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);
-
-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 lanpr_rebuild_all_command(SceneLANPR *lanpr);
/* Own functions */
@@ -286,7 +275,7 @@ static int lanpr_rebuild_all_commands_exec(struct bContext *C, struct wmOperator
Scene *scene = CTX_data_scene(C);
SceneLANPR *lanpr = &scene->lanpr;
- ED_lanpr_rebuild_all_command(lanpr);
+ lanpr_rebuild_all_command(lanpr);
DEG_id_tag_update(&scene->id, ID_RECALC_COPY_ON_WRITE);
@@ -348,7 +337,7 @@ static int lanpr_auto_create_line_layer_exec(struct bContext *C, struct wmOperat
lanpr_enable_all_line_types_exec(C, op);
- ED_lanpr_rebuild_all_command(lanpr);
+ lanpr_rebuild_all_command(lanpr);
return OPERATOR_FINISHED;
}
@@ -4018,11 +4007,6 @@ static LANPR_BoundingArea *lanpr_get_first_possible_bounding_area(LANPR_RenderBu
/* Calculations */
-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)
{
LANPR_RenderBuffer *rb;
@@ -4116,7 +4100,7 @@ static int lanpr_compute_feature_lines_exec(struct bContext *C, struct wmOperato
result = ED_lanpr_compute_feature_lines_internal(CTX_data_depsgraph(C), intersections_only);
- ED_lanpr_rebuild_all_command(lanpr);
+ lanpr_rebuild_all_command(lanpr);
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
More information about the Bf-blender-cvs
mailing list