Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Now implemented node deletion.

Browse Source
This commit is contained in:
Relintai 2021-10-24 12:49:49 +02:00
parent b609b3caa4
commit facdcb6469
4 changed files with 63 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
game/addons/mat_maker_gd/editor/MatMakerGDEditor.gd
View File

@ -48,6 +48,8 @@ func ensure_objs() -> void:
func recreate() -> void: func recreate() -> void:
ensure_objs() ensure_objs()
_graph_edit.clear_connections()
for c in _graph_edit.get_children(): for c in _graph_edit.get_children():
if c is GraphNode: if c is GraphNode:
_graph_edit.remove_child(c) _graph_edit.remove_child(c)
@ -107,6 +109,11 @@ func on_graph_edit_disconnection_request(from: String, from_slot: int, to: Strin
if from_node.disconnect_slot(from_slot, to_node, to_slot): if from_node.disconnect_slot(from_slot, to_node, to_slot):
_graph_edit.disconnect_node(from, from_slot, to, to_slot) _graph_edit.disconnect_node(from, from_slot, to, to_slot)
func on_graph_node_close_request(node : GraphNode) -> void:
if _material:
_material.remove_node(node._node)
recreate()
func _on_AddButton_pressed(): func _on_AddButton_pressed():
get_node(add_popup_path).popup_centered() get_node(add_popup_path).popup_centered()

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

@ -14,6 +14,7 @@ var properties : Array = Array()
func _init(): func _init():
show_close = true show_close = true
connect("offset_changed", self, "on_offset_changed") connect("offset_changed", self, "on_offset_changed")
connect("close_request", self, "on_close_request")
func add_slot_texture(getter : String, setter : String) -> int: func add_slot_texture(getter : String, setter : String) -> int:
var t : TextureRect = TextureRect.new() var t : TextureRect = TextureRect.new()
@ -533,3 +534,13 @@ func on_universal_image_path_changed(f : String, slot_idx : int) -> void:
func get_material_node() -> MMNode: func get_material_node() -> MMNode:
return _node return _node
func on_close_request() -> void:
var n : Node = get_parent()
while n:
if n.has_method("on_graph_node_close_request"):
n.call_deferred("on_graph_node_close_request", self)
return
n = n.get_parent()

149
game/addons/mat_maker_gd/new_resource.tres
View File

@ -1,4 +1,4 @@
[gd_resource type="Resource" load_steps=136 format=2] [gd_resource type="Resource" load_steps=121 format=2]
[ext_resource path="res://addons/mat_maker_gd/nodes/mm_material.gd" type="Script" id=1] [ext_resource path="res://addons/mat_maker_gd/nodes/mm_material.gd" type="Script" id=1]
[ext_resource path="res://addons/mat_maker_gd/nodes/noise/noise.gd" type="Script" id=2] [ext_resource path="res://addons/mat_maker_gd/nodes/noise/noise.gd" type="Script" id=2]
@ -8,7 +8,6 @@
[ext_resource path="res://addons/mat_maker_gd/nodes/other/output_image.gd" type="Script" id=6] [ext_resource path="res://addons/mat_maker_gd/nodes/other/output_image.gd" type="Script" id=6]
[ext_resource path="res://addons/mat_maker_gd/nodes/gradient/gradient.gd" type="Script" id=7] [ext_resource path="res://addons/mat_maker_gd/nodes/gradient/gradient.gd" type="Script" id=7]
[ext_resource path="res://addons/mat_maker_gd/nodes/gradient/radial_gradient.gd" type="Script" id=8] [ext_resource path="res://addons/mat_maker_gd/nodes/gradient/radial_gradient.gd" type="Script" id=8]
[ext_resource path="res://addons/mat_maker_gd/nodes/uniform/uniform.gd" type="Script" id=9]
[ext_resource path="res://addons/mat_maker_gd/nodes/simple/image.gd" type="Script" id=10] [ext_resource path="res://addons/mat_maker_gd/nodes/simple/image.gd" type="Script" id=10]
[ext_resource path="res://addons/mat_maker_gd/nodes/filter/colorize.gd" type="Script" id=11] [ext_resource path="res://addons/mat_maker_gd/nodes/filter/colorize.gd" type="Script" id=11]
[ext_resource path="res://addons/mat_maker_gd/nodes/pattern/bricks.gd" type="Script" id=12] [ext_resource path="res://addons/mat_maker_gd/nodes/pattern/bricks.gd" type="Script" id=12]
@ -28,10 +27,6 @@
[ext_resource path="res://addons/mat_maker_gd/nodes/sdf2d/sd_op_circle_repeat.gd" type="Script" id=26] [ext_resource path="res://addons/mat_maker_gd/nodes/sdf2d/sd_op_circle_repeat.gd" type="Script" id=26]
[ext_resource path="res://addons/mat_maker_gd/nodes/sdf2d/sd_op_morph.gd" type="Script" id=27] [ext_resource path="res://addons/mat_maker_gd/nodes/sdf2d/sd_op_morph.gd" type="Script" id=27]
[ext_resource path="res://addons/mat_maker_gd/nodes/simple/curve.gd" type="Script" id=28] [ext_resource path="res://addons/mat_maker_gd/nodes/simple/curve.gd" type="Script" id=28]
[ext_resource path="res://addons/mat_maker_gd/nodes/sdf3d/sdf3d_render.gd" type="Script" id=29]
[ext_resource path="res://addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_sphere.gd" type="Script" id=30]
[ext_resource path="res://addons/mat_maker_gd/nodes/filter/filter.gd" type="Script" id=31]
[ext_resource path="res://addons/mat_maker_gd/nodes/filter/grayscale.gd" type="Script" id=32]
[ext_resource path="res://addons/mat_maker_gd/nodes/filter/blend.gd" type="Script" id=33] [ext_resource path="res://addons/mat_maker_gd/nodes/filter/blend.gd" type="Script" id=33]
[ext_resource path="res://addons/mat_maker_gd/nodes/filter/emboss.gd" type="Script" id=34] [ext_resource path="res://addons/mat_maker_gd/nodes/filter/emboss.gd" type="Script" id=34]
[ext_resource path="res://addons/mat_maker_gd/nodes/filter/make_tileable.gd" type="Script" id=35] [ext_resource path="res://addons/mat_maker_gd/nodes/filter/make_tileable.gd" type="Script" id=35]
@ -72,7 +67,7 @@ sides = 11
radius = SubResource( 4 ) radius = SubResource( 4 )
edge = SubResource( 3 ) edge = SubResource( 3 )
[sub_resource type="Resource" id=129] [sub_resource type="Resource" id=135]
script = ExtResource( 5 ) script = ExtResource( 5 )
default_type = 5 default_type = 5
default_int = 0 default_int = 0
@ -84,7 +79,7 @@ default_color = Color( 0, 0, 0, 1 )
[sub_resource type="Resource" id=6] [sub_resource type="Resource" id=6]
script = ExtResource( 6 ) script = ExtResource( 6 )
graph_position = Vector2( 300, -400 ) graph_position = Vector2( 300, -400 )
image = SubResource( 129 ) image = SubResource( 135 )
postfix = "-test" postfix = "-test"
[sub_resource type="Resource" id=9] [sub_resource type="Resource" id=9]
@ -158,20 +153,6 @@ points = PoolRealArray( 0, 0.121124, 0.574219, 0.19192, 1, 0.262712, 0.976562, 0
image = SubResource( 17 ) image = SubResource( 17 )
repeat = 1.0 repeat = 1.0
[sub_resource type="Resource" id=20]
script = ExtResource( 5 )
default_type = 4
default_int = 0
default_float = 0.0
default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0.443137, 0.74902, 0.4, 1 )
[sub_resource type="Resource" id=21]
script = ExtResource( 9 )
graph_position = Vector2( -100, -100 )
uniform = SubResource( 20 )
[sub_resource type="Resource" id=23] [sub_resource type="Resource" id=23]
script = ExtResource( 5 ) script = ExtResource( 5 )
default_type = 5 default_type = 5
@ -197,12 +178,23 @@ default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 ) default_color = Color( 0, 0, 0, 1 )
input_property = SubResource( 7 ) input_property = SubResource( 7 )
[sub_resource type="Resource" id=134]
script = ExtResource( 5 )
default_type = 1
default_int = 0
default_float = 1.0
default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 )
input_property = SubResource( 7 )
[sub_resource type="Resource" id=27] [sub_resource type="Resource" id=27]
script = ExtResource( 11 ) script = ExtResource( 11 )
graph_position = Vector2( 40, -300 ) graph_position = Vector2( -100, -300 )
interpolation_type = 1 interpolation_type = 1
points = PoolRealArray( 0, 0.171875, 1, 0, 1, 0.508474, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0.015625, 1, 1 ) points = PoolRealArray( 0, 0.171875, 1, 0, 1, 0.508474, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0.015625, 1, 1 )
image = SubResource( 26 ) image = SubResource( 26 )
input = SubResource( 134 )
[sub_resource type="Resource" id=29] [sub_resource type="Resource" id=29]
script = ExtResource( 5 ) script = ExtResource( 5 )
@ -715,96 +707,6 @@ c = Vector2( 0.35, -0.2 )
width = 0.24 width = 0.24
repeat = 5 repeat = 5
[sub_resource type="Resource" id=109]
script = ExtResource( 5 )
default_type = 2
default_int = 0
default_float = 0.0
default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 )
[sub_resource type="Resource" id=104]
script = ExtResource( 5 )
default_type = 2
default_int = 0
default_float = 0.0
default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 )
input_property = SubResource( 109 )
[sub_resource type="Resource" id=105]
script = ExtResource( 5 )
default_type = 5
default_int = 0
default_float = 0.0
default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 )
[sub_resource type="Resource" id=106]
script = ExtResource( 5 )
default_type = 5
default_int = 0
default_float = 0.0
default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 )
[sub_resource type="Resource" id=107]
script = ExtResource( 5 )
default_type = 5
default_int = 0
default_float = 0.0
default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 )
[sub_resource type="Resource" id=108]
script = ExtResource( 29 )
graph_position = Vector2( -660, 420 )
input = SubResource( 104 )
out_height_map = SubResource( 106 )
out_normal_map = SubResource( 107 )
out_color_map = SubResource( 105 )
[sub_resource type="Resource" id=110]
script = ExtResource( 30 )
graph_position = Vector2( -1040, 500 )
output = SubResource( 109 )
radius = 0.5
[sub_resource type="Resource" id=112]
script = ExtResource( 32 )
graph_position = Vector2( 0, 0 )
bmin = Vector2( 0.1, 0.1 )
bmax = Vector2( 1, 1 )
refresh = false
[sub_resource type="Resource" id=113]
script = ExtResource( 31 )
graph_position = Vector2( 0, 0 )
bmin = Vector2( 0.1, 0.1 )
bmax = Vector2( 1, 1 )
refresh = false
[sub_resource type="Resource" id=114]
script = ExtResource( 5 )
default_type = 5
default_int = 0
default_float = 0.0
default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 )
[sub_resource type="Resource" id=115]
script = ExtResource( 11 )
graph_position = Vector2( 300, -140 )
interpolation_type = 1
points = PoolRealArray( )
image = SubResource( 114 )
[sub_resource type="Resource" id=116] [sub_resource type="Resource" id=116]
script = ExtResource( 5 ) script = ExtResource( 5 )
default_type = 5 default_type = 5
@ -904,7 +806,26 @@ image = SubResource( 130 )
input = SubResource( 131 ) input = SubResource( 131 )
width = 0.1 width = 0.1
[sub_resource type="Resource" id=136]
script = ExtResource( 5 )
default_type = 5
default_int = 0
default_float = 0.0
default_vector2 = Vector2( 0, 0 )
default_vector3 = Vector3( 0, 0, 0 )
default_color = Color( 0, 0, 0, 1 )
[sub_resource type="Resource" id=137]
script = ExtResource( 3 )
graph_position = Vector2( 0, 0 )
image = SubResource( 136 )
type = 0
scale = Vector2( 2, 2 )
folds = 0
iterations = 5
persistence = 0.5
[resource] [resource]
script = ExtResource( 1 ) script = ExtResource( 1 )
image_size = Vector2( 128, 128 ) image_size = Vector2( 128, 128 )
nodes = [ SubResource( 5 ), SubResource( 6 ), SubResource( 12 ), SubResource( 15 ), SubResource( 18 ), SubResource( 21 ), SubResource( 24 ), SubResource( 27 ), SubResource( 39 ), SubResource( 42 ), SubResource( 45 ), SubResource( 49 ), SubResource( 54 ), SubResource( 58 ), SubResource( 60 ), SubResource( 63 ), SubResource( 66 ), SubResource( 69 ), SubResource( 71 ), SubResource( 73 ), SubResource( 78 ), SubResource( 82 ), SubResource( 85 ), SubResource( 88 ), SubResource( 90 ), SubResource( 92 ), SubResource( 96 ), SubResource( 100 ), SubResource( 108 ), SubResource( 110 ), SubResource( 112 ), SubResource( 113 ), SubResource( 115 ), SubResource( 120 ), SubResource( 123 ), SubResource( 132 ) ] nodes = [ SubResource( 5 ), SubResource( 6 ), SubResource( 12 ), SubResource( 15 ), SubResource( 18 ), SubResource( 24 ), SubResource( 27 ), SubResource( 39 ), SubResource( 42 ), SubResource( 45 ), SubResource( 49 ), SubResource( 54 ), SubResource( 58 ), SubResource( 60 ), SubResource( 63 ), SubResource( 66 ), SubResource( 69 ), SubResource( 71 ), SubResource( 73 ), SubResource( 78 ), SubResource( 82 ), SubResource( 85 ), SubResource( 88 ), SubResource( 90 ), SubResource( 92 ), SubResource( 96 ), SubResource( 100 ), SubResource( 120 ), SubResource( 123 ), SubResource( 132 ), SubResource( 137 ) ]

10
game/addons/mat_maker_gd/nodes/mm_material.gd
View File

@ -22,6 +22,16 @@ func add_node(node : MMNode) -> void:
emit_changed() emit_changed()
func remove_node(node : MMNode) -> void: func remove_node(node : MMNode) -> void:
if !node:
return
for op in node.output_properties:
for n in nodes:
if n:
for ip in n.input_properties:
if ip.input_property == op:
ip.set_input_property(null)
nodes.erase(node) nodes.erase(node)
node.disconnect("changed", self, "on_node_changed") node.disconnect("changed", self, "on_node_changed")