Merge branch 'master' into lazy-connect

Author: williamchange

.github/workflows/dev-desktop-builds.yml

@@ -19,9 +19,9 @@ on:
         default: "true"
 
 env:
-  GODOT_VERSION: 4.5.1
+  GODOT_VERSION: 4.6.1
   GODOT_SUB: stable
-  GODOT_DOWNLOAD_DIR: https://github.com/godotengine/godot-builds/releases/download/4.5.1-stable
+  GODOT_DOWNLOAD_DIR: https://github.com/godotengine/godot-builds/releases/download/4.6.1-stable
   EXPORT_NAME: material_maker
   MM_RELEASE: 1_6
 

addons/material_maker/engine/loader.gd

@@ -1,4 +1,5 @@
 @tool
+class_name MMLoader
 extends Node
 
 var predefined_generators : Dictionary = {}
@@ -157,20 +158,50 @@ static func string_to_dict_tree(string_data : String) -> Dictionary:
 static func dict_tree_to_string(data : Dictionary) -> String:
 	return JSON.stringify(replace_multiline_strings_with_arrays(data.duplicate(true)), "\t", true)
 
+static func interpret_file_name(file_name : String, path : String = "", file_extension : String = "", node : MMGenBase = null, additional_identifiers : Dictionary[String, String] = {}, resolution : String = "") -> String:
+	for i in additional_identifiers:
+		file_name = file_name.replace(i, additional_identifiers[i])
+
+	if node and node.has_meta("file_path"):
+		var save_path : String = node.get_meta("file_path")
+		file_name = file_name.replace("$project", save_path.get_file().trim_suffix("."+save_path.get_extension()))
+	else:
+		file_name = file_name.replace("$project", "unnamed_project")
+
+	if file_extension != "" and not file_name.ends_with(file_extension):
+		file_name += file_extension
+
+	if resolution:
+		file_name = file_name.replace("$resolution", resolution)
+
+	if "$idx" in file_name:
+		if path:
+			var idx := 1
+			while FileAccess.file_exists(path.path_join(file_name).replace("$idx", str(idx).pad_zeros(2))):
+				idx += 1
+			file_name = file_name.replace("$idx", str(idx).pad_zeros(2))
+		else:
+			file_name = file_name.replace("$idx", str(1).pad_zeros(2))
+
+	return file_name
+
 func load_gen(filename: String) -> MMGenBase:
 	var file : FileAccess = FileAccess.open(filename, FileAccess.READ)
 	if file != null:
 		var data = string_to_dict_tree(file.get_as_text())
 		if data != null:
 			current_project_path = filename.get_base_dir()
 			var generator = await create_gen(data)
+			if generator:
+				generator.set_meta("file_path", filename)
 			current_project_path = ""
 			return generator
 	return null
 
 func save_gen(filename : String, generator : MMGenBase) -> void:
 	var file : FileAccess = FileAccess.open(filename, FileAccess.WRITE)
 	if file != null:
+		generator.set_meta("file_path", filename)
 		var data = generator.serialize()
 		data.name = filename.get_file().get_basename()
 		data.node_position = { x=0, y=0 }

addons/material_maker/engine/nodes/gen_export.gd

@@ -65,20 +65,22 @@ func get_image_format() -> String:
 			return "exr"
 		_: return "png"
 
-func interpret_file_name(file_name: String, path:="") -> String:
-	var additional_ids := { "$node":"unnamed" }
+func interpret_file_name(file_name : String, path : String = "") -> String:
+	var additional_ids : Dictionary[String, String] = { "$node": "unnamed" }
 
 	if "$node" in file_name:
-		var graph : MMGraphEdit = mm_globals.main_window.get_current_graph_edit()
-		if graph != null:
-			for c in graph.connections:
-				if c.to_node == "node_" + name:
-					var node_title : String = graph.get_node(NodePath(c.from_node)).title
-					additional_ids["$node"] = node_title.to_snake_case()
-					break
-
-	var resolution := str(get_image_size())
-	return mm_globals.interpret_file_name(file_name, path, "."+get_image_format(), additional_ids, resolution)
+		var source_port : OutputPort = get_source(0)
+		if source_port != null:
+			var source_node : MMGenBase = source_port.generator
+			if source_node:
+				additional_ids["$node"] = source_node.get_type_name().to_snake_case()
+	
+	var graph_node : MMGenBase = self
+	while graph_node.get_parent() is MMGenBase:
+		graph_node = graph_node.get_parent()
+	
+	var resolution : String = str(get_image_size())
+	return MMLoader.interpret_file_name(file_name, path, "."+get_image_format(), graph_node, additional_ids, resolution)
 
 func export_material(prefix : String, _profile : String, size : int = 0, command_line : bool = false) -> void:
 	if size == 0:
@@ -87,7 +89,7 @@ func export_material(prefix : String, _profile : String, size : int = 0, command
 	if source != null:
 		var texture : MMTexture = await source.generator.render_output_to_texture(source.output_index, Vector2i(size, size))
 		if parameters.suffix != "":
-			var filename := interpret_file_name(parameters.suffix, prefix.get_base_dir())
+			var filename : String = interpret_file_name(parameters.suffix, prefix.get_base_dir())
 			await texture.save_to_file(prefix.get_base_dir().path_join(filename))
 		else:
 			await texture.save_to_file("%s.%s" % [ prefix, get_image_format() ])

addons/material_maker/engine/paths.gd

@@ -7,7 +7,7 @@ const WEBSITE_ADDRESS : String = "https://www.materialmaker.org"
 const STD_GENDEF_PATH = "res://addons/material_maker/nodes"
 
 static func get_resource_dir() -> String:
-	if OS.has_feature("editor"):
+	if Engine.is_editor_hint():
 		return ProjectSettings.globalize_path("res://material_maker")
 	return OS.get_executable_path().get_base_dir()
 

addons/material_maker/nodes/color_pick.mmg

@@ -0,0 +1,77 @@
+{
+	"name": "color_pick",
+	"node_position": {
+		"x": 0,
+		"y": 0
+	},
+	"parameters": {
+
+	},
+	"seed_int": 0,
+	"shader_model": {
+		"code": "",
+		"global": "",
+		"inputs": [
+			{
+				"default": "vec3(1.0)",
+				"label": "",
+				"longdesc": "The input ID map",
+				"name": "in",
+				"shortdesc": "Input",
+				"type": "rgb"
+			}
+		],
+		"instance": "",
+		"longdesc": "Pick colors from an input ID map",
+		"name": "Color Pick",
+		"outputs": [
+			{
+				"f": "1.0 - clamp((dot(abs($in($uv) - $color#.rgb), vec3(1.0/3.0)) - $threshold) / max($falloff, 0.00001), 0.0, 1.0)",
+				"longdesc": "Output mask corresponding to the picked color",
+				"shortdesc": "Output #",
+				"type": "f"
+			}
+		],
+		"parameters": [
+			{
+				"default": {
+					"a": 1,
+					"b": 1,
+					"g": 1,
+					"r": 1
+				},
+				"label": "",
+				"longdesc": "Color to pick from the ID map",
+				"name": "color#",
+				"shortdesc": "Color #",
+				"type": "color"
+			},
+			{
+				"control": "None",
+				"default": 0.01,
+				"label": "Threshold",
+				"longdesc": "Controls the sensitivity of color matching. Higher values will match more colors.",
+				"max": 1,
+				"min": 0,
+				"name": "threshold",
+				"shortdesc": "Threshold",
+				"step": 0.01,
+				"type": "float"
+			},
+			{
+				"control": "None",
+				"default": 0,
+				"label": "Falloff",
+				"longdesc": "Controls the softness of the output mask. Set to 0 to output a binary black/white image.",
+				"max": 1,
+				"min": 0,
+				"name": "falloff",
+				"shortdesc": "Falloff",
+				"step": 0.01,
+				"type": "float"
+			}
+		],
+		"shortdesc": "Pick colors"
+	},
+	"type": "shader"
+}