Merge branch 'master' into dev-export

README.md

@@ -24,7 +24,7 @@ scoop install material-maker
 
 ## Screenshot
 
-![Screenshot](addons/material_maker/doc/images/screenshot.png)
+![Screenshot](material_maker/doc/images/screenshot.png)
 
 ## License
 

addons/material_maker/engine/gen_base.gd

@@ -7,6 +7,7 @@ Base class for texture generators, that defines their API
 """
 
 signal parameter_changed
+signal output_changed(index)
 
 class InputPort:
 	var generator : MMGenBase = null
@@ -49,6 +50,9 @@ func can_be_deleted() -> bool:
 func toggle_editable() -> bool:
 	return false
 
+func is_template() -> bool:
+	return model != null
+
 func is_editable() -> bool:
 	return false
 
@@ -117,6 +121,7 @@ func notify_output_change(output_index : int) -> void:
 	var targets = get_targets(output_index)
 	for target in targets:
 		target.generator.source_changed(target.input_index)
+	emit_signal("output_changed", output_index)
 
 func source_changed(__) -> void:
 	emit_signal("parameter_changed", "__input_changed__", 0)

addons/material_maker/engine/gen_graph.gd

@@ -10,7 +10,13 @@ var editable : bool = false
 var transmits_seed : bool = true
 
 signal connections_changed(removed_connections, added_connections)
+signal hierarchy_changed
 
+func emit_hierarchy_changed():
+	var top = self
+	while top.get_parent() != null and top.get_parent().get_script() == get_script():
+		top = top.get_parent()
+	top.emit_signal("hierarchy_changed")
 
 func fix_remotes() -> void:
 	for c in get_children():
@@ -111,6 +117,8 @@ func add_generator(generator : MMGenBase) -> bool:
 		name = generator.name + "_" + str(index)
 	generator.name = name
 	add_child(generator)
+	if generator.get_script() == get_script():
+		emit_hierarchy_changed()
 	return true
 
 func remove_generator(generator : MMGenBase) -> bool:
@@ -123,6 +131,8 @@ func remove_generator(generator : MMGenBase) -> bool:
 	connections = new_connections
 	remove_child(generator)
 	fix_remotes()
+	if generator.get_script() == get_script():
+		emit_hierarchy_changed()
 	generator.queue_free()
 	return true
 
@@ -130,8 +140,10 @@ func replace_generator(old : MMGenBase, new : MMGenBase) -> void:
 	new.name = old.name
 	new.position = old.position
 	remove_child(old)
-	old.free()
 	add_child(new)
+	if old.get_script() == get_script() or new.get_script() == get_script():
+		emit_hierarchy_changed()
+	old.free()
 
 func get_connected_inputs(generator) -> Array:
 	var rv : Array = []
@@ -312,10 +324,11 @@ func create_subgraph(gens : Array) -> MMGenGraph:
 	if !found_remote:
 		var gen_parameters = remote_script.new()
 		gen_parameters.name = "gen_parameters"
-		gen_parameters.position = Vector2(center.x - 200, upper_bound-300)
+		gen_parameters.position = Vector2(center.x-200, upper_bound-300)
 		new_graph.add_child(gen_parameters)
 	fix_remotes()
 	new_graph.fix_remotes()
+	emit_hierarchy_changed()
 	return new_graph
 
 

addons/material_maker/engine/loader.gd

@@ -87,7 +87,7 @@ func create_gen(data) -> MMGenBase:
 	if generator == null and data.has("type"):
 		if types.has(data.type):
 			generator = types[data.type].new()
-		else:
+		elif predefined_generators.has(data.type):
 			generator = create_gen(predefined_generators[data.type])
 			if generator == null:
 				print("Cannot find description for "+data.type)