- delete redo undo cycle mostly done

Author: Joseph Star

addons/parley/graph_operations/parley_delete_operation.gd

@@ -2,43 +2,94 @@
 class_name ParleyDeleteOperation
 extends ParleyGraphOperation
 
-var selectedConnections: Array[ParleyGraphEdge]
-var selectedNodes: Array[ParleyGraphNode]
-var deletedNodes: Array[ParleyGraphNode]
+var selected_connections: Array[ParleyGraphEdge]
+var selected_nodes: Array[ParleyGraphNode]
+var deleted_node_datas: Array[NodeData]
 var graph_view: ParleyGraphView
 
 func _init(_graph_view: ParleyGraphView, _selected_connections: Array[ParleyGraphEdge], _selected_nodes: Array[ParleyGraphNode]) -> void:
 	graph_view = _graph_view
-	selectedConnections = _selected_connections.duplicate()
-	selectedNodes = _selected_nodes.duplicate()
+	selected_connections = _selected_connections.duplicate()
+	selected_nodes = _selected_nodes.duplicate()
 
 func undo() -> void:
+	pass
 	# Re-add deleted nodes
 
-	# TODO this will be implemented shortly
-	# for node : GraphNode in selectedNodes:
-	# 	graph_view.add_child(node)
-	# 	graph_view.ast.add_ast_node(node.)
-
-	for connection : ParleyGraphEdge in selectedConnections:
-		var result: int = connection.connect_node(graph_view)
-		if result == FAILED:
-			print("Couldn't delete connection: ", connection.as_string())
+	selected_nodes.clear()
+	var graph_nodes: Dictionary = {}
+	for node_data : NodeData in deleted_node_datas:
+		var deleted_node : ParleyNodeAst = node_data.node_ast
+		graph_view._add_node(graph_nodes, deleted_node)
+		graph_view.ast.add_node_from_ast(deleted_node)
+		var added_node : ParleyGraphNode = graph_nodes[deleted_node.id]
+		added_node.position = deleted_node.position
 
+	for node_data : NodeData in deleted_node_datas:
+		for connection : ParleyGraphEdge in node_data.connections:
+			connection.to_node = graph_view.get_node(NodePath(connection.to_node_name)) as ParleyGraphNode
+			connection.from_node = graph_view.get_node(NodePath(connection.from_node_name)) as ParleyGraphNode
+			if node_data.node_name == connection.to_node_name:
+				selected_nodes.append(connection.to_node)
+				pass
+			elif node_data.node_name == connection.from_node_name:
+				selected_nodes.append(connection.from_node)
+				pass
+			connection.connect_node(graph_view)
+
+	for connection : ParleyGraphEdge in selected_connections:
+		connection.to_node = graph_view.get_node(NodePath(connection.to_node_name)) as ParleyGraphNode
+		connection.from_node = graph_view.get_node(NodePath(connection.from_node_name)) as ParleyGraphNode
+		connection.connect_node(graph_view)
+
+	graph_view.generate()
 
 func do() -> void:
-	# Remove deleted nodes
-	for connection : ParleyGraphEdge in selectedConnections:
+	for selected_node : ParleyGraphNode in selected_nodes:
+		if graph_view.has_node(NodePath(selected_node.name)):
+			var ast : ParleyNodeAst = graph_view.ast.find_node_by_id(selected_node.id)
+			var connections : Array[ParleyGraphEdge] = get_connections_for_node(graph_view, selected_node)
+			deleted_node_datas.append(NodeData.new(selected_node.name, ast, connections))
+
+	for selected_node : ParleyGraphNode in selected_nodes:
+		if graph_view.has_node(NodePath(selected_node.name)):
+			print("remove node")
+			var ast : ParleyNodeAst = graph_view.ast.find_node_by_id(selected_node.id)
+			graph_view._on_node_deselected(selected_node)
+			graph_view.remove_child(selected_node)
+			graph_view.ast.remove_node(selected_node.id)
+
+	for connection : ParleyGraphEdge in selected_connections:
+		print("disconnect connection")
 		connection.disconnect_node(graph_view)
+		
+	graph_view.generate()
+
+func get_connections_for_node(graph_edit: GraphEdit, node: GraphNode) -> Array[ParleyGraphEdge]:
+	var result: Array[ParleyGraphEdge] = []
+	var connections: Array[Dictionary] = graph_edit.get_connection_list()
+	
+	for conn: Dictionary in connections:
+		var from_name: String = conn.get("from_node")
+		var to_name: String = conn.get("to_node")
+		var from_port: int = conn.get("from_port")
+		var to_port: int = conn.get("to_port")
+		var to_node: ParleyGraphNode = graph_view.get_node(NodePath(to_name)) as ParleyGraphNode
+		var from_node: ParleyGraphNode = graph_view.get_node(NodePath(from_name)) as ParleyGraphNode
+
+		if from_name == node.name or to_name == node.name:
+			result.append(ParleyGraphEdge.new(from_node, from_port, to_node, to_port))
+	
+	return result
+
+
+class NodeData:
+	var node_ast: ParleyNodeAst
+	var connections: Array[ParleyGraphEdge]
+	var node_name: String
+
+	func _init(_node_name: String, _node_ast :ParleyNodeAst, _connections: Array[ParleyGraphEdge]) -> void:
+		node_name = _node_name
+		node_ast = _node_ast
+		connections = _connections
 
-	for selectedNode : ParleyGraphNode in selectedNodes:
-		if graph_view.has_node(NodePath(selectedNode.name)):
-			graph_view._on_node_deselected(selectedNode)
-			graph_view.remove_child(selectedNode)
-			graph_view.ast.remove_node(selectedNode.id)
-			deletedNodes.append(selectedNode)
-
-func flush() -> void:
-	for deletedNode : ParleyGraphNode in deletedNodes:
-		deletedNode.queue_free()
-	pass

addons/parley/models/dialogue_sequence_ast.gd

@@ -144,6 +144,17 @@ func add_new_node(type: Type, position: Vector2 = Vector2.ZERO) -> ParleyNodeAst
 	_emit_dialogue_updated()
 	return ast_node
 
+func add_node_from_ast(node_ast: ParleyNodeAst) -> ParleyNodeAst:
+	# Probably need to make sure the provided ID doesn't already exist
+	for node : ParleyNodeAst in nodes:
+		if node.id == node_ast.id:
+			print("Id already exists in dialogue sequence")
+			return
+			
+	# Also worth storing the insertion index somewhere as well?
+	nodes.append(node_ast)
+	_emit_dialogue_updated()
+	return node_ast
 
 ## Update Node AST position
 func update_node_position(ast_node_id: String, position: Vector2) -> void:
@@ -241,7 +252,6 @@ func remove_node(node_id: String) -> void:
 
 	_emit_dialogue_updated()
 
-
 ## Find a Node AST by its ID.
 ## Example: ast.find_node_by_id("1")
 func find_node_by_id(id: String) -> ParleyNodeAst:

addons/parley/views/parley_graph_edge.gd

@@ -4,9 +4,13 @@
 extends Object
 class_name ParleyGraphEdge
 var from_node: ParleyGraphNode
+var from_slot: int
 var from_port: int
 var to_node: ParleyGraphNode
+var to_slot: int
 var to_port: int
+var to_node_name: String
+var from_node_name: String
 
 var previousFromColor: Color
 var previousToColor: Color
@@ -17,31 +21,40 @@ func _init(_from_node: ParleyGraphNode, _from_port: int, _to_node: ParleyGraphNo
 	from_port = _from_port
 	to_node = _to_node
 	to_port = _to_port
+	from_slot = from_node.get_output_port_slot(from_port)
+	to_slot = to_node.get_input_port_slot(to_port)
+	from_node_name = from_node.name
+	to_node_name = to_node.name
 
-func disconnect_node(graph_edit: GraphEdit) -> void:
-	if not graph_edit:
+func disconnect_node(graph_view: ParleyGraphView) -> void:
+	if not graph_view:
 		return
-	graph_edit.disconnect_node(from_node.name, from_port, to_node.name, to_port)
+	graph_view.disconnect_node(from_node_name, from_port, to_node_name, to_port)
+	graph_view.ast.remove_edge(from_node_name, from_port, to_node_name, to_port)
 
-func connect_node(graph_edit: GraphEdit) -> int:
-	if not graph_edit:
+func connect_node(graph_view: ParleyGraphView) -> int:
+	if not graph_view:
 		return FAILED
-	return graph_edit.connect_node(from_node.name, from_port, to_node.name, to_port)
+	return graph_view.connect_node(from_node_name, from_port, to_node_name, to_port)
 
 func select() -> void:
+	if selected:
+		return
 	selected = true
-	var output_port_count : int = from_node.get_output_port_count()
-	previousFromColor = from_node.get_slot_color_right(output_port_count + from_port - 1)
-	previousToColor = to_node.get_slot_color_left(to_port)
-	from_node.set_slot_color_right(output_port_count + from_port - 1, Color.DEEP_SKY_BLUE) # "output_port_count + from_port - 1" is this a bug i really don't know but only this works
-	to_node.set_slot_color_left(to_port, Color.DEEP_SKY_BLUE)
+
+	previousFromColor = from_node.get_slot_color_right(from_slot)
+	previousToColor = to_node.get_slot_color_left(to_slot)
+	from_node.set_slot_color_right(from_slot, Color.DEEP_SKY_BLUE) # "output_port_count + from_port - 1" is this a bug i really don't know but only this works
+	to_node.set_slot_color_left(to_slot, Color.DEEP_SKY_BLUE)
 
 func unselect() -> void:
+	if not selected:
+		return
+
 	selected = false
 
-	var output_port_count : int = from_node.get_output_port_count()
-	from_node.set_slot_color_right(output_port_count + from_port - 1, previousFromColor)
-	to_node.set_slot_color_left(to_port, previousToColor)
+	from_node.set_slot_color_right(from_slot, previousFromColor)
+	to_node.set_slot_color_left(to_slot, previousToColor)
 
 func as_string() -> String:
 	return "%s:%d -> %s:%d" % [from_node, from_port, to_node, to_port]

addons/parley/views/parley_graph_view.gd

@@ -370,7 +370,6 @@ func _on_node_selected(node: Node) -> void:
 func _on_node_deselected(node: Node) -> void:
 	selectedNodes.erase(node)
 	pass
-
 func _gui_input(event: InputEvent) -> void:
 	if event is InputEventMouseButton:
 		_handle_mouse_select(event as InputEventMouseButton)
@@ -420,21 +419,32 @@ func _handle_mouse_select(mouse_event: InputEventMouseButton) -> void:
 					selectedNodes.clear()
 
 				foundAnyConnection = true
-				var connection: ParleyGraphEdge = ParleyGraphEdge.new(from_node, from_port, to_node, to_port)
-				connection.select()
-				selectedConnections.append(connection as ParleyGraphEdge)
-				onUnselect.append(func() -> void:
-					connection.unselect()
+				var connection: ParleyGraphEdge = _find_existing_connection(from_node, from_port, to_node, to_port)
+				if connection == null:
+					connection = ParleyGraphEdge.new(from_node, from_port, to_node, to_port)
+					connection.select()
+					selectedConnections.append(connection as ParleyGraphEdge)
+					onUnselect.append(func() -> void:
+						connection.unselect()
+						selectedConnections.erase(connection)
+					)
+					print("Selected connection:", connection.as_string())
+				else:
 					selectedConnections.erase(connection)
-				)
-				print("Clicked connection:", connection.as_string())
+					connection.unselect()
+					print("Unselected existing connection:", connection.as_string())
 				break
 
-		if not foundAnyConnection:
+		if not foundAnyConnection && not mouse_event.is_command_or_control_pressed():
 			while onUnselect.size() > 0:
 				var callable: Callable = onUnselect.pop_front()
 				callable.call()
 
+func _find_existing_connection(_from_node: ParleyGraphNode, _from_port: int, _to_node: ParleyGraphNode, _to_port: int) -> ParleyGraphEdge:
+	for con: ParleyGraphEdge in selectedConnections:
+		if con.from_node == _from_node && con.from_port == _from_port && con.to_node == _to_node && con.to_port == _to_port:
+			return con
+	return null
 func _get_slot_position(node: GraphNode, slot_idx: int, is_output: bool) -> Vector2:
 	var local_pos: Vector2
 	if is_output: