From bb4cef71eeaf36aa61187d47b8a8ae06ba55f7c0 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Fri, 19 Jun 2020 15:07:13 -0400 Subject: UI: ShaderFx Drag and Drop, Layout Updates This patch implements the list panel system D7490 for grease pencil shader effects. It also moves their drawing to a callback in ShaderFxTypeInfo in line with the extensible architecture refactoring goal T75724. The implementation is basically exactly the same as for the modifier patch (9b099c86123fc82). Thanks to Matias Mendiola (@mendio) for helping to develop the layout changes. Differential Revision: https://developer.blender.org/D7985 --- source/blender/shader_fx/intern/FX_shader_blur.c | 40 +++ .../blender/shader_fx/intern/FX_shader_colorize.c | 47 +++- source/blender/shader_fx/intern/FX_shader_flip.c | 36 +++ source/blender/shader_fx/intern/FX_shader_glow.c | 48 ++++ source/blender/shader_fx/intern/FX_shader_light.c | 10 + source/blender/shader_fx/intern/FX_shader_pixel.c | 38 +++ source/blender/shader_fx/intern/FX_shader_rim.c | 49 ++++ source/blender/shader_fx/intern/FX_shader_shadow.c | 94 +++++++ source/blender/shader_fx/intern/FX_shader_swirl.c | 32 +++ source/blender/shader_fx/intern/FX_shader_wave.c | 35 ++- source/blender/shader_fx/intern/FX_ui_common.c | 272 +++++++++++++++++++++ source/blender/shader_fx/intern/FX_ui_common.h | 56 +++++ 12 files changed, 755 insertions(+), 2 deletions(-) create mode 100644 source/blender/shader_fx/intern/FX_ui_common.c create mode 100644 source/blender/shader_fx/intern/FX_ui_common.h (limited to 'source/blender/shader_fx/intern') diff --git a/source/blender/shader_fx/intern/FX_shader_blur.c b/source/blender/shader_fx/intern/FX_shader_blur.c index 8881f147af8..8e3e7588818 100644 --- a/source/blender/shader_fx/intern/FX_shader_blur.c +++ b/source/blender/shader_fx/intern/FX_shader_blur.c @@ -26,7 +26,20 @@ #include "BLI_math.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + +#include "BKE_context.h" +#include "BKE_screen.h" + +#include "DNA_screen_types.h" + +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + #include "FX_shader_types.h" +#include "FX_ui_common.h" static void initData(ShaderFxData *fx) { @@ -41,6 +54,32 @@ static void copyData(const ShaderFxData *md, ShaderFxData *target) BKE_shaderfx_copydata_generic(md, target); } +static void panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *col; + uiLayout *layout = panel->layout; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + uiLayoutSetPropSep(layout, true); + + uiItemR(layout, &ptr, "samples", 0, NULL, ICON_NONE); + + uiItemR(layout, &ptr, "use_dof_mode", 0, IFACE_("Use Depth of Field"), ICON_NONE); + col = uiLayoutColumn(layout, false); + uiLayoutSetActive(col, !RNA_boolean_get(&ptr, "use_dof_mode")); + uiItemR(col, &ptr, "size", 0, NULL, ICON_NONE); + uiItemR(col, &ptr, "rotation", 0, NULL, ICON_NONE); + + shaderfx_panel_end(layout, &ptr); +} + +static void panelRegister(ARegionType *region_type) +{ + shaderfx_panel_register(region_type, eShaderFxType_Blur, panel_draw); +} + ShaderFxTypeInfo shaderfx_Type_Blur = { /* name */ "Blur", /* structName */ "BlurShaderFxData", @@ -57,4 +96,5 @@ ShaderFxTypeInfo shaderfx_Type_Blur = { /* dependsOnTime */ NULL, /* foreachObjectLink */ NULL, /* foreachIDLink */ NULL, + /* panelRegister */ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_colorize.c b/source/blender/shader_fx/intern/FX_shader_colorize.c index 5fea2cd0ff8..969171332fa 100644 --- a/source/blender/shader_fx/intern/FX_shader_colorize.c +++ b/source/blender/shader_fx/intern/FX_shader_colorize.c @@ -23,11 +23,23 @@ #include -#include "DNA_shader_fx_types.h" +#include "BKE_context.h" +#include "BKE_screen.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + +#include "DNA_screen_types.h" +#include "DNA_shader_fx_types.h" + +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + #include "FX_shader_types.h" +#include "FX_ui_common.h" static void initData(ShaderFxData *fx) { @@ -43,6 +55,38 @@ static void copyData(const ShaderFxData *md, ShaderFxData *target) BKE_shaderfx_copydata_generic(md, target); } +static void panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + int mode = RNA_enum_get(&ptr, "mode"); + + uiLayoutSetPropSep(layout, true); + + uiItemR(layout, &ptr, "mode", 0, NULL, ICON_NONE); + + if (ELEM(mode, eShaderFxColorizeMode_Custom, eShaderFxColorizeMode_Duotone)) { + const char *text = (mode == eShaderFxColorizeMode_Duotone) ? IFACE_("Low Color") : + IFACE_("Color"); + uiItemR(layout, &ptr, "low_color", 0, text, ICON_NONE); + } + if (mode == eShaderFxColorizeMode_Duotone) { + uiItemR(layout, &ptr, "high_color", 0, NULL, ICON_NONE); + } + + uiItemR(layout, &ptr, "factor", 0, NULL, ICON_NONE); + + shaderfx_panel_end(layout, &ptr); +} + +static void panelRegister(ARegionType *region_type) +{ + shaderfx_panel_register(region_type, eShaderFxType_Colorize, panel_draw); +} + ShaderFxTypeInfo shaderfx_Type_Colorize = { /* name */ "Colorize", /* structName */ "ColorizeShaderFxData", @@ -59,4 +103,5 @@ ShaderFxTypeInfo shaderfx_Type_Colorize = { /* dependsOnTime */ NULL, /* foreachObjectLink */ NULL, /* foreachIDLink */ NULL, + /* panelRegister */ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_flip.c b/source/blender/shader_fx/intern/FX_shader_flip.c index b915fb8e591..325d2c2608f 100644 --- a/source/blender/shader_fx/intern/FX_shader_flip.c +++ b/source/blender/shader_fx/intern/FX_shader_flip.c @@ -26,10 +26,22 @@ #include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + +#include "BKE_context.h" +#include "BKE_screen.h" + +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + #include "FX_shader_types.h" +#include "FX_ui_common.h" static void initData(ShaderFxData *fx) { @@ -42,6 +54,29 @@ static void copyData(const ShaderFxData *md, ShaderFxData *target) BKE_shaderfx_copydata_generic(md, target); } +static void panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *row; + uiLayout *layout = panel->layout; + int toggles_flag = UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + uiLayoutSetPropSep(layout, true); + + row = uiLayoutRowWithHeading(layout, true, IFACE_("Axis")); + uiItemR(row, &ptr, "flip_horizontal", toggles_flag, NULL, ICON_NONE); + uiItemR(row, &ptr, "flip_vertical", toggles_flag, NULL, ICON_NONE); + + shaderfx_panel_end(layout, &ptr); +} + +static void panelRegister(ARegionType *region_type) +{ + shaderfx_panel_register(region_type, eShaderFxType_Flip, panel_draw); +} + ShaderFxTypeInfo shaderfx_Type_Flip = { /* name */ "Flip", /* structName */ "FlipShaderFxData", @@ -58,4 +93,5 @@ ShaderFxTypeInfo shaderfx_Type_Flip = { /* dependsOnTime */ NULL, /* foreachObjectLink */ NULL, /* foreachIDLink */ NULL, + /* panelRegister */ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_glow.c b/source/blender/shader_fx/intern/FX_shader_glow.c index 1194e95ce79..4398fdc13bb 100644 --- a/source/blender/shader_fx/intern/FX_shader_glow.c +++ b/source/blender/shader_fx/intern/FX_shader_glow.c @@ -26,14 +26,23 @@ #include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "BLI_math.h" #include "BLI_utildefines.h" +#include "BKE_context.h" #include "BKE_modifier.h" +#include "BKE_screen.h" #include "BKE_shader_fx.h" +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + #include "FX_shader_types.h" +#include "FX_ui_common.h" static void initData(ShaderFxData *md) { @@ -50,6 +59,44 @@ static void copyData(const ShaderFxData *md, ShaderFxData *target) BKE_shaderfx_copydata_generic(md, target); } +static void panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + int mode = RNA_enum_get(&ptr, "mode"); + + uiLayoutSetPropSep(layout, true); + + uiItemR(layout, &ptr, "mode", 0, NULL, ICON_NONE); + + if (mode == eShaderFxGlowMode_Luminance) { + uiItemR(layout, &ptr, "threshold", 0, NULL, ICON_NONE); + } + else { + uiItemR(layout, &ptr, "select_color", 0, NULL, ICON_NONE); + } + uiItemR(layout, &ptr, "glow_color", 0, NULL, ICON_NONE); + + uiItemS(layout); + + uiItemR(layout, &ptr, "blend_mode", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "opacity", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "size", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "rotation", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "samples", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "use_glow_under", 0, NULL, ICON_NONE); + + shaderfx_panel_end(layout, &ptr); +} + +static void panelRegister(ARegionType *region_type) +{ + shaderfx_panel_register(region_type, eShaderFxType_Glow, panel_draw); +} + ShaderFxTypeInfo shaderfx_Type_Glow = { /* name */ "Glow", /* structName */ "GlowShaderFxData", @@ -66,4 +113,5 @@ ShaderFxTypeInfo shaderfx_Type_Glow = { /* dependsOnTime */ NULL, /* foreachObjectLink */ NULL, /* foreachIDLink */ NULL, + /* panelRegister */ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_light.c b/source/blender/shader_fx/intern/FX_shader_light.c index 17d2f518d44..2fd93bff8aa 100644 --- a/source/blender/shader_fx/intern/FX_shader_light.c +++ b/source/blender/shader_fx/intern/FX_shader_light.c @@ -26,14 +26,23 @@ #include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "BLI_utildefines.h" +#include "BKE_context.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" +#include "BKE_screen.h" #include "BKE_shader_fx.h" +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + #include "FX_shader_types.h" +#include "FX_ui_common.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -93,4 +102,5 @@ ShaderFxTypeInfo shaderfx_Type_Light = { /* dependsOnTime */ NULL, /* foreachObjectLink */ foreachObjectLink, /* foreachIDLink */ NULL, + /* panelRegister */ NULL, }; diff --git a/source/blender/shader_fx/intern/FX_shader_pixel.c b/source/blender/shader_fx/intern/FX_shader_pixel.c index 04bf9ae5b6d..b22dae1064d 100644 --- a/source/blender/shader_fx/intern/FX_shader_pixel.c +++ b/source/blender/shader_fx/intern/FX_shader_pixel.c @@ -25,7 +25,20 @@ #include "BLI_utildefines.h" +#include "BLT_translation.h" + +#include "BKE_context.h" +#include "BKE_screen.h" + +#include "DNA_screen_types.h" + +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + #include "FX_shader_types.h" +#include "FX_ui_common.h" static void initData(ShaderFxData *fx) { @@ -39,6 +52,30 @@ static void copyData(const ShaderFxData *md, ShaderFxData *target) BKE_shaderfx_copydata_generic(md, target); } +static void panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *col; + uiLayout *layout = panel->layout; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + uiLayoutSetPropSep(layout, true); + + /* Add the X, Y labels manually because size is a #PROP_PIXEL. */ + col = uiLayoutColumn(layout, true); + PropertyRNA *prop = RNA_struct_find_property(&ptr, "size"); + uiItemFullR(col, &ptr, prop, 0, 0, 0, IFACE_("Size X"), ICON_NONE); + uiItemFullR(col, &ptr, prop, 1, 0, 0, IFACE_("Y"), ICON_NONE); + + shaderfx_panel_end(layout, &ptr); +} + +static void panelRegister(ARegionType *region_type) +{ + shaderfx_panel_register(region_type, eShaderFxType_Pixel, panel_draw); +} + ShaderFxTypeInfo shaderfx_Type_Pixel = { /* name */ "Pixelate", /* structName */ "PixelShaderFxData", @@ -55,4 +92,5 @@ ShaderFxTypeInfo shaderfx_Type_Pixel = { /* dependsOnTime */ NULL, /* foreachObjectLink */ NULL, /* foreachIDLink */ NULL, + /* panelRegister */ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_rim.c b/source/blender/shader_fx/intern/FX_shader_rim.c index 16c6a6716a0..4b3ce0109c3 100644 --- a/source/blender/shader_fx/intern/FX_shader_rim.c +++ b/source/blender/shader_fx/intern/FX_shader_rim.c @@ -23,11 +23,23 @@ #include +#include "DNA_screen_types.h" #include "DNA_shader_fx_types.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + +#include "BKE_context.h" +#include "BKE_screen.h" + +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + #include "FX_shader_types.h" +#include "FX_ui_common.h" static void initData(ShaderFxData *fx) { @@ -46,6 +58,42 @@ static void copyData(const ShaderFxData *md, ShaderFxData *target) BKE_shaderfx_copydata_generic(md, target); } +static void panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + uiLayoutSetPropSep(layout, true); + + uiItemR(layout, &ptr, "rim_color", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "mask_color", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "mode", 0, IFACE_("Blend"), ICON_NONE); + uiItemR(layout, &ptr, "offset", 0, NULL, ICON_NONE); + + shaderfx_panel_end(layout, &ptr); +} + +static void blur_panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + uiLayoutSetPropSep(layout, true); + + uiItemR(layout, &ptr, "blur", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "samples", 0, NULL, ICON_NONE); +} + +static void panelRegister(ARegionType *region_type) +{ + PanelType *panel_type = shaderfx_panel_register(region_type, eShaderFxType_Rim, panel_draw); + shaderfx_subpanel_register(region_type, "blur", "Blur", NULL, blur_panel_draw, panel_type); +} + ShaderFxTypeInfo shaderfx_Type_Rim = { /* name */ "Rim", /* structName */ "RimShaderFxData", @@ -62,4 +110,5 @@ ShaderFxTypeInfo shaderfx_Type_Rim = { /* dependsOnTime */ NULL, /* foreachObjectLink */ NULL, /* foreachIDLink */ NULL, + /* panelRegister */ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.c b/source/blender/shader_fx/intern/FX_shader_shadow.c index dcf66ec89e0..11690d2cca0 100644 --- a/source/blender/shader_fx/intern/FX_shader_shadow.c +++ b/source/blender/shader_fx/intern/FX_shader_shadow.c @@ -26,14 +26,25 @@ #include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + +#include "BKE_context.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" +#include "BKE_screen.h" #include "BKE_shader_fx.h" +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + #include "FX_shader_types.h" +#include "FX_ui_common.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -88,6 +99,88 @@ static void foreachObjectLink(ShaderFxData *fx, walk(userData, ob, &fxd->object, IDWALK_CB_NOP); } +static void panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *row, *col; + uiLayout *layout = panel->layout; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + uiLayoutSetPropSep(layout, true); + + uiItemR(layout, &ptr, "shadow_color", 0, NULL, ICON_NONE); + + /* Add the X, Y labels manually because size is a #PROP_PIXEL. */ + col = uiLayoutColumn(layout, true); + PropertyRNA *prop = RNA_struct_find_property(&ptr, "offset"); + uiItemFullR(col, &ptr, prop, 0, 0, 0, IFACE_("Offset X"), ICON_NONE); + uiItemFullR(col, &ptr, prop, 1, 0, 0, IFACE_("Y"), ICON_NONE); + + uiItemR(layout, &ptr, "scale", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "rotation", 0, NULL, ICON_NONE); + + row = uiLayoutRowWithHeading(layout, true, IFACE_("Object Pivot")); + uiItemR(row, &ptr, "use_object", 0, "", ICON_NONE); + uiItemR(row, &ptr, "object", 0, "", ICON_NONE); + + shaderfx_panel_end(layout, &ptr); +} + +static void blur_panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *col; + uiLayout *layout = panel->layout; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + uiLayoutSetPropSep(layout, true); + + /* Add the X, Y labels manually because size is a #PROP_PIXEL. */ + col = uiLayoutColumn(layout, true); + PropertyRNA *prop = RNA_struct_find_property(&ptr, "blur"); + uiItemFullR(col, &ptr, prop, 0, 0, 0, IFACE_("Blur X"), ICON_NONE); + uiItemFullR(col, &ptr, prop, 1, 0, 0, IFACE_("Y"), ICON_NONE); + + uiItemR(layout, &ptr, "samples", 0, NULL, ICON_NONE); +} + +static void wave_header_draw(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + uiItemR(layout, &ptr, "use_wave", 0, IFACE_("Wave Effect"), ICON_NONE); +} + +static void wave_panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + uiLayoutSetPropSep(layout, true); + + uiLayoutSetActive(layout, RNA_boolean_get(&ptr, "use_wave")); + + uiItemR(layout, &ptr, "orientation", UI_ITEM_R_EXPAND, NULL, ICON_NONE); + uiItemR(layout, &ptr, "amplitude", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "period", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "phase", 0, NULL, ICON_NONE); +} + +static void panelRegister(ARegionType *region_type) +{ + PanelType *panel_type = shaderfx_panel_register(region_type, eShaderFxType_Shadow, panel_draw); + shaderfx_subpanel_register(region_type, "blur", "Blur", NULL, blur_panel_draw, panel_type); + shaderfx_subpanel_register( + region_type, "wave", "", wave_header_draw, wave_panel_draw, panel_type); +} + ShaderFxTypeInfo shaderfx_Type_Shadow = { /* name */ "Shadow", /* structName */ "ShadowShaderFxData", @@ -104,4 +197,5 @@ ShaderFxTypeInfo shaderfx_Type_Shadow = { /* dependsOnTime */ NULL, /* foreachObjectLink */ foreachObjectLink, /* foreachIDLink */ NULL, + /* panelRegister */ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_swirl.c b/source/blender/shader_fx/intern/FX_shader_swirl.c index 990b43748da..65e861fa46f 100644 --- a/source/blender/shader_fx/intern/FX_shader_swirl.c +++ b/source/blender/shader_fx/intern/FX_shader_swirl.c @@ -26,15 +26,24 @@ #include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "BLI_math_base.h" #include "BLI_utildefines.h" +#include "BKE_context.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" +#include "BKE_screen.h" #include "BKE_shader_fx.h" +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + #include "FX_shader_types.h" +#include "FX_ui_common.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -77,6 +86,28 @@ static void foreachObjectLink(ShaderFxData *fx, walk(userData, ob, &fxd->object, IDWALK_CB_NOP); } +static void panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA ptr; + PointerRNA ob_ptr; + shaderfx_panel_get_property_pointers(C, panel, &ob_ptr, &ptr); + + uiLayoutSetPropSep(layout, true); + + uiItemR(layout, &ptr, "object", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "radius", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "angle", 0, NULL, ICON_NONE); + + shaderfx_panel_end(layout, &ptr); +} + +static void panelRegister(ARegionType *region_type) +{ + shaderfx_panel_register(region_type, eShaderFxType_Swirl, panel_draw); +} + ShaderFxTypeInfo shaderfx_Type_Swirl = { /* name */ "Swirl", /* structName */ "SwirlShaderFxData", @@ -93,4 +124,5 @@ ShaderFxTypeInfo shaderfx_Type_Swirl = { /* dependsOnTime */ NULL, /* foreachObjectLink */ foreachObjectLink, /* foreachIDLink */ NULL, + /* panelRegister */ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_shader_wave.c b/source/blender/shader_fx/intern/FX_shader_wave.c index 7dc72bcb669..3b8256edae3 100644 --- a/source/blender/shader_fx/intern/FX_shader_wave.c +++ b/source/blender/shader_fx/intern/FX_shader_wave.c @@ -26,10 +26,20 @@ #include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" + +#include "BKE_context.h" +#include "BKE_screen.h" #include "BLI_utildefines.h" +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + #include "FX_shader_types.h" +#include "FX_ui_common.h" static void initData(ShaderFxData *fx) { @@ -45,8 +55,30 @@ static void copyData(const ShaderFxData *md, ShaderFxData *target) BKE_shaderfx_copydata_generic(md, target); } +static void panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + uiLayoutSetPropSep(layout, true); + + uiItemR(layout, &ptr, "orientation", UI_ITEM_R_EXPAND, NULL, ICON_NONE); + uiItemR(layout, &ptr, "amplitude", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "period", 0, NULL, ICON_NONE); + uiItemR(layout, &ptr, "phase", 0, NULL, ICON_NONE); + + shaderfx_panel_end(layout, &ptr); +} + +static void panelRegister(ARegionType *region_type) +{ + shaderfx_panel_register(region_type, eShaderFxType_Wave, panel_draw); +} + ShaderFxTypeInfo shaderfx_Type_Wave = { - /* name */ "Wave Distortion", + /* name */ "WaveDistortion", /* structName */ "WaveShaderFxData", /* structSize */ sizeof(WaveShaderFxData), /* type */ eShaderFxType_GpencilType, @@ -61,4 +93,5 @@ ShaderFxTypeInfo shaderfx_Type_Wave = { /* dependsOnTime */ NULL, /* foreachObjectLink */ NULL, /* foreachIDLink */ NULL, + /* panelRegister */ panelRegister, }; diff --git a/source/blender/shader_fx/intern/FX_ui_common.c b/source/blender/shader_fx/intern/FX_ui_common.c new file mode 100644 index 00000000000..e02074a92a8 --- /dev/null +++ b/source/blender/shader_fx/intern/FX_ui_common.c @@ -0,0 +1,272 @@ +/* This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** \file + * \ingroup modifiers + */ + +#include + +#include "BLI_listbase.h" + +#include "MEM_guardedalloc.h" + +#include "BKE_context.h" +#include "BKE_object.h" +#include "BKE_screen.h" +#include "BKE_shader_fx.h" + +#include "DNA_object_types.h" +#include "DNA_scene_types.h" +#include "DNA_screen_types.h" +#include "DNA_shader_fx_types.h" +#include "DNA_space_types.h" + +#include "ED_object.h" + +#include "BLT_translation.h" + +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + +#include "WM_api.h" +#include "WM_types.h" + +#include "FX_ui_common.h" /* Self include */ + +static Object *get_context_object(const bContext *C) +{ + SpaceProperties *sbuts = CTX_wm_space_properties(C); + if (sbuts != NULL && (sbuts->pinid != NULL) && GS(sbuts->pinid->name) == ID_OB) { + return (Object *)sbuts->pinid; + } + else { + return CTX_data_active_object(C); + } +} + +/* -------------------------------------------------------------------- */ +/** \name Panel Drag and Drop, Expansion Saving + * \{ */ + +/** + * Move an effect to the index it's moved to after a drag and drop. + */ +static void shaderfx_reorder(bContext *C, Panel *panel, int new_index) +{ + Object *ob = get_context_object(C); + + ShaderFxData *fx = BLI_findlink(&ob->shader_fx, panel->runtime.list_index); + PointerRNA props_ptr; + wmOperatorType *ot = WM_operatortype_find("OBJECT_OT_shaderfx_move_to_index", false); + WM_operator_properties_create_ptr(&props_ptr, ot); + RNA_string_set(&props_ptr, "shaderfx", fx->name); + RNA_int_set(&props_ptr, "index", new_index); + WM_operator_name_call_ptr(C, ot, WM_OP_INVOKE_DEFAULT, &props_ptr); +} + +/** + * Get the expand flag from the active effect to use for the panel. + */ +static short get_shaderfx_expand_flag(const bContext *C, Panel *panel) +{ + Object *ob = get_context_object(C); + ShaderFxData *fx = BLI_findlink(&ob->shader_fx, panel->runtime.list_index); + return fx->ui_expand_flag; +} + +/** + * Save the expand flag for the panel and subpanels to the effect. + */ +static void set_shaderfx_expand_flag(const bContext *C, Panel *panel, short expand_flag) +{ + Object *ob = get_context_object(C); + ShaderFxData *fx = BLI_findlink(&ob->shader_fx, panel->runtime.list_index); + fx->ui_expand_flag = expand_flag; +} + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name ShaderFx Panel Layouts + * \{ */ + +/** + * Draw shaderfx error message. + */ +void shaderfx_panel_end(uiLayout *layout, PointerRNA *ptr) +{ + ShaderFxData *fx = ptr->data; + if (fx->error) { + uiLayout *row = uiLayoutRow(layout, false); + uiItemL(row, IFACE_(fx->error), ICON_ERROR); + } +} + +/** + * Gets RNA pointers for the active object and the panel's shaderfx data. + */ +void shaderfx_panel_get_property_pointers(const bContext *C, + Panel *panel, + PointerRNA *r_ob_ptr, + PointerRNA *r_md_ptr) +{ + Object *ob = get_context_object(C); + ShaderFxData *md = BLI_findlink(&ob->shader_fx, panel->runtime.list_index); + + RNA_pointer_create(&ob->id, &RNA_ShaderFx, md, r_md_ptr); + + if (r_ob_ptr != NULL) { + RNA_pointer_create(&ob->id, &RNA_Object, ob, r_ob_ptr); + } + + uiLayoutSetContextPointer(panel->layout, "shaderfx", r_md_ptr); +} + +#define ERROR_LIBDATA_MESSAGE TIP_("External library data") + +static void shaderfx_panel_header(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + bool narrow_panel = (panel->sizex < UI_UNIT_X * 7 && panel->sizex != 0); + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + Object *ob = get_context_object(C); + ShaderFxData *fx = (ShaderFxData *)ptr.data; + + const ShaderFxTypeInfo *fxti = BKE_shaderfx_get_info(fx->type); + + UI_block_lock_set(uiLayoutGetBlock(layout), (ob && ID_IS_LINKED(ob)), ERROR_LIBDATA_MESSAGE); + + /* Effect type icon. */ + uiLayout *row = uiLayoutRow(layout, false); + if (fxti->isDisabled && fxti->isDisabled(fx, 0)) { + uiLayoutSetRedAlert(row, true); + } + uiItemL(row, "", RNA_struct_ui_icon(ptr.type)); + + /* Effect name. */ + row = uiLayoutRow(layout, true); + if (!narrow_panel) { + uiItemR(row, &ptr, "name", 0, "", ICON_NONE); + } + + /* Mode enabling buttons. */ + if (fxti->flags & eShaderFxTypeFlag_SupportsEditmode) { + uiLayout *sub = uiLayoutRow(row, true); + uiLayoutSetActive(sub, false); + uiItemR(sub, &ptr, "show_in_editmode", 0, "", ICON_NONE); + } + uiItemR(row, &ptr, "show_viewport", 0, "", ICON_NONE); + uiItemR(row, &ptr, "show_render", 0, "", ICON_NONE); + + row = uiLayoutRow(row, false); + uiLayoutSetEmboss(row, UI_EMBOSS_NONE); + uiItemO(row, "", ICON_X, "OBJECT_OT_shaderfx_remove"); + + /* Some padding so the X isn't too close to the drag icon. */ + uiItemS(layout); +} + +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name ShaderFx Registration Helpers + * \{ */ + +static bool shaderfx_ui_poll(const bContext *C, PanelType *UNUSED(pt)) +{ + Object *ob = get_context_object(C); + + return (ob != NULL) && (ob->type == OB_GPENCIL); +} + +/** + * Create a panel in the context's region + */ +PanelType *shaderfx_panel_register(ARegionType *region_type, ShaderFxType type, PanelDrawFn draw) +{ + + /* Get the name for the effect's panel. */ + char panel_idname[BKE_ST_MAXNAME]; + BKE_shaderfxType_panel_id(type, panel_idname); + + PanelType *panel_type = MEM_callocN(sizeof(PanelType), panel_idname); + + strcpy(panel_type->idname, panel_idname); + strcpy(panel_type->label, ""); + strcpy(panel_type->context, "shaderfx"); + strcpy(panel_type->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA); + + panel_type->draw_header = shaderfx_panel_header; + panel_type->draw = draw; + panel_type->poll = shaderfx_ui_poll; + + /* Give the panel the special flag that says it was built here and corresponds to a + * shader effect rather than a PanelType. */ + panel_type->flag = PNL_LAYOUT_HEADER_EXPAND | PNL_DRAW_BOX | PNL_INSTANCED; + panel_type->reorder = shaderfx_reorder; + panel_type->get_list_data_expand_flag = get_shaderfx_expand_flag; + panel_type->set_list_data_expand_flag = set_shaderfx_expand_flag; + + BLI_addtail(®ion_type->paneltypes, panel_type); + + return panel_type; +} + +/** + * Add a child panel to the parent. + * + * \note To create the panel type's idname, it appends the \a name argument to the \a parent's + * idname. + */ +PanelType *shaderfx_subpanel_register(ARegionType *region_type, + const char *name, + const char *label, + PanelDrawFn draw_header, + PanelDrawFn draw, + PanelType *parent) +{ + /* Create the subpanel's ID name. */ + char panel_idname[BKE_ST_MAXNAME]; + strcpy(panel_idname, parent->idname); + strcat(panel_idname, "_"); + strcat(panel_idname, name); + + PanelType *panel_type = MEM_callocN(sizeof(PanelType), panel_idname); + + strcpy(panel_type->idname, panel_idname); + strcpy(panel_type->label, label); + strcpy(panel_type->context, "shaderfx"); + strcpy(panel_type->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA); + + panel_type->draw_header = draw_header; + panel_type->draw = draw; + panel_type->poll = shaderfx_ui_poll; + panel_type->flag = (PNL_DEFAULT_CLOSED | PNL_DRAW_BOX); + + BLI_assert(parent != NULL); + strcpy(panel_type->parent_id, parent->idname); + panel_type->parent = parent; + BLI_addtail(&parent->children, BLI_genericNodeN(panel_type)); + BLI_addtail(®ion_type->paneltypes, panel_type); + + return panel_type; +} + +/** \} */ diff --git a/source/blender/shader_fx/intern/FX_ui_common.h b/source/blender/shader_fx/intern/FX_ui_common.h new file mode 100644 index 00000000000..877855b98e4 --- /dev/null +++ b/source/blender/shader_fx/intern/FX_ui_common.h @@ -0,0 +1,56 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** \file + * \ingroup modifiers + */ + +#ifndef __FX_UI_COMMON_H__ +#define __FX_UI_COMMON_H__ + +#include "FX_shader_types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +struct ARegionType; +struct bContext; +struct PanelType; +struct uiLayout; +typedef void (*PanelDrawFn)(const bContext *, Panel *); + +void shaderfx_panel_end(struct uiLayout *layout, PointerRNA *ptr); + +void shaderfx_panel_get_property_pointers(const bContext *C, + struct Panel *panel, + struct PointerRNA *r_ob_ptr, + struct PointerRNA *r_ptr); + +PanelType *shaderfx_panel_register(ARegionType *region_type, ShaderFxType type, PanelDrawFn draw); + +struct PanelType *shaderfx_subpanel_register(struct ARegionType *region_type, + const char *name, + const char *label, + PanelDrawFn draw_header, + PanelDrawFn draw, + struct PanelType *parent); + +#ifdef __cplusplus +} +#endif + +#endif /* __FX_UI_COMMON_H__ */ -- cgit v1.2.3