Use strings for types

Author: wnbaum

addons/block_code/block_code_plugin.gd

@@ -45,7 +45,7 @@ const DISABLED_CLASSES := [
 
 
 func _enter_tree():
-	Types.init_cast_graph()
+	Types.init_types()
 
 	main_panel = MainPanel.instantiate()
 	main_panel.undo_redo = get_undo_redo()

addons/block_code/drag_manager/drag_manager.gd

@@ -46,7 +46,12 @@ func _process(_delta):
 					push_error("Warning: a snap point does not reference it's parent block.")
 					continue
 				if snap_point.block.on_canvas:
-					if Types.can_cast(dragging.block_type, snap_point.block_type):
+					if dragging.block_type == snap_point.block_type:
+						# Don't snap uncastable value blocks
+						if dragging.block_type == Types.BlockType.VALUE:
+							if !Types.can_cast(dragging.variant_type, snap_point.variant_type):
+								continue
+
 						var snap_global_pos: Vector2 = snap_point.get_global_rect().position
 						var temp_dist: float = dragging_global_pos.distance_to(snap_global_pos)
 						if temp_dist < closest_dist:

addons/block_code/types/types.gd

@@ -9,47 +9,38 @@ enum BlockType {
 }
 
 const VARIANT_TYPE_TO_STRING: Dictionary = {
-	TYPE_STRING: "STRING",
-	TYPE_INT: "INT",
-	TYPE_FLOAT: "FLOAT",
-	TYPE_BOOL: "BOOL",
-	TYPE_VECTOR2: "VECTOR2",
-	TYPE_COLOR: "COLOR",
+	TYPE_STRING: "String",
+	TYPE_INT: "int",
+	TYPE_FLOAT: "float",
+	TYPE_BOOL: "bool",
+	TYPE_VECTOR2: "Vector2",
+	TYPE_COLOR: "Color",
 }
 
-const STRING_TO_VARIANT_TYPE: Dictionary = {
-	"STRING": TYPE_STRING,
-	"INT": TYPE_INT,
-	"FLOAT": TYPE_FLOAT,
-	"BOOL": TYPE_BOOL,
-	"VECTOR2": TYPE_VECTOR2,
-	"COLOR": TYPE_COLOR,
-}
-
-const cast_relationships = [
-	[TYPE_INT, TYPE_FLOAT, "float(%s)"],
-	[TYPE_FLOAT, TYPE_INT, "int(%s)"],
-	[TYPE_INT, TYPE_STRING, "str(%s)"],
-	[TYPE_FLOAT, TYPE_STRING, "str(%s)"],
+const CAST_RELATIONSHIPS = [
+	["int", "float", "float(%s)"],
+	["float", "int", "int(%s)"],
+	["int", "String", "str(%s)"],
+	["float", "String", "str(%s)"],
 ]
 
 # Directed graph, edges are CastGraphEdge
 static var cast_graph: Dictionary
 
 
 class CastGraphEdge:
-	var to: Variant.Type
+	var to: String
 	var cast_format: String
 
-	func _init(p_to: Variant.Type, p_cast_format: String):
+	func _init(p_to: String, p_cast_format: String):
 		to = p_to
 		cast_format = p_cast_format
 
 
-static func init_cast_graph():
+static func init_types():
 	cast_graph = {}
 
-	for rel in cast_relationships:
+	for rel in CAST_RELATIONSHIPS:
 		if not cast_graph.has(rel[0]):
 			cast_graph[rel[0]] = []
 
@@ -67,7 +58,7 @@ static var dist: Dictionary
 const INT_MAX: int = 1000000000
 
 
-static func dijkstra(source: Variant.Type):
+static func dijkstra(source: String):
 	prev = {}
 	dist = {}
 
@@ -97,7 +88,7 @@ static func dijkstra(source: Variant.Type):
 				queue.update_priority(v, alt)
 
 
-static func can_cast(type: Variant.Type, parent_type: Variant.Type) -> bool:
+static func can_cast(type: String, parent_type: String) -> bool:
 	if type == parent_type:
 		return true
 
@@ -107,7 +98,7 @@ static func can_cast(type: Variant.Type, parent_type: Variant.Type) -> bool:
 	return false
 
 
-static func cast(val: String, type: Variant.Type, parent_type: Variant.Type):
+static func cast(val: String, type: String, parent_type: String):
 	if type == parent_type:
 		return val
 

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

@@ -7,4 +7,7 @@
 script = ExtResource("2_3ik8h")
 block_name = "entry_block"
 label = "EntryBlock"
-block_type = 2
+block_type = 1
+
+[node name="Background" parent="VBoxContainer/TopMarginContainer" index="0"]
+show_top = false

addons/block_code/ui/blocks/parameter_block/parameter_block.gd

@@ -4,7 +4,7 @@ extends Block
 
 @export var block_format: String = ""
 @export var statement: String = ""
-@export var variant_type: Variant.Type
+@export var variant_type: String
 
 @onready var _panel := $Panel
 @onready var _hbox := %HBoxContainer
@@ -16,7 +16,6 @@ var param_input_strings: Dictionary  # Only loaded from serialized
 func _ready():
 	super()
 
-	block_type = Types.BlockType.VALUE
 	var new_panel = _panel.get_theme_stylebox("panel").duplicate()
 	new_panel.bg_color = color
 	new_panel.border_color = color.darkened(0.2)
@@ -35,7 +34,7 @@ func _on_drag_drop_area_mouse_down():
 
 func get_serialized_props() -> Array:
 	var props := super()
-	props.append_array(serialize_props(["block_format", "statement"]))
+	props.append_array(serialize_props(["variant_type", "block_format", "statement"]))
 
 	var _param_input_strings: Dictionary = {}
 	for pair in param_name_input_pairs:

addons/block_code/ui/blocks/parameter_block/parameter_block.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Script" path="res://addons/block_code/ui/blocks/parameter_block/parameter_block.gd" id="1_0hajy"]
 [ext_resource type="PackedScene" uid="uid://c7puyxpqcq6xo" path="res://addons/block_code/ui/blocks/utilities/drag_drop_area/drag_drop_area.tscn" id="2_gy5co"]
 
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_0afbg"]
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_d7xfk"]
 bg_color = Color(1, 1, 1, 1)
 border_width_left = 3
 border_width_top = 3
@@ -26,7 +26,7 @@ block_type = 3
 [node name="Panel" type="Panel" parent="."]
 unique_name_in_owner = true
 layout_mode = 2
-theme_override_styles/panel = SubResource("StyleBoxFlat_0afbg")
+theme_override_styles/panel = SubResource("StyleBoxFlat_d7xfk")
 
 [node name="DragDropArea" parent="." instance=ExtResource("2_gy5co")]
 layout_mode = 2

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

@@ -99,8 +99,7 @@ static func format_string(parent_block: Block, attach_to: Node, string: String)
 
 		var split := param.split(": ")
 		var param_name := split[0]
-		var param_type_str := split[1]
-		var param_type: Variant.Type = Types.STRING_TO_VARIANT_TYPE[param_type_str]
+		var param_type := split[1]
 
 		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

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

@@ -9,8 +9,8 @@ signal text_modified
 
 @export var block_path: NodePath
 
-@export var variant_type: Variant.Type = TYPE_STRING
 @export var block_type: Types.BlockType = Types.BlockType.VALUE
+@export var variant_type: String = "String"
 
 var block: Block
 
@@ -42,6 +42,7 @@ func _ready():
 		block = get_node_or_null(block_path)
 	snap_point.block = block
 	snap_point.block_type = block_type
+	snap_point.variant_type = variant_type
 
 	# Do something with block_type to restrict input
 
@@ -58,9 +59,9 @@ func get_string() -> String:
 
 	var text: String = get_plain_text()
 
-	if variant_type == TYPE_STRING:
+	if variant_type == "String":
 		text = "'%s'" % text
-	if variant_type == TYPE_VECTOR2:
+	if variant_type == "Vector2":
 		text = "Vector2(%s)" % text
 
 	return text

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

@@ -5,6 +5,7 @@ extends MarginContainer
 @export var block_path: NodePath
 
 @export var block_type: Types.BlockType = Types.BlockType.EXECUTE
+@export var variant_type: String = ""
 
 var block: Block