Merge branch 'master' into filepath-resolution

Author: williamchange

addons/material_maker/engine/nodes/gen_iterate_buffer.gd

@@ -104,6 +104,8 @@ func update_shaders() -> void:
 		require_shaders_update = true
 
 func do_update_shaders() -> void:
+	if not is_inside_tree():
+		return
 	require_shaders_update = false
 	var sources : Array[ShaderCode] = [null, null]
 	var new_is_greyscale = true

addons/material_maker/engine/nodes/gen_material.gd

@@ -709,7 +709,13 @@ func export_material(prefix : String, profile : String, size : int = 0) -> void:
 			"texture":
 				# Wait until the render queue is empty
 				if mm_deps.get_render_queue_size() > 0:
-					await mm_deps.render_queue_empty
+					var render_queue_size : int = mm_deps.get_render_queue_size()
+					while true:
+						mm_deps.update()
+						await get_tree().process_frame
+						if render_queue_size == mm_deps.get_render_queue_size():
+							break
+						render_queue_size = mm_deps.get_render_queue_size()
 				var file_name = subst_string(f.file_name, export_context)
 				var output_index : int
 				if f.has("output"):

material_maker/panels/graph_edit/graph_edit.gd

@@ -1327,7 +1327,7 @@ func add_reroute_to_input(node : MMGraphNodeMinimal, port_index : int) -> void:
 	if ! removed:
 		var global_scale = Vector2(1, 1) # node.get_global_transform().get_scale()
 		var port_position = node.position_offset+node.get_input_port_position(port_index)/global_scale
-		var reroute_position = port_position+Vector2(-74, -12)
+		var reroute_position = port_position+Vector2(-74, -31)
 		var reroute_node = {name="reroute",type="reroute",node_position={x=reroute_position.x,y=reroute_position.y}}
 		for c2 in get_connection_list():
 			if c2.to_node == node.name and c2.to_port == port_index:
@@ -1360,7 +1360,7 @@ func add_reroute_to_output(node : MMGraphNodeMinimal, port_index : int) -> void:
 	if !reroutes:
 		var global_scale = Vector2(1, 1) # node.get_global_transform().get_scale()
 		var port_position = node.position_offset+node.get_output_port_position(port_index)/global_scale
-		var reroute_position = port_position+Vector2(50, -12)
+		var reroute_position = port_position+Vector2(50, -31)
 		var reroute_node = {name="reroute",type="reroute",node_position={x=reroute_position.x,y=reroute_position.y}}
 		var reroute_connections = [ { from=node.generator.name, from_port=port_index, to="reroute", to_port=0 }]
 		for d in destinations:

material_maker/panels/preview_3d/export_menu.gd

@@ -96,3 +96,7 @@ func interpret_map_file_name(file_name: String, path:="") -> String:
 	var resolution := str(256 << MapResolution.selected)
 
 	return mm_globals.interpret_file_name(file_name, path, extension, additional_ids, resolution)
+
+
+func _on_map_file_type_item_selected(_index: int) -> void:
+	update_generate_map_file_label()

material_maker/panels/preview_3d/preview_3d.tscn

@@ -455,4 +455,5 @@ text = "Generate Map"
 [connection signal="item_selected" from="MainMenu/HBox/ExportMenu/ExportMenuPanel/VBoxContainer/GenerateMapsSection/MapType" to="MainMenu/HBox/ExportMenu/ExportMenuPanel" method="_on_map_type_item_selected"]
 [connection signal="item_selected" from="MainMenu/HBox/ExportMenu/ExportMenuPanel/VBoxContainer/GenerateMapsSection/MapResolution" to="MainMenu/HBox/ExportMenu/ExportMenuPanel" method="_on_map_resolution_item_selected"]
 [connection signal="text_changed" from="MainMenu/HBox/ExportMenu/ExportMenuPanel/VBoxContainer/GenerateMapsSection/ExportFile/BoxContainer/MapExportFile" to="MainMenu/HBox/ExportMenu/ExportMenuPanel" method="_on_map_export_file_text_changed"]
+[connection signal="item_selected" from="MainMenu/HBox/ExportMenu/ExportMenuPanel/VBoxContainer/GenerateMapsSection/ExportFile/BoxContainer/MapFileType" to="MainMenu/HBox/ExportMenu/ExportMenuPanel" method="_on_map_file_type_item_selected"]
 [connection signal="pressed" from="MainMenu/HBox/ExportMenu/ExportMenuPanel/VBoxContainer/GenerateMapButton" to="MainMenu/HBox/ExportMenu/ExportMenuPanel" method="_on_generate_map_button_pressed"]

material_maker/widgets/render_counter/render_counter.gd

@@ -20,7 +20,8 @@ const ITEM_TRIGGER_DEPENDENCY_MANAGER : int = 1003
 
 
 func _ready() -> void:
-	menu.add_check_item("Render", ITEM_RENDER_ENABLED)
+	#menu.add_check_item("Render", ITEM_RENDER_ENABLED)
+	#menu.add_separator()
 	menu.set_item_checked(menu.get_item_index(ITEM_RENDER_ENABLED), true)
 	if mm_renderer.total_renderers > 1:
 		menu.add_check_item("Auto", ITEM_AUTO)
@@ -30,7 +31,6 @@ func _ready() -> void:
 		for i in range(mm_renderer.total_renderers):
 			renderers_menu.add_radio_check_item("%d" % (i+1), i+1)
 		renderers_menu.set_item_checked(renderers_menu.get_item_index(mm_renderer.max_renderers), true)
-	menu.add_separator()
 	# Render size limit menu
 	menu.add_submenu_item("Maximum render size", "MaxRenderSize")
 	var render_size = mm_globals.get_config("max_viewport_size")

material_maker/widgets/render_counter/render_counter.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://cp2mbbfmrv6sf"]
 
-[ext_resource type="Script" path="res://material_maker/widgets/render_counter/render_counter.gd" id="1"]
+[ext_resource type="Script" uid="uid://4ajg6j8vvfvo" path="res://material_maker/widgets/render_counter/render_counter.gd" id="1"]
 
 [node name="RenderCounter" type="HBoxContainer" groups=["render_counter"]]
 offset_right = 158.0