Standardize wavelet noise offset parameter

addons/material_maker/nodes/wavelet_noise2.mmg

@@ -0,0 +1,172 @@
+{
+	"name": "wavelet_noise",
+	"node_position": {
+		"x": 0,
+		"y": 0
+	},
+	"parameters": {
+		"frequency": 2,
+		"iterations": 3,
+		"offset": 0,
+		"persistence": 0.5,
+		"scale_x": 1,
+		"scale_y": 1,
+		"type": 0
+	},
+	"seed_int": 1742167584,
+	"shader_model": {
+		"code": "",
+		"global": [
+			"float wavelet(vec2 uv, vec2 size, float s, float frequency, float offset) {",
+			"\tuv = mod(uv, size);",
+			"\tvec2 seed = fract(floor(uv)*0.1236754+vec2(s));",
+			"\tuv = fract(uv);",
+			"\tvec2 ruv = uv-0.5;",
+			"\tfloat a = rand(seed)*6.28;",
+			"\tfloat ca = cos(a);",
+			"\tfloat sa = sin(a);",
+			"\truv = vec2(ca*ruv.x + sa*ruv.y, -sa*ruv.x + ca*ruv.y);",
+			"\treturn (0.5*sin(ruv.x*6.28*frequency+offset)+0.5)*max(0.0, 1.0-2.0*length(uv-vec2(0.5)));",
+			"}",
+			"",
+			"float wavelet_noise(vec2 uv, vec2 size, int iterations, float persistence, float seed, float frequency, float offset, float type) {",
+			"\tfloat rv = 0.0;",
+			"\tfloat acc = 0.0;",
+			"\tvec2 seed2 = rand2(vec2(seed));",
+			"\tvec2 local_uv = uv * size;",
+			"\tfloat q = 1.0;",
+			"\tfor (int i = 0; i < iterations; ++i) {",
+			"\t\trv += q*wavelet(local_uv, size, seed, frequency, offset * 6.28318530718);",
+			"\t\trv += q*wavelet(local_uv+vec2(0.5), size, seed+0.1, frequency, offset * 6.28318530718);",
+			"\t\tacc += q;",
+			"\t\tif (type > 0.0) {",
+			"\t\t\tlocal_uv += type*uv;",
+			"\t\t\tsize += vec2(type);",
+			"\t\t} else {",
+			"\t\t\tlocal_uv *= -type;",
+			"\t\t\tsize *= -type;",
+			"\t\t}",
+			"\t\tlocal_uv += seed2; ",
+			"\t\tseed2 = rand2(seed2);",
+			"\t\tq *= persistence;",
+			"\t\tseed += 0.1;",
+			"\t}",
+			"\treturn rv / acc;",
+			"}"
+		],
+		"inputs": [
+
+		],
+		"instance": "",
+		"longdesc": "Generates several octaves of greyscale wavelet noise",
+		"name": "Wavelet Noise",
+		"outputs": [
+			{
+				"f": "wavelet_noise($(uv), vec2($(scale_x), $(scale_y)), int($(iterations)), $(persistence), $(seed), $frequency, $offset, $type)",
+				"longdesc": "Shows a greyscale wavelet noise",
+				"shortdesc": "Output",
+				"type": "f"
+			}
+		],
+		"parameters": [
+			{
+				"default": 4,
+				"label": "Type",
+				"name": "type",
+				"type": "enum",
+				"values": [
+					{
+						"name": "Add 1",
+						"value": "1"
+					},
+					{
+						"name": "Add 2",
+						"value": "2"
+					},
+					{
+						"name": "Add 3",
+						"value": "3"
+					},
+					{
+						"name": "Mult 2",
+						"value": "-2"
+					},
+					{
+						"name": "Mult 3",
+						"value": "-3"
+					}
+				]
+			},
+			{
+				"control": "None",
+				"default": 4,
+				"label": "Scale X",
+				"longdesc": "The scale along the X axis",
+				"max": 32,
+				"min": 1,
+				"name": "scale_x",
+				"shortdesc": "Scale.x",
+				"step": 1,
+				"type": "float"
+			},
+			{
+				"control": "None",
+				"default": 4,
+				"label": "Scale Y",
+				"longdesc": "The scale along the Y axis",
+				"max": 32,
+				"min": 1,
+				"name": "scale_y",
+				"shortdesc": "Scale.y",
+				"step": 1,
+				"type": "float"
+			},
+			{
+				"control": "None",
+				"default": 3,
+				"label": "Iterations",
+				"longdesc": "The number of octaves (higher values might affect performance)",
+				"max": 10,
+				"min": 1,
+				"name": "iterations",
+				"shortdesc": "Octaves",
+				"step": 1,
+				"type": "float"
+			},
+			{
+				"control": "None",
+				"default": 0.5,
+				"label": "Persistence",
+				"longdesc": "The persistence between two consecutive octaves",
+				"max": 1,
+				"min": 0,
+				"name": "persistence",
+				"shortdesc": "Persistence",
+				"step": 0.01,
+				"type": "float"
+			},
+			{
+				"control": "None",
+				"default": 1,
+				"label": "Frequency",
+				"max": 2,
+				"min": 0,
+				"name": "frequency",
+				"step": 0.01,
+				"type": "float"
+			},
+			{
+				"control": "None",
+				"default": 0,
+				"label": "Offset",
+				"max": 1,
+				"min": 0,
+				"name": "offset",
+				"step": 0.01,
+				"type": "float"
+			}
+		],
+		"shortdesc": "Wavelet Noise"
+	},
+	"type": "shader"
+}

material_maker/library/base.json

@@ -7121,7 +7121,7 @@
 		{
 			"display_name": "Wavelet",
 			"icon_data": "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",
-			"name": "wavelet_noise",
+			"name": "wavelet_noise2",
 			"parameters": {
 				"frequency": 2,
 				"iterations": 2,
@@ -7134,7 +7134,7 @@
 			"seed": 0.039562,
 			"seed_locked": false,
 			"tree_item": "Noise/Wavelet",
-			"type": "wavelet_noise"
+			"type": "wavelet_noise2"
 		},
 		{
 			"display_name": "Palettize",