Merge pull request #99 from endlessm/fix-multiple-snap-point-attachments

Add ParameterOutput and monitor node children in SnapPoint

Author: starnight

addons/block_code/drag_manager/drag_manager.gd

@@ -37,7 +37,7 @@ class Drag:
 
 	var snap_block: Block:
 		get:
-			return target_snap_point.block if target_snap_point else null
+			return target_snap_point.get_parent_block() if target_snap_point else null
 
 	func _init(block: Block, block_scope: String, offset: Vector2, block_canvas: BlockCanvas):
 		assert(block.get_parent() == null)
@@ -72,7 +72,7 @@ class Drag:
 
 		if target_snap_point:
 			# Snap the block to the point
-			var orphaned_block = target_snap_point.set_snapped_block(_block)
+			var orphaned_block = target_snap_point.insert_snapped_block(_block)
 			if orphaned_block:
 				# Place the orphan block somewhere outside the snap point
 				_block_canvas.arrange_block(orphaned_block, snap_block)
@@ -89,10 +89,6 @@ class Drag:
 			push_error("Warning: node %s is not of class SnapPoint." % node)
 			return false
 
-		if _snap_point.block == null:
-			push_error("Warning: snap point %s does not reference its parent block." % _snap_point)
-			return false
-
 		if not _block_canvas.is_ancestor_of(_snap_point):
 			# We only snap to blocks on the canvas:
 			return false
@@ -109,27 +105,29 @@ class Drag:
 			return false
 
 		# Check if any parent node is this node
-		var parent = _snap_point
-		var top_block
-		while parent is SnapPoint:
-			if parent.block == _block:
-				return false
+		if _snap_point.is_ancestor_of(_block):
+			return false
 
-			top_block = parent.block
-			parent = parent.block.get_parent()
+		var top_block = _get_top_block_for_node(_snap_point)
 
 		# Check if scope is valid
 		if _block_scope != "":
 			if top_block is EntryBlock:
 				if _block_scope != top_block.get_entry_statement():
 					return false
-			else:
+			elif top_block:
 				var tree_scope := DragManager.get_tree_scope(top_block)
 				if tree_scope != "" and _block_scope != tree_scope:
 					return false
 
 		return true
 
+	func _get_top_block_for_node(node: Node) -> Block:
+		for top_block in _block_canvas.get_blocks():
+			if top_block.is_ancestor_of(node):
+				return top_block
+		return null
+
 	func sort_snap_points_by_distance(a: SnapPoint, b: SnapPoint):
 		return _get_distance_to_snap_point(a) < _get_distance_to_snap_point(b)
 
@@ -205,9 +203,7 @@ func drag_block(block: Block, copied_from: Block = null):
 
 	var parent = block.get_parent()
 
-	if parent is SnapPoint:
-		parent.remove_snapped_block(block)
-	elif parent:
+	if parent:
 		parent.remove_child(block)
 
 	block.disconnect_signals()
@@ -252,23 +248,6 @@ func connect_block_canvas_signals(block: Block):
 	block.drag_started.connect(drag_block)
 	block.modified.connect(func(): block_modified.emit())
 
-	# HACK: for statement blocks connect copy_blocks to necessary signal
-	if block is StatementBlock:
-		var statement_block := block as StatementBlock
-		for pair in statement_block.param_name_input_pairs:
-			var param_input: ParameterInput = pair[1]
-			var copy_block := param_input.get_snapped_block()
-			if copy_block == null:
-				continue
-			if copy_block.drag_started.get_connections().size() == 0:
-				copy_block.drag_started.connect(func(b: Block): drag_copy_parameter(b, block))
-
-
-func drag_copy_parameter(block: Block, parent: Block):
-	if parent is EntryBlock:
-		block.scope = parent.get_entry_statement()
-	copy_picked_block_and_drag(block)
-
 
 ## Returns the scope of the first non-empty scope child block
 static func get_tree_scope(node: Node) -> String:

addons/block_code/examples/pong_game/pong_game.tscn

@@ -36,6 +36,15 @@ func add_block(block: Block, position: Vector2 = Vector2.ZERO) -> void:
 	_window.custom_minimum_size.y = max(block.position.y + EXTEND_MARGIN, _window.custom_minimum_size.y)
 
 
+func get_blocks() -> Array[Block]:
+	var blocks: Array[Block] = []
+	for child in _window.get_children():
+		var block = child as Block
+		if block:
+			blocks.append(block)
+	return blocks
+
+
 func arrange_block(block: Block, nearby_block: Block) -> void:
 	add_block(block)
 	block.global_position = (nearby_block.global_position + (nearby_block.get_size() * Vector2.RIGHT) + BLOCK_AUTO_PLACE_MARGIN)

addons/block_code/ui/block_canvas/block_canvas.gd

@@ -145,7 +145,6 @@ func format():
 		snap_container.add_theme_constant_override("margin_left", Constants.CONTROL_MARGIN)
 
 		var snap_point: SnapPoint = preload("res://addons/block_code/ui/blocks/utilities/snap_point/snap_point.tscn").instantiate()
-		snap_point.block = self
 		snap_container.add_child(snap_point)
 
 		snaps.append(snap_point)

addons/block_code/ui/blocks/control_block/control_block.gd

@@ -5,11 +5,11 @@
 
 [node name="EntryBlock" instance=ExtResource("1_byjbb")]
 script = ExtResource("2_3ik8h")
-defaults = null
+signal_name = ""
+defaults = {}
 block_name = "entry_block"
 label = "EntryBlock"
 block_type = 1
 
-
 [node name="Background" parent="VBoxContainer/TopMarginContainer" index="0"]
 show_top = false

addons/block_code/ui/blocks/entry_block/entry_block.tscn

@@ -113,31 +113,35 @@ static func format_string(parent_block: Block, attach_to: Node, string: String,
 		if _defaults.has(param_name):
 			param_default = _defaults[param_name]
 
-		var param_input: ParameterInput = preload("res://addons/block_code/ui/blocks/utilities/parameter_input/parameter_input.tscn").instantiate()
-		param_input.name = "ParameterInput%d" % start  # Unique path
-		param_input.placeholder = param_name
-		if param_type != null:
-			param_input.variant_type = param_type
-		elif option:
-			param_input.option = true
-		param_input.block = parent_block
-		param_input.modified.connect(func(): parent_block.modified.emit())
-
-		attach_to.add_child(param_input)
-		if param_default:
-			param_input.set_raw_input(param_default)
-
-		_param_name_input_pairs.append([param_name, param_input])
+		var param_node: Node
 
 		if copy_block:
-			var new_block: Block = preload("res://addons/block_code/ui/blocks/parameter_block/parameter_block.tscn").instantiate()
-			new_block.block_format = param_name
-			new_block.statement = param_name
-			new_block.variant_type = param_type
-			new_block.color = parent_block.color
-			param_input.block_type = Types.BlockType.NONE
-			param_input.snap_point.block_type = Types.BlockType.NONE  # Necessary because already called ready
-			param_input.snap_point.add_child(new_block)
+			var parameter_output: ParameterOutput = preload("res://addons/block_code/ui/blocks/utilities/parameter_output/parameter_output.tscn").instantiate()
+			parameter_output.name = "ParameterOutput%d" % start  # Unique path
+			parameter_output.block_params = {
+				"block_format": param_name,
+				"statement": param_name,
+				"variant_type": param_type,
+				"color": parent_block.color,
+				"scope": parent_block.get_entry_statement() if parent_block is EntryBlock else ""
+			}
+			parameter_output.block = parent_block
+			attach_to.add_child(parameter_output)
+		else:
+			var parameter_input: ParameterInput = preload("res://addons/block_code/ui/blocks/utilities/parameter_input/parameter_input.tscn").instantiate()
+			parameter_input.name = "ParameterInput%d" % start  # Unique path
+			parameter_input.placeholder = param_name
+			if param_type != null:
+				parameter_input.variant_type = param_type
+			elif option:
+				parameter_input.option = true
+			parameter_input.modified.connect(func(): parent_block.modified.emit())
+
+			attach_to.add_child(parameter_input)
+			if param_default:
+				parameter_input.set_raw_input(param_default)
+
+			_param_name_input_pairs.append([param_name, parameter_input])
 
 		start = result.get_end()
 

addons/block_code/ui/blocks/statement_block/statement_block.gd

@@ -7,14 +7,10 @@ signal modified
 @export var placeholder: String = "Parameter":
 	set = _set_placeholder
 
-@export var block_path: NodePath
-
 @export var variant_type: Variant.Type = TYPE_STRING
 @export var block_type: Types.BlockType = Types.BlockType.VALUE
 var option: bool = false
 
-var block: Block
-
 @onready var _panel := %Panel
 @onready var snap_point := %SnapPoint
 @onready var _input_switcher := %InputSwitcher
@@ -94,9 +90,6 @@ func _ready():
 
 	_set_placeholder(placeholder)
 
-	if block == null:
-		block = get_node_or_null(block_path)
-	snap_point.block = block
 	snap_point.block_type = block_type
 	snap_point.variant_type = variant_type
 

addons/block_code/ui/blocks/utilities/parameter_input/parameter_input.gd

@@ -0,0 +1,41 @@
+@tool
+class_name ParameterOutput
+extends MarginContainer
+
+var block: Block
+var output_block: Block
+
+@export var block_params: Dictionary
+
+@onready var _snap_point := %SnapPoint
+
+
+func _ready():
+	_snap_point.block_type = Types.BlockType.NONE
+
+	_update_parameter_block()
+
+
+func _update_parameter_block():
+	if _snap_point.has_snapped_block():
+		return
+
+	var parameter_block = preload("res://addons/block_code/ui/blocks/parameter_block/parameter_block.tscn").instantiate()
+	for key in block_params:
+		parameter_block[key] = block_params[key]
+	_snap_point.add_child.call_deferred(parameter_block)
+
+
+func _on_parameter_block_drag_started(drag_block: Block):
+	block.drag_started.emit(drag_block)
+
+
+func _on_snap_point_snapped_block_changed(snap_block: Block):
+	if snap_block == null:
+		return
+	snap_block.drag_started.connect(_on_parameter_block_drag_started)
+
+
+func _on_snap_point_snapped_block_removed(snap_block: Block):
+	snap_block.drag_started.disconnect(_on_parameter_block_drag_started)
+	_update_parameter_block()

addons/block_code/ui/blocks/utilities/parameter_output/parameter_output.gd

@@ -0,0 +1,40 @@
+[gd_scene load_steps=4 format=3 uid="uid://dp01u74qkty7r"]
+
+[ext_resource type="Script" path="res://addons/block_code/ui/blocks/utilities/parameter_output/parameter_output.gd" id="1_eebb2"]
+[ext_resource type="PackedScene" uid="uid://b1oge52xhjqnu" path="res://addons/block_code/ui/blocks/utilities/snap_point/snap_point.tscn" id="2_ngr7c"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_tn6h4"]
+bg_color = Color(1, 1, 1, 1)
+corner_radius_top_left = 40
+corner_radius_top_right = 40
+corner_radius_bottom_right = 40
+corner_radius_bottom_left = 40
+
+[node name="ParameterOutput" type="MarginContainer"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = -1052.0
+offset_bottom = -617.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+script = ExtResource("1_eebb2")
+
+[node name="Panel" type="Panel" parent="."]
+unique_name_in_owner = true
+layout_mode = 2
+mouse_filter = 2
+theme_override_styles/panel = SubResource("StyleBoxFlat_tn6h4")
+
+[node name="SnapPoint" parent="." node_paths=PackedStringArray("snapped_block") instance=ExtResource("2_ngr7c")]
+unique_name_in_owner = true
+layout_mode = 2
+mouse_filter = 2
+block_type = 0
+snapped_block = NodePath("ParameterBlock")
+variant_type = 4
+
+[connection signal="child_exiting_tree" from="." to="SnapPoint" method="_on_parameter_output_child_exiting_tree"]
+[connection signal="snapped_block_changed" from="SnapPoint" to="." method="_on_snap_point_snapped_block_changed"]
+[connection signal="snapped_block_removed" from="SnapPoint" to="." method="_on_snap_point_snapped_block_removed"]