[Bf-blender-cvs] [00cf9998a87] temp-lanpr-cleanup2: LANPR: completely remove snake mode.
YimingWu
noreply at git.blender.org
Tue Nov 5 15:47:59 CET 2019
Commit: 00cf9998a87d8f7fa38db587a9ad0a8eaa340c96
Author: YimingWu
Date: Tue Nov 5 22:47:28 2019 +0800
Branches: temp-lanpr-cleanup2
https://developer.blender.org/rB00cf9998a87d8f7fa38db587a9ad0a8eaa340c96
LANPR: completely remove snake mode.
===================================================================
M release/scripts/startup/bl_ui/properties_render.py
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/lanpr/lanpr_all.h
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/editors/include/ED_lanpr.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 416119d1502..5e518f2c55b 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -911,88 +911,7 @@ class RENDER_PT_lanpr_line_gpu_effects(RenderButtonsPanel, Panel):
col = layout.column(align = True)
col.prop(lanpr, "depth_alpha_influence")
col.prop(lanpr, "depth_alpha_curve", text="Curve")
-
-
-class RENDER_PT_lanpr_snake_sobel_parameters(RenderButtonsPanel, Panel):
- bl_label = "Sobel Parameters"
- bl_parent_id = "RENDER_PT_lanpr"
- bl_options = {'DEFAULT_CLOSED'}
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_LANPR', 'BLENDER_OPENGL', 'BLENDER_EEVEE'}
-
- @classmethod
- def poll(cls, context):
- scene = context.scene
- lanpr = scene.lanpr
- return scene.render.engine=="BLENDER_LANPR" and lanpr.master_mode == "SNAKE"
-
- def draw(self, context):
- layout = self.layout
- scene = context.scene
- lanpr = scene.lanpr
- layout.prop(lanpr, "depth_clamp")
- layout.prop(lanpr, "depth_strength")
- layout.prop(lanpr, "normal_clamp")
- layout.prop(lanpr, "normal_strength")
- if lanpr.enable_vector_trace == "DISABLED":
- layout.prop(lanpr, "display_thinning_result")
-
-class RENDER_PT_lanpr_snake_settings(RenderButtonsPanel, Panel):
- bl_label = "Snake Settings"
- bl_parent_id = "RENDER_PT_lanpr"
- bl_options = {'DEFAULT_CLOSED'}
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_LANPR', 'BLENDER_OPENGL', 'BLENDER_EEVEE'}
-
- @classmethod
- def poll(cls, context):
- scene = context.scene
- lanpr = scene.lanpr
- return scene.render.engine=="BLENDER_LANPR" and lanpr.master_mode == "SNAKE" and lanpr.enable_vector_trace == "ENABLED"
-
- def draw(self, context):
- layout = self.layout
- scene = context.scene
- lanpr = scene.lanpr
-
- split = layout.split()
- col = split.column()
- col.prop(lanpr, "background_color")
- col = split.column()
- col.prop(lanpr, "line_color")
- layout.prop(lanpr, "line_thickness")
-
- split = layout.split()
- col = split.column()
- col.prop(lanpr, "depth_width_influence")
- col.prop(lanpr, "depth_alpha_influence")
- col = split.column()
- col.prop(lanpr, "depth_width_curve")
- col.prop(lanpr, "depth_alpha_curve")
-
- layout.label(text="Taper:")
- layout.prop(lanpr, "use_same_taper", expand = True)
- if lanpr.use_same_taper == "DISABLED":
- split = layout.split()
- col = split.column(align = True)
- col.label(text="Left:")
- col.prop(lanpr,"taper_left_distance")
- col.prop(lanpr,"taper_left_strength", text="Strength")
- col = split.column(align = True)
- col.label(text="Right:")
- col.prop(lanpr,"taper_right_distance")
- col.prop(lanpr,"taper_right_strength", text="Strength")
- else:
- split = layout.split()
- col = split.column(align = True)
- col.prop(lanpr,"taper_left_distance")
- col.prop(lanpr,"taper_left_strength")
-
- layout.label(text="Tip Extend:")
- layout.prop(lanpr, "enable_tip_extend", expand = True)
- if lanpr.enable_tip_extend == "ENABLED":
- layout.label(text="---INOP---")
- layout.prop(lanpr,"extend_length")
-
class RENDER_PT_lanpr_gpencil(RenderButtonsPanel, Panel):
bl_label = "Grease Pencil"
bl_parent_id = "RENDER_PT_lanpr"
@@ -1128,8 +1047,6 @@ classes = (
RENDER_PT_lanpr_gpencil,
RENDER_PT_lanpr_line_normal_effects,
RENDER_PT_lanpr_line_gpu_effects,
- RENDER_PT_lanpr_snake_sobel_parameters,
- RENDER_PT_lanpr_snake_settings,
RENDER_PT_lanpr_software_chain_styles,
RENDER_PT_lanpr_options,
LANPR_UL_linesets,
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index b28baba714d..c89dd10e217 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -396,12 +396,6 @@ if(WITH_LANPR)
data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl SRC)
data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl SRC)
data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_project_passthrough_vert.glsl SRC)
- data_to_c_simple(engines/lanpr/shaders/lanpr_snake_image_peel_frag.glsl SRC)
- data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_vert.glsl SRC)
- data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_geom.glsl SRC)
- data_to_c_simple(engines/lanpr/shaders/lanpr_snake_line_connection_frag.glsl SRC)
- data_to_c_simple(engines/lanpr/shaders/lanpr_snake_edge_frag.glsl SRC)
- data_to_c_simple(engines/lanpr/shaders/lanpr_snake_multichannel_frag.glsl SRC)
data_to_c_simple(engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl SRC)
data_to_c_simple(engines/lanpr/shaders/lanpr_software_passthrough_vert.glsl SRC)
data_to_c_simple(engines/lanpr/shaders/lanpr_software_chain_geom.glsl SRC)
diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h b/source/blender/draw/engines/lanpr/lanpr_all.h
index 588760d0762..cf7f4837897 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -73,7 +73,6 @@ typedef struct LANPR_PassList {
struct DRWPass *normal_pass;
struct DRWPass *edge_intermediate;
struct DRWPass *edge_thinning;
- struct DRWPass *snake_pass;
/* GPU */
struct DRWPass *dpix_transform_pass;
@@ -131,7 +130,6 @@ typedef struct LANPR_PrivateData {
DRWShadingGroup *multipass_shgrp;
DRWShadingGroup *edge_detect_shgrp;
DRWShadingGroup *edge_thinning_shgrp;
- DRWShadingGroup *snake_shgrp;
DRWShadingGroup *dpix_transform_shgrp;
DRWShadingGroup *dpix_preview_shgrp;
@@ -187,9 +185,6 @@ typedef struct LANPR_PrivateData {
unsigned v_buf;
unsigned i_buf;
unsigned l_buf;
-
- GPUVertFormat snake_gwn_format;
- GPUBatch *snake_batch;
} LANPR_PrivateData;
typedef struct LANPR_StorageList {
@@ -243,14 +238,6 @@ void lanpr_dpix_draw_scene(LANPR_TextureList *txl,
GPUFrameBuffer *DefaultFB,
int is_render);
-void lanpr_snake_draw_scene(LANPR_TextureList *txl,
- LANPR_FramebufferList *fbl,
- LANPR_PassList *psl,
- LANPR_PrivateData *pd,
- SceneLANPR *lanpr,
- GPUFrameBuffer *DefaultFB,
- int is_render);
-
void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render);
int lanpr_dpix_texture_size(SceneLANPR *lanpr);
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 5efd2d93ec8..912906a5c67 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -56,12 +56,6 @@
extern char datatoc_common_fullscreen_vert_glsl[];
extern char datatoc_gpu_shader_3D_smooth_color_vert_glsl[];
extern char datatoc_gpu_shader_3D_smooth_color_frag_glsl[];
-extern char datatoc_lanpr_snake_multichannel_frag_glsl[];
-extern char datatoc_lanpr_snake_edge_frag_glsl[];
-extern char datatoc_lanpr_snake_image_peel_frag_glsl[];
-extern char datatoc_lanpr_snake_line_connection_vert_glsl[];
-extern char datatoc_lanpr_snake_line_connection_frag_glsl[];
-extern char datatoc_lanpr_snake_line_connection_geom_glsl[];
extern char datatoc_lanpr_software_line_chain_geom_glsl[];
extern char datatoc_lanpr_software_chain_geom_glsl[];
extern char datatoc_lanpr_dpix_project_passthrough_vert_glsl[];
@@ -84,28 +78,6 @@ static void lanpr_engine_init(void *ved)
BLI_spin_init(&lanpr_share.lock_render_status);
}
-#if 0 /* Deprecated: snake mode */
- GPU_framebuffer_ensure_config(&fbl->edge_thinning,
- {GPU_ATTACHMENT_LEAVE,
- GPU_ATTACHMENT_TEXTURE(txl->color)});
-
- if (!lanpr_share.edge_detect_shader) {
- lanpr_share.edge_detect_shader = DRW_shader_create(
- datatoc_common_fullscreen_vert_glsl, NULL, datatoc_lanpr_snake_edge_frag_glsl, NULL);
- }
- if (!lanpr_share.edge_thinning_shader) {
- lanpr_share.edge_thinning_shader = DRW_shader_create(
- datatoc_common_fullscreen_vert_glsl, NULL, datatoc_lanpr_snake_image_peel_frag_glsl, NULL);
- }
- if (!lanpr_share.snake_connection_shader) {
- lanpr_share.snake_connection_shader = DRW_shader_create(
- datatoc_lanpr_snake_line_connection_vert_glsl,
- datatoc_lanpr_snake_line_connection_geom_glsl,
- datatoc_lanpr_snake_line_connection_frag_glsl,
- NULL);
- }
-#endif
-
DRW_texture_ensure_fullscreen_2D_multisample(&txl->depth, GPU_DEPTH_COMPONENT32F, 8, 0);
DRW_texture_ensure_fullscreen_2D_multisample(&txl->color, GPU_RGBA32F, 8, 0);
DRW_texture_ensure_fullscreen_2D_multisample(&txl->normal, GPU_RGBA32F, 8, 0);
@@ -191,12 +163,9 @@ static void lanpr_dpix_batch_free(void)
static void lanpr_engine_free(void)
{
DRW_SHADER_FREE_SAFE(lanpr_share.multichannel_shader);
- DRW_SHADER_FREE_SAFE(lanpr_share.snake_connection_shader);
DRW_SHADER_FREE_SAFE(lanpr_share.software_chaining_shader);
DRW_SHADER_FREE_SAFE(lanpr_share.dpix_preview_shader);
DRW_SHADER_FREE_SAFE(lanpr_share.dpix_transform_shader);
- DRW_SHADER_FREE_SAFE(lanpr_share.edge_detect_shader);
- DRW_SHADER_FREE_SAFE(lanpr_share.edge_thinning_shader);
DRW_SHADER_FREE_SAFE(lanpr_share.software_shader);
lanpr_dpix_batch_free();
@@ -256,46 +225,7 @@ static void lanpr_cache_init(void *vedata)
stl->g_data->multipass_shgrp = DRW_shgroup_create(lanpr_share.multichannel_shader,
psl->color_pass);
- if (lanpr->master_mode == LANPR_MASTER_MODE_SNAKE) {
- struct GPUBatch *quad = DRW_cache_fullscreen_quad_get();
-
- psl->edge_intermediate = DRW_pa
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list