Skip to content
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

Consistent naming for nodes #747

Merged
merged 6 commits into from
Mar 8, 2025
Merged

Consistent naming for nodes #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
74b23de
Setting all node names to Title Case + some minor naming fixes
NotArme Jan 30, 2025
17bd0b3
Changed EasySDF to Easy SDF
NotArme Jan 30, 2025
4e4d7f2
Updating aliases for new library names
NotArme Jan 31, 2025
3c0f090
add gray > grey aliases
NotArme Jan 31, 2025
9b2c70a
Added british aliases for color nodes
NotArme Feb 1, 2025
b574e1b
Changes now reflected on documentation
NotArme Mar 4, 2025
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
2 changes: 1 addition & 1 deletion addons/material_maker/engine/nodes/gen_sdf.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func get_type() -> String:
return "sdf"

func get_type_name() -> String:
return "EasySDF"
return "Easy SDF"

func get_filtered_parameter_defs(parameters_filter : String) -> Array:
if parameters_filter == "":
Expand Down
2 changes: 1 addition & 1 deletion addons/material_maker/nodes/adjust_hsv.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
],
"instance": "",
"longdesc": "Adjusts the Hue, Saturation and Value of its input",
"name": "AdjustHSV",
"name": "Adjust HSV",
"outputs": [
{
"longdesc": "Shows the image with adjusted Hue, Saturation and Value",
Expand Down
2 changes: 1 addition & 1 deletion addons/material_maker/nodes/alter_hsv.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
],
"instance": "",
"longdesc": "Alters the Hue, Saturation and Value of its input using 3 map inputs",
"name": "AlterHSV",
"name": "Alter HSV",
"outputs": [
{
"longdesc": "Shows the image with adjusted Hue, Saturation and Value",
Expand Down
2 changes: 1 addition & 1 deletion addons/material_maker/nodes/arc_pavement.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
],
"instance": "",
"longdesc": "Draws a white shape on a black background",
"name": "Arc pavement",
"name": "Arc Pavement",
"outputs": [
{
"f": "pavement($(name_uv)_ap.zw, $bevel, 2.0*$mortar)",
Expand Down
10 changes: 5 additions & 5 deletions addons/material_maker/nodes/bricks.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,23 +219,23 @@
"type": "enum",
"values": [
{
"name": "Running bond",
"name": "Running Bond",
"value": "rb"
},
{
"name": "Running bond (2)",
"name": "Running Bond 2",
"value": "rb2"
},
{
"name": "HerringBone",
"name": "Herringbone",
"value": "hb"
},
{
"name": "Basket weave",
"name": "Basket Weave",
"value": "bw"
},
{
"name": "Spanish bond",
"name": "Spanish Bond",
"value": "sb"
}
]
Expand Down
12 changes: 6 additions & 6 deletions addons/material_maker/nodes/bricks2.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,27 +204,27 @@
"type": "enum",
"values": [
{
"name": "Running bond",
"name": "Running Bond",
"value": "rb"
},
{
"name": "Running bond (2)",
"name": "Running Bond 2",
"value": "rb2"
},
{
"name": "Running bond (3)",
"name": "Running Bond 3",
"value": "rb3"
},
{
"name": "HerringBone",
"name": "Herringbone",
"value": "hb"
},
{
"name": "Basket weave",
"name": "Basket Weave",
"value": "bw"
},
{
"name": "Spanish bond",
"name": "Spanish Bond",
"value": "sb"
}
]
Expand Down
12 changes: 6 additions & 6 deletions addons/material_maker/nodes/bricks3.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,27 +204,27 @@
"type": "enum",
"values": [
{
"name": "Running bond",
"name": "Running Bond",
"value": "rb"
},
{
"name": "Running bond (2)",
"name": "Running Bond 2",
"value": "rb2"
},
{
"name": "Running bond (3)",
"name": "Running Bond 3",
"value": "rb3"
},
{
"name": "HerringBone",
"name": "Herringbone",
"value": "hb"
},
{
"name": "Basket weave",
"name": "Basket Weave",
"value": "bw"
},
{
"name": "Spanish bond",
"name": "Spanish Bond",
"value": "sb"
}
]
Expand Down
4 changes: 2 additions & 2 deletions addons/material_maker/nodes/circle_map.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
],
"instance": "",
"longdesc": "Maps its input into a circle",
"name": "CircleMap",
"name": "Circle Map",
"outputs": [
{
"longdesc": "Shows the remapped image",
Expand Down Expand Up @@ -59,7 +59,7 @@
"type": "float"
}
],
"shortdesc": "CircleMap"
"shortdesc": "Circle Map"
},
"type": "shader"
}
4 changes: 2 additions & 2 deletions addons/material_maker/nodes/edge_detect.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"}"
],
"longdesc": "An edge detect filter that detects edges along all directions and draws them in white on a black background",
"name": "Edge detect",
"name": "Edge Detect",
"outputs": [
{
"f": "clamp(100.0*($(name)_fct($uv)-$threshold), 0.0, 1.0)",
Expand Down Expand Up @@ -87,7 +87,7 @@
"type": "float"
}
],
"shortdesc": "Edge detect"
"shortdesc": "Edge Detect"
},
"type": "shader"
}
4 changes: 2 additions & 2 deletions addons/material_maker/nodes/edge_detect_1.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"}"
],
"longdesc": "An edge detect filter that detects edges along all directions and draws them in white on a black background",
"name": "Edge detect 1",
"name": "Simple Edge Detect",
"outputs": [
{
"f": "clamp($(name)_fct($uv), 0.0, 1.0)",
Expand All @@ -60,7 +60,7 @@
"type": "size"
}
],
"shortdesc": "Edge detect"
"shortdesc": "Edge Detect"
},
"type": "shader"
}
4 changes: 2 additions & 2 deletions addons/material_maker/nodes/edge_detect_2.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"}"
],
"longdesc": "An edge detect filter that detects edges horizontally and vertically and draws them in white on a black background",
"name": "Edge detect 2",
"name": "AA Edge Detect",
"outputs": [
{
"f": "clamp($(name)_fct($uv), 0.0, 1.0)",
Expand All @@ -56,7 +56,7 @@
"type": "size"
}
],
"shortdesc": "Edge detect"
"shortdesc": "Edge Detect"
},
"type": "shader"
}
4 changes: 2 additions & 2 deletions addons/material_maker/nodes/edge_detect_3.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"}"
],
"longdesc": "An edge detect filter that detects edges along diagonals and draws them in white on a black background",
"name": "Edge detect 3",
"name": "Diagonal Edge Detect",
"outputs": [
{
"f": "clamp($(name)_fct($uv), 0.0, 1.0)",
Expand All @@ -56,7 +56,7 @@
"type": "size"
}
],
"shortdesc": "Edge detect"
"shortdesc": "Edge Detect"
},
"type": "shader"
}
10 changes: 5 additions & 5 deletions addons/material_maker/nodes/fbm.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,23 +207,23 @@
"value": "cellular"
},
{
"name": "Cellular2",
"name": "Cellular 2",
"value": "cellular2"
},
{
"name": "Cellular3",
"name": "Cellular 3",
"value": "cellular3"
},
{
"name": "Cellular4",
"name": "Cellular 4",
"value": "cellular4"
},
{
"name": "Cellular5",
"name": "Cellular 5",
"value": "cellular5"
},
{
"name": "Cellular6",
"name": "Cellular 6",
"value": "cellular6"
}
]
Expand Down
10 changes: 5 additions & 5 deletions addons/material_maker/nodes/fbm2.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,23 +478,23 @@
"value": "cellular"
},
{
"name": "Cellular2",
"name": "Cellular 2",
"value": "cellular2"
},
{
"name": "Cellular3",
"name": "Cellular 3",
"value": "cellular3"
},
{
"name": "Cellular4",
"name": "Cellular 4",
"value": "cellular4"
},
{
"name": "Cellular5",
"name": "Cellular 5",
"value": "cellular5"
},
{
"name": "Cellular6",
"name": "Cellular 6",
"value": "cellular6"
},
{
Expand Down
4 changes: 2 additions & 2 deletions addons/material_maker/nodes/fill_from_colors.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"to_port": 0
}
],
"label": "Fill from colors",
"label": "Fill from Colors",
"longdesc": "Fills areas defined by different colors in its input",
"name": "fill_from_colors",
"node_position": {
Expand Down Expand Up @@ -345,6 +345,6 @@
"size": 8
},
"seed_int": 0,
"shortdesc": "Fill from colors",
"shortdesc": "Fill from Colors",
"type": "graph"
}
6 changes: 3 additions & 3 deletions addons/material_maker/nodes/fill_to_random_grey.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
}
],
"instance": "",
"longdesc": "A fill companion node that fills each area with a random greyscale value",
"name": "Fill to Random Grey",
"longdesc": "A fill companion node that fills each area with a random grayscale value",
"name": "Fill to Random Gray",
"outputs": [
{
"f": "mix($edgecolor, rand(vec2(float($seed), rand(vec2(rand($(name_uv)_bb.xy), rand($(name_uv)_bb.zw))))), step(0.0000001, dot($(name_uv)_bb.zw, vec2(1.0))))",
Expand All @@ -46,7 +46,7 @@
"type": "float"
}
],
"shortdesc": "Fill to random grey"
"shortdesc": "Fill to random gray"
},
"type": "shader"
}
6 changes: 3 additions & 3 deletions addons/material_maker/nodes/fill_to_random_grey2.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
}
],
"instance": "",
"longdesc": "A fill companion node that fills each area with a random greyscale value",
"name": "Fill to Random Grey",
"longdesc": "A fill companion node that fills each area with a random grayscale value",
"name": "Fill to Random Gray",
"outputs": [
{
"f": "mix($edgecolor, rand(vec2(float($seed), rand(vec2(rand($(name_uv)_bb.xy), rand($(name_uv)_bb.zw))))), step(0.0000001, dot($(name_uv)_bb.zw, vec2(1.0))))",
Expand All @@ -46,7 +46,7 @@
"type": "float"
}
],
"shortdesc": "Fill to random grey"
"shortdesc": "Fill to random gray"
},
"type": "shader"
}
10 changes: 5 additions & 5 deletions addons/material_maker/nodes/greyscale.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
}
],
"instance": "",
"longdesc": "Converts its input into greyscale",
"name": "Greyscale",
"longdesc": "Converts its input into grayscale",
"name": "Grayscale",
"outputs": [
{
"f": "gs_$mode($in($uv))",
"longdesc": "Shows the image converted to greyscale",
"longdesc": "Shows the image converted to grayscale",
"shortdesc": "Output",
"type": "f"
}
Expand All @@ -53,7 +53,7 @@
{
"default": 4,
"label": "",
"longdesc": "The algorithm used to convert the input into greyscale",
"longdesc": "The algorithm used to convert the input into grayscale",
"name": "mode",
"shortdesc": "Mode",
"type": "enum",
Expand Down Expand Up @@ -81,7 +81,7 @@
]
}
],
"shortdesc": "Greyscale"
"shortdesc": "Grayscale"
},
"type": "shader"
}
4 changes: 2 additions & 2 deletions addons/material_maker/nodes/height_to_angle.mmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"}"
],
"longdesc": "Generates an angle map to be used by Advances Tiler nodes from a heightmap",
"name": "Height To Angle",
"name": "Height to Angle",
"outputs": [
{
"f": "$(name)_fct($uv, 0.001)+$angle/180.0",
Expand All @@ -57,7 +57,7 @@
"type": "float"
}
],
"shortdesc": "Height to angle"
"shortdesc": "Height to Angle"
},
"type": "shader"
}
Loading