[Bf-blender-cvs] [67d493f6f2a] soc-2019-npr: Cleanup: LANPR draw engine codes.
YimingWu
noreply at git.blender.org
Mon Jul 15 10:46:29 CEST 2019
Commit: 67d493f6f2ac18ab3f4b082d9947ccbac15503d8
Author: YimingWu
Date: Mon Jul 15 16:00:47 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB67d493f6f2ac18ab3f4b082d9947ccbac15503d8
Cleanup: LANPR draw engine codes.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_access.h
M source/blender/draw/engines/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 03c061422dd..27ad26cfc9a 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ b/source/blender/draw/engines/lanpr/lanpr_access.h
@@ -10,6 +10,7 @@
typedef struct LANPR_RenderLineChain LANPR_RenderLineChain;
+/* GPenicl (deprecated) */
void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
struct Object *ob,
bGPDlayer *gpl,
@@ -23,19 +24,19 @@ void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
void ED_lanpr_update_data_for_external(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);
+/* LANPR data */
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);
+/* State polls */
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);
#endif
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c
index 4d126c8bf75..5cc62162c95 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -53,28 +53,6 @@
extern LANPR_SharedResource lanpr_share;
extern const char *RE_engine_id_BLENDER_LANPR;
-struct Object;
-
-int lanpr_triangle_line_imagespace_intersection_v2(SpinLock *spl,
- LANPR_RenderTriangle *rt,
- LANPR_RenderLine *rl,
- Object *cam,
- tnsMatrix44d vp,
- real *CameraDir,
- double *From,
- double *To);
-void lanpr_compute_view_Vector(LANPR_RenderBuffer *rb);
-
-/* ====================================== base structures
- * =========================================== */
-
-
-/* ======================================= geometry ============================================ */
-
-/* ====================================== render control ======================================= */
-
-/* ============================================ viewport display
- * ================================================= */
void lanpr_chain_generate_draw_command(LANPR_RenderBuffer *rb);
@@ -537,6 +515,5 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
}
}
-/* ============================================ operators =========================================
- */
+
More information about the Bf-blender-cvs
mailing list