Skip to content

Don't output black when sigma is zero in directional blur #1416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
williamchange wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't output black when sigma is zero in directional blur #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
285 changes: 285 additions & 0 deletions addons/material_maker/nodes/directional_blur2.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,285 @@
{
"connections": [
{
"from": "gen_inputs",
"from_port": 0,
"to": "buffer",
"to_port": 0
},
{
"from": "buffer",
"from_port": 0,
"to": "edge_detect_3_3_2",
"to_port": 0
},
{
"from": "edge_detect_3_3_2",
"from_port": 0,
"to": "gen_outputs",
"to_port": 0
},
{
"from": "gen_inputs",
"from_port": 1,
"to": "edge_detect_3_3_2",
"to_port": 1
}
],
"label": "Directional Blur",
"longdesc": "Applies a directional gaussian blur to its input",
"name": "directional_blur",
"node_position": {
"x": 0,
"y": 0
},
"nodes": [
{
"name": "buffer",
"node_position": {
"x": -364.25,
"y": -255.75
},
"parameters": {
"lod": 0,
"size": 9
},
"seed": 20527,
"type": "buffer"
},
{
"name": "gen_parameters",
"node_position": {
"x": -456.666626,
"y": -433.666656
},
"parameters": {
"param0": 9,
"param1": 50,
"param2": 45,
"param3": 0
},
"seed": 343,
"type": "remote",
"widgets": [
{
"label": "Grid size",
"linked_widgets": [
{
"node": "buffer",
"widget": "size"
},
{
"node": "edge_detect_3_3_2",
"widget": "size"
}
],
"longdesc": "The resolution of the input",
"name": "param0",
"shortdesc": "Size",
"type": "linked_control"
},
{
"label": "Mode",
"linked_widgets": [
{
"node": "edge_detect_3_3_2",
"widget": "mode"
}
],
"longdesc": "Controls whether the blur moves in both directions or only in one.",
"name": "param3",
"shortdesc": "Mode",
"type": "linked_control"
},
{
"label": "Sigma",
"linked_widgets": [
{
"node": "edge_detect_3_3_2",
"widget": "sigma"
}
],
"longdesc": "The strength of the blur filter",
"name": "param1",
"shortdesc": "Sigma",
"type": "linked_control"
},
{
"label": "Angle",
"linked_widgets": [
{
"node": "edge_detect_3_3_2",
"widget": "angle"
}
],
"longdesc": "The angle of the directional blur effect",
"name": "param2",
"shortdesc": "Angle",
"type": "linked_control"
}
]
},
{
"name": "gen_inputs",
"node_position": {
"x": -779.666626,
"y": -247.392853
},
"parameters": {

},
"ports": [
{
"group_size": 0,
"longdesc": "The input image",
"name": "in",
"shortdesc": "Input",
"type": "rgba"
},
{
"group_size": 0,
"longdesc": "A map that controls the strength of the blur filter",
"name": "amount",
"shortdesc": "Strength map",
"type": "f"
}
],
"seed": 91624,
"seed_locked": true,
"type": "ios"
},
{
"name": "gen_outputs",
"node_position": {
"x": -45.452393,
"y": -195.392853
},
"parameters": {

},
"ports": [
{
"group_size": 0,
"longdesc": "Shows the generated blurred image",
"name": "port0",
"shortdesc": "Output",
"type": "rgba"
}
],
"seed": 30896,
"type": "ios"
},
{
"name": "edge_detect_3_3_2",
"node_position": {
"x": -357.725464,
"y": -153.178955
},
"parameters": {
"angle": 45,
"mode": 0,
"sigma": 50,
"size": 9
},
"seed": -47470,
"seed_locked": true,
"shader_model": {
"code": "",
"global": "",
"inputs": [
{
"default": "vec4(1.0)",
"function": true,
"label": "",
"name": "in",
"type": "rgba"
},
{
"default": "1.0",
"function": true,
"label": "",
"name": "amount",
"type": "f"
}
],
"instance": [
"vec4 $(name)_fct(vec2 uv) {",
"\tvec2 e = vec2(cos($angle*0.01745329251), -sin($angle*0.01745329251))/$size;",
"\tvec4 rv = vec4(0.0);",
"\tfloat sum = 0.0;",
"\tfloat sigma = max($sigma*$amount(uv), 1e-5);",
"\tfor (float i = $mode; i <= 50.0; i += 1.0) {",
"\t\tfloat coef = exp(-0.5*(pow(i/sigma, 2.0)))/(6.28318530718*sigma*sigma);",
"\t\trv += $in(uv+i*e)*coef;",
"\t\tsum += coef;",
"\t}",
"\treturn rv/sum;",
"}"
],
"name": "Directional Blur",
"outputs": [
{
"rgba": "$(name)_fct($uv)",
"type": "rgba"
}
],
"parameters": [
{
"default": 9,
"first": 4,
"label": "Size",
"last": 12,
"name": "size",
"type": "size"
},
{
"default": 0,
"label": "Mode",
"name": "mode",
"type": "enum",
"values": [
{
"name": "Both",
"value": "-50.0"
},
{
"name": "Single",
"value": "0.0"
}
]
},
{
"control": "None",
"default": 0.5,
"label": "Sigma",
"max": 50,
"min": 0,
"name": "sigma",
"step": 0.1,
"type": "float"
},
{
"control": "None",
"default": 0,
"label": "Angle",
"max": 180,
"min": -180,
"name": "angle",
"step": 0.1,
"type": "float"
}
]
},
"type": "shader"
}
],
"parameters": {
"param0": 9,
"param1": 50,
"param2": 45,
"param3": 0
},
"seed_int": 0,
"shortdesc": "Directional blur",
"type": "graph"
}
6 changes: 3 additions & 3 deletions material_maker/library/base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2871,14 +2871,14 @@
"display_name": "Directional",
"icon": "filter_blur_directional",
"icon_data": "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",
"name": "directional_blur",
"name": "directional_blur2",
"parameters": {
"param0": 9.0,
"param1": 50.0,
"param2": 45.0
},
"tree_item": "Filter/Blur/Directional",
"type": "directional_blur"
"type": "directional_blur2"
},
{
"display_name": "Slope",
Expand Down Expand Up @@ -8093,4 +8093,4 @@
}
],
"name": "Base library"
}
}