Browse Source

fixed issue with slider values not saving as names werent unique

Jonathan Higgins 7 months ago
parent
commit
f11317e1fe

+ 1 - 1
.godot/editor/audioplayer.tscn-editstate-5c5be15cd7cbde82fbc3248f6958ab76.cfg

@@ -192,4 +192,4 @@ Game={
 "hide_selection": false,
 "select_mode": 0
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Control/MenuBar/HelpButton")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Control/GraphEdit")])

+ 1 - 1
.godot/editor/control.tscn-editstate-475cf43e2d21753002d8a2b4ccf5105f.cfg

@@ -192,4 +192,4 @@ Game={
 "hide_selection": false,
 "select_mode": 0
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Control/MenuBar/HelpButton")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Control/GraphEdit")])

+ 1 - 1
.godot/editor/editor_layout.cfg

@@ -33,7 +33,7 @@ current_scene="res://scenes/main/control.tscn"
 center_split_offset=0
 selected_default_debugger_tab_idx=0
 selected_main_editor_idx=2
-selected_bottom_panel_item=0
+selected_bottom_panel_item=1
 
 [EditorWindow]
 

+ 1 - 1
.godot/editor/menu.tscn-editstate-523ba9f1be4474a87fc09942b9fbb098.cfg

@@ -192,4 +192,4 @@ Game={
 "hide_selection": false,
 "select_mode": 0
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Control/MenuBar/HelpButton")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Control/GraphEdit")])

+ 1 - 1
.godot/editor/nodes.tscn-editstate-d18a50cdbd65798e64eea9469be45949.cfg

@@ -192,4 +192,4 @@ Game={
 "hide_selection": false,
 "select_mode": 0
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Control/MenuBar/HelpButton")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Control/GraphEdit")])

+ 4 - 4
.godot/editor/script_editor_cache.cfg

@@ -3,11 +3,11 @@
 state={
 "bookmarks": PackedInt32Array(),
 "breakpoints": PackedInt32Array(),
-"column": 4,
-"folded_lines": Array[int]([76, 81, 85, 90, 94, 110, 141, 166, 169, 172, 175, 213, 216, 270, 340, 346, 591, 601, 664, 740, 745, 749, 784, 832]),
+"column": 64,
+"folded_lines": Array[int]([77, 82, 86, 91, 95, 111, 142, 167, 170, 173, 176, 214, 217, 271, 341, 347, 592, 602, 665, 741, 746, 750, 902]),
 "h_scroll_position": 0,
-"row": 907,
-"scroll_position": 504.0,
+"row": 807,
+"scroll_position": 516.0,
 "selection": false,
 "syntax_highlighter": "GDScript"
 }

+ 1 - 1
.godot/editor/valueslider.tscn-editstate-d535ab38e866eae88d73c3fd55232f95.cfg

@@ -192,4 +192,4 @@ Game={
 "hide_selection": false,
 "select_mode": 0
 }
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Control/MenuBar/HelpButton")])
+selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@21272/@Panel@14/@VBoxContainer@15/DockHSplitLeftL/DockHSplitLeftR/DockHSplitMain/@VBoxContainer@26/DockVSplitCenter/@VSplitContainer@54/@VBoxContainer@55/@EditorMainScreen@102/MainScreen/@CanvasItemEditor@11482/@VSplitContainer@11134/@HSplitContainer@11136/@HSplitContainer@11138/@Control@11139/@SubViewportContainer@11140/@SubViewport@11141/Control/GraphEdit")])

+ 7 - 5
examples/frequency_domain.thd

@@ -61,7 +61,9 @@
 				"y": 78.7777404785156
 			},
 			"slider_values": {
-				"HSlider": 0.0
+				"VBoxContainer/HSplitContainer/HSlider": 3.131,
+				"VBoxContainer2/HSplitContainer/HSlider": 0.0,
+				"VBoxContainer3/HSplitContainer/HSlider": 0.0
 			}
 		},
 		{
@@ -75,7 +77,7 @@
 				"y": 232.999954223633
 			},
 			"slider_values": {
-				"HSlider": 369.0
+				"VBoxContainer/HSplitContainer/HSlider": 445.0
 			}
 		},
 		{
@@ -131,7 +133,7 @@
 				"y": 77.7777786254883
 			},
 			"slider_values": {
-				"@HSlider@1026": 0.0
+				"AudioPlayer/FileDialog/@VBoxContainer@1365/@MarginContainer@1405/Tree/@Popup@1391/@VBoxContainer@1392/@HSlider@1400": 0.0
 			}
 		},
 		{
@@ -215,7 +217,7 @@
 				"y": 78.8888854980469
 			},
 			"slider_values": {
-				"@HSlider@918": 0.0
+				"AudioPlayer/FileDialog/@VBoxContainer@1513/@MarginContainer@1553/Tree/@Popup@1539/@VBoxContainer@1540/@HSlider@1548": 0.0
 			}
 		},
 		{
@@ -229,7 +231,7 @@
 				"y": 79.8888244628906
 			},
 			"slider_values": {
-				"HSlider": 16.0
+				"VBoxContainer/HSplitContainer/HSlider": 16.0
 			}
 		}
 	]

+ 8 - 5
scenes/main/control.gd

@@ -35,6 +35,7 @@ func _ready() -> void:
 		if child is Button:
 			child.pressed.connect(_on_button_pressed.bind(child))
 	
+	DisplayServer.screen_get_size().x
 	#Generate input and output nodes
 	var effect: GraphNode = Nodes.get_node(NodePath("inputfile")).duplicate()
 	get_node("GraphEdit").add_child(effect, true)
@@ -42,7 +43,7 @@ func _ready() -> void:
 	
 	effect = Nodes.get_node(NodePath("outputfile")).duplicate()
 	get_node("GraphEdit").add_child(effect, true)
-	effect.position_offset = Vector2(1400,80)
+	effect.position_offset = Vector2((DisplayServer.screen_get_size().x - 480) ,80)
 	
 	check_cdp_location_set()
 	check_user_preferences()
@@ -803,7 +804,8 @@ func save_graph_edit(path: String):
 			}
 
 			for child in node.find_children("*", "Slider", true, false):
-				node_data["slider_values"][child.name] = child.value
+				var relative_path = node.get_path_to(child)
+				node_data["slider_values"][str(relative_path)] = child.value
 				
 			for child in node.find_children("*", "CodeEdit", true, false):
 				node_data["notes"][child.name] = child.text
@@ -867,10 +869,11 @@ func load_graph_edit(path: String):
 		graph_edit.add_child(new_node)
 
 		# Restore sliders
-		for slider_name in node_data["slider_values"]:
-			var slider = new_node.find_child(slider_name, true, false)
+		for slider_path_str in node_data["slider_values"]:
+			var slider = new_node.get_node_or_null(slider_path_str)
 			if slider and (slider is HSlider or slider is VSlider):
-				slider.value = node_data["slider_values"][slider_name]
+				slider.value = node_data["slider_values"][slider_path_str]
+
 				
 		# Restore notes
 		for codeedit_name in node_data["notes"]: