Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2025-02-19 03:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed the input and output slot type parameter from the simple MMGraphNode property methods. Input and output was only available with universal properties anyway.

Browse Source
This commit is contained in:
Relintai 2021-10-09 19:15:15 +02:00
parent babee4f93a
commit da126d1d45
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
game/addons/mat_maker_gd/editor/mm_graph_node.gd
View File

@ -11,10 +11,10 @@ func _init():
show_close = true show_close = true
connect("offset_changed", self, "on_offset_changed") connect("offset_changed", self, "on_offset_changed")
func add_slot_texture(input_type : int, output_type : int, getter : String, setter : String) -> int: func add_slot_texture(getter : String, setter : String) -> int:
var t : TextureRect = TextureRect.new() var t : TextureRect = TextureRect.new()
var slot_idx : int = add_slot(input_type, output_type, getter, setter, t) var slot_idx : int = add_slot(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, getter, setter, t)
t.texture = _node.call(getter, _material, slot_idx) t.texture = _node.call(getter, _material, slot_idx)
properties[slot_idx].append(t.texture) properties[slot_idx].append(t.texture)
@ -41,14 +41,14 @@ func add_slot_texture_universal(property : MMNodeUniversalProperty) -> int:
return slot_idx return slot_idx
func add_slot_label(input_type : int, output_type : int, getter : String, setter : String, slot_name : String) -> int: func add_slot_label(getter : String, setter : String, slot_name : String) -> int:
var l : Label = Label.new() var l : Label = Label.new()
l.text = slot_name l.text = slot_name
return add_slot(input_type, output_type, getter, setter, l) return add_slot(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, getter, setter, l)
func add_slot_line_edit(input_type : int, output_type : int, getter : String, setter : String, slot_name : String, placeholder : String = "") -> int: func add_slot_line_edit(getter : String, setter : String, slot_name : String, placeholder : String = "") -> int:
var bc : VBoxContainer = VBoxContainer.new() var bc : VBoxContainer = VBoxContainer.new()
var l : Label = Label.new() var l : Label = Label.new()
@ -59,7 +59,7 @@ func add_slot_line_edit(input_type : int, output_type : int, getter : String, se
le.placeholder_text = placeholder le.placeholder_text = placeholder
bc.add_child(le) bc.add_child(le)
var slot_idx : int = add_slot(input_type, output_type, getter, setter, bc) var slot_idx : int = add_slot(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, getter, setter, bc)
le.text = _node.call(getter) le.text = _node.call(getter)
@ -67,7 +67,7 @@ func add_slot_line_edit(input_type : int, output_type : int, getter : String, se
return slot_idx return slot_idx
func add_slot_enum(input_type : int, output_type : int, getter : String, setter : String, slot_name : String, values : Array) -> int: func add_slot_enum(getter : String, setter : String, slot_name : String, values : Array) -> int:
var bc : VBoxContainer = VBoxContainer.new() var bc : VBoxContainer = VBoxContainer.new()
var l : Label = Label.new() var l : Label = Label.new()
@ -81,7 +81,7 @@ func add_slot_enum(input_type : int, output_type : int, getter : String, setter
bc.add_child(mb) bc.add_child(mb)
var slot_idx : int = add_slot(input_type, output_type, getter, setter, bc) var slot_idx : int = add_slot(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, getter, setter, bc)
mb.selected = _node.call(getter) mb.selected = _node.call(getter)
@ -89,7 +89,7 @@ func add_slot_enum(input_type : int, output_type : int, getter : String, setter
return slot_idx return slot_idx
func add_slot_int(input_type : int, output_type : int, getter : String, setter : String, slot_name : String, prange : Vector2 = Vector2(-1000, 1000)) -> int: func add_slot_int(getter : String, setter : String, slot_name : String, prange : Vector2 = Vector2(-1000, 1000)) -> int:
var bc : VBoxContainer = VBoxContainer.new() var bc : VBoxContainer = VBoxContainer.new()
var l : Label = Label.new() var l : Label = Label.new()
@ -102,7 +102,7 @@ func add_slot_int(input_type : int, output_type : int, getter : String, setter :
sb.max_value = prange.y sb.max_value = prange.y
bc.add_child(sb) bc.add_child(sb)
var slot_idx : int = add_slot(input_type, output_type, getter, setter, bc) var slot_idx : int = add_slot(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, getter, setter, bc)
sb.value = _node.call(getter) sb.value = _node.call(getter)
@ -133,7 +133,7 @@ func add_slot_int_universal(property : MMNodeUniversalProperty) -> int:
return slot_idx return slot_idx
func add_slot_float(input_type : int, output_type : int, getter : String, setter : String, slot_name : String, step : float = 0.1, prange : Vector2 = Vector2(-1000, 1000)) -> int: func add_slot_float(getter : String, setter : String, slot_name : String, step : float = 0.1, prange : Vector2 = Vector2(-1000, 1000)) -> int:
var bc : VBoxContainer = VBoxContainer.new() var bc : VBoxContainer = VBoxContainer.new()
var l : Label = Label.new() var l : Label = Label.new()
@ -143,7 +143,7 @@ func add_slot_float(input_type : int, output_type : int, getter : String, setter
var sb : SpinBox = SpinBox.new() var sb : SpinBox = SpinBox.new()
bc.add_child(sb) bc.add_child(sb)
var slot_idx : int = add_slot(input_type, output_type, getter, setter, bc) var slot_idx : int = add_slot(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, getter, setter, bc)
sb.rounded = false sb.rounded = false
sb.step = step sb.step = step
sb.min_value = prange.x sb.min_value = prange.x
@ -177,7 +177,7 @@ func add_slot_float_universal(property : MMNodeUniversalProperty) -> int:
return slot_idx return slot_idx
func add_slot_vector2(input_type : int, output_type : int, getter : String, setter : String, slot_name : String, step : float = 0.1, prange : Vector2 = Vector2(-1000, 1000)) -> int: func add_slot_vector2(getter : String, setter : String, slot_name : String, step : float = 0.1, prange : Vector2 = Vector2(-1000, 1000)) -> int:
var bc : VBoxContainer = VBoxContainer.new() var bc : VBoxContainer = VBoxContainer.new()
var l : Label = Label.new() var l : Label = Label.new()
@ -190,7 +190,7 @@ func add_slot_vector2(input_type : int, output_type : int, getter : String, sett
var sby : SpinBox = SpinBox.new() var sby : SpinBox = SpinBox.new()
bc.add_child(sby) bc.add_child(sby)
var slot_idx : int = add_slot(input_type, output_type, getter, setter, bc) var slot_idx : int = add_slot(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, getter, setter, bc)
sbx.rounded = false sbx.rounded = false
sby.rounded = false sby.rounded = false
sbx.step = step sbx.step = step

7
game/addons/mat_maker_gd/nodes/noise/perlin.gd
View File

@ -14,10 +14,9 @@ func get_value_for(uv : Vector2, pseed : int) -> Color:
return NoisePerlin.perlinc(uv, scale, iterations, persistence, pseed) return NoisePerlin.perlinc(uv, scale, iterations, persistence, pseed)
func _register_methods(mm_graph_node) -> void: func _register_methods(mm_graph_node) -> void:
#mm_graph_node.add_slot_texture(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_IMAGE, "render_image", "") mm_graph_node.add_slot_int("get_iterations", "set_iterations", "iterations")#, Vector2(1, 10))
mm_graph_node.add_slot_int(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, "get_iterations", "set_iterations", "iterations")#, Vector2(1, 10)) mm_graph_node.add_slot_float("get_persistence", "set_persistence", "persistence", 0.05)#, Vector2(0, 1))
mm_graph_node.add_slot_float(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, "get_persistence", "set_persistence", "persistence", 0.05)#, Vector2(0, 1)) mm_graph_node.add_slot_vector2("get_scale", "set_scale", "scale", 1)#, Vector2(1, 32))
mm_graph_node.add_slot_vector2(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, "get_scale", "set_scale", "scale", 1)#, Vector2(1, 32))
func get_iterations() -> int: func get_iterations() -> int:
return iterations return iterations

2
game/addons/mat_maker_gd/nodes/other/output_image.gd
View File

@ -15,7 +15,7 @@ func _init_properties():
func _register_methods(mm_graph_node) -> void: func _register_methods(mm_graph_node) -> void:
mm_graph_node.add_slot_texture_universal(image) mm_graph_node.add_slot_texture_universal(image)
mm_graph_node.add_slot_line_edit(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, "get_postfix", "set_postfix", "postfix") mm_graph_node.add_slot_line_edit("get_postfix", "set_postfix", "postfix")
func _render(material) -> void: func _render(material) -> void:
if !image: if !image:

4
game/addons/mat_maker_gd/nodes/simple/shape.gd
View File

@ -49,8 +49,8 @@ func _init_properties():
func _register_methods(mm_graph_node) -> void: func _register_methods(mm_graph_node) -> void:
mm_graph_node.add_slot_texture_universal(image) mm_graph_node.add_slot_texture_universal(image)
mm_graph_node.add_slot_enum(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, "get_shape_typoe", "set_shape_typoe", "shape_type", [ "Circle", "Polygon", "Star", "Curved Star", "Rays" ]) mm_graph_node.add_slot_enum("get_shape_typoe", "set_shape_typoe", "shape_type", [ "Circle", "Polygon", "Star", "Curved Star", "Rays" ])
mm_graph_node.add_slot_int(MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, MMNodeUniversalProperty.SlotTypes.SLOT_TYPE_NONE, "get_sides", "set_sides", "sides")#, Vector2(1, 10)) mm_graph_node.add_slot_int("get_sides", "set_sides", "sides")#, Vector2(1, 10))
mm_graph_node.add_slot_float_universal(radius) mm_graph_node.add_slot_float_universal(radius)
mm_graph_node.add_slot_float_universal(edge) mm_graph_node.add_slot_float_universal(edge)