Redo categories and variables

Author: wnbaum

addons/block_code/drag_manager/drag_manager.gd

@@ -243,7 +243,9 @@ func drag_block(block: Block, copied_from: Block = null):
 
 
 func copy_block(block: Block) -> Block:
-	return CategoryFactory.construct_block_from_resource(block.block_resource)  # use instantiation
+	var new_block = CategoryFactory.construct_block_from_resource(block.block_resource)
+	new_block.color = block.color
+	return new_block  # use instantiation
 
 
 func copy_picked_block_and_drag(block: Block):

addons/block_code/examples/pong_game/pong_game.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=19 format=3 uid="uid://tf7b8c64ecc0"]
+[gd_scene load_steps=22 format=3 uid="uid://tf7b8c64ecc0"]
 
 [ext_resource type="PackedScene" uid="uid://cg8ibi18um3vg" path="res://addons/block_code/examples/pong_game/space.tscn" id="1_y56ac"]
 [ext_resource type="Script" path="res://addons/block_code/simple_nodes/simple_character/simple_character.gd" id="3_mdrcv"]
@@ -9,59 +9,73 @@
 [ext_resource type="Script" path="res://addons/block_code/block_script_data/block_script_data.gd" id="8_roq8v"]
 [ext_resource type="Script" path="res://addons/block_code/serialization/block_name_tree.gd" id="9_8q2wm"]
 [ext_resource type="PackedScene" uid="uid://c7l70grmkauij" path="res://addons/block_code/examples/pong_game/ball.tscn" id="9_xrqll"]
+[ext_resource type="Script" path="res://addons/block_code/ui/block_canvas/variable_resource.gd" id="12_4rr2k"]
 [ext_resource type="PackedScene" uid="uid://fhoapg3anjsu" path="res://addons/block_code/examples/pong_game/goal_area.tscn" id="12_nqmxu"]
 [ext_resource type="Script" path="res://addons/block_code/simple_nodes/simple_scoring/simple_scoring.gd" id="13_tg3yk"]
 
-[sub_resource type="Resource" id="Resource_vvawh"]
+[sub_resource type="Resource" id="Resource_cbe3h"]
+script = ExtResource("8_dn27x")
+block_name = "set_var_test"
+children = Array[ExtResource("8_dn27x")]([])
+arguments = {
+"value": " world!"
+}
+
+[sub_resource type="Resource" id="Resource_rv0b2"]
 script = ExtResource("8_268uy")
 block_name = "literal"
 arguments = {}
 
-[sub_resource type="Resource" id="Resource_j0g38"]
+[sub_resource type="Resource" id="Resource_7mcfw"]
 script = ExtResource("8_268uy")
-block_name = "concat"
-arguments = {
-"string1": SubResource("Resource_vvawh"),
-"string2": " my name is Will"
-}
+block_name = "get_var_test"
+arguments = {}
 
-[sub_resource type="Resource" id="Resource_sdkgq"]
-script = ExtResource("8_dn27x")
-block_name = "print"
-children = Array[ExtResource("8_dn27x")]([])
+[sub_resource type="Resource" id="Resource_neai5"]
+script = ExtResource("8_268uy")
+block_name = "concat"
 arguments = {
-"text": SubResource("Resource_j0g38")
+"string1": SubResource("Resource_rv0b2"),
+"string2": SubResource("Resource_7mcfw")
 }
 
-[sub_resource type="Resource" id="Resource_exslj"]
+[sub_resource type="Resource" id="Resource_ixdpy"]
 script = ExtResource("8_dn27x")
 block_name = "print"
 children = Array[ExtResource("8_dn27x")]([])
 arguments = {
-"text": "test"
+"text": SubResource("Resource_neai5")
 }
 
-[sub_resource type="Resource" id="Resource_lxr4w"]
+[sub_resource type="Resource" id="Resource_dpxw3"]
 script = ExtResource("8_dn27x")
 block_name = "ready"
-children = Array[ExtResource("8_dn27x")]([SubResource("Resource_sdkgq"), SubResource("Resource_exslj")])
+children = Array[ExtResource("8_dn27x")]([SubResource("Resource_cbe3h"), SubResource("Resource_ixdpy")])
 arguments = {}
 
-[sub_resource type="Resource" id="Resource_ir6yh"]
+[sub_resource type="Resource" id="Resource_h0t3f"]
 script = ExtResource("9_8q2wm")
-root = SubResource("Resource_lxr4w")
-canvas_position = Vector2(50, 0)
+root = SubResource("Resource_dpxw3")
+canvas_position = Vector2(75, 50)
+
+[sub_resource type="Resource" id="Resource_cjine"]
+script = ExtResource("12_4rr2k")
+var_name = "test"
+var_type = 4
 
-[sub_resource type="Resource" id="Resource_np3yn"]
+[sub_resource type="Resource" id="Resource_k5ggu"]
 script = ExtResource("8_roq8v")
 script_inherits = "Node2D"
-block_name_trees = Array[ExtResource("9_8q2wm")]([SubResource("Resource_ir6yh")])
-variables = Array[Resource("res://addons/block_code/ui/block_canvas/variable_resource.gd")]([])
+block_name_trees = Array[ExtResource("9_8q2wm")]([SubResource("Resource_h0t3f")])
+variables = Array[ExtResource("12_4rr2k")]([SubResource("Resource_cjine")])
 generated_script = "extends Node2D
 
+var test: String
+
+
 func _ready():
-	print(((\"hello\") + (' my name is Will')))
-	print(('test'))
+	test = (' world!')
+	print(((\"hello\") + (test)))
 
 "
 version = 0
@@ -105,4 +119,4 @@ zoom = Vector2(0.6, 0.6)
 
 [node name="BlockCode" type="Node" parent="."]
 script = ExtResource("7_2jilj")
-block_script = SubResource("Resource_np3yn")
+block_script = SubResource("Resource_k5ggu")

addons/block_code/serialization/block_resource.gd

@@ -14,7 +14,7 @@ extends Resource
 
 func _init(
 	p_block_name: String = "",
-	p_block_type: Types.BlockType = Types.BlockType.EXECUTE,
+	p_block_type: Types.BlockType = Types.BlockType.STATEMENT,
 	p_variant_type: Variant.Type = TYPE_NIL,
 	p_block_format: String = "",
 	p_statement: String = "",

addons/block_code/simple_nodes/simple_character/simple_character.gd

@@ -115,7 +115,7 @@ static func get_custom_blocks() -> Array[Block]:
 	# Movement
 	b = CategoryFactory.BLOCKS["statement_block"].instantiate()
 	b.block_name = "simplecharacter_move"
-	b.block_type = Types.BlockType.EXECUTE
+	b.block_type = Types.BlockType.STATEMENT
 	b.block_format = "Move with {player: OPTION} buttons as {kind: OPTION}"
 	# TODO: delta here is assumed to be the parameter name of
 	# the _process or _physics_process method:

addons/block_code/simple_nodes/simple_scoring/simple_scoring.gd

@@ -68,15 +68,15 @@ static func get_custom_blocks() -> Array[Block]:
 	for player in _POSITIONS_FOR_PLAYER:
 		b = CategoryFactory.BLOCKS["statement_block"].instantiate()
 		b.block_name = "simplescoring_set_score"
-		b.block_type = Types.BlockType.EXECUTE
+		b.block_type = Types.BlockType.STATEMENT
 		b.block_format = "Set player %s score to {score: INT}" % player
 		b.statement = "score_%s = {score}" % _POSITIONS_FOR_PLAYER[player]
 		b.category = "Info | Score"
 		block_list.append(b)
 
 		b = CategoryFactory.BLOCKS["statement_block"].instantiate()
 		b.block_name = "simplescoring_change_score"
-		b.block_type = Types.BlockType.EXECUTE
+		b.block_type = Types.BlockType.STATEMENT
 		b.block_format = "Change player %s score by {score: INT}" % player
 		b.statement = "score_%s += {score}" % _POSITIONS_FOR_PLAYER[player]
 		b.category = "Info | Score"

addons/block_code/types/types.gd

@@ -4,7 +4,7 @@ extends Node
 enum BlockType {
 	NONE,
 	ENTRY,
-	EXECUTE,
+	STATEMENT,
 	VALUE,
 }
 

addons/block_code/ui/block_canvas/block_canvas.gd

@@ -32,6 +32,8 @@ const ZOOM_FACTOR: float = 1.1
 
 var _current_bsd: BlockScriptData
 var _current_ast_list: ASTList
+var _block_resource_cache = {}
+var _block_category_cache = {}
 var _block_scenes_by_class = {}
 var _panning := false
 var zoom: float:
@@ -141,6 +143,21 @@ func bsd_selected(bsd: BlockScriptData):
 
 
 func _load_bsd(bsd: BlockScriptData):
+	_block_resource_cache = {}
+	_block_category_cache = {}
+
+	var custom_blocks := CategoryFactory.get_blocks_from_bsd(bsd)
+	var custom_categories := CategoryFactory.get_categories_from_bsd(bsd)
+	var block_list := CategoryFactory.get_general_blocks() + custom_blocks
+	var category_list := CategoryFactory.get_categories(block_list, custom_categories)
+
+	# Load blocks and categories into cache so ASTs and UI can be created from names
+	for block_resource in block_list:
+		_block_resource_cache[block_resource.block_name] = block_resource
+	for category in category_list:
+		_block_category_cache[category.name] = category
+	reload_variables(bsd.variables)
+
 	_current_ast_list = ASTList.new()
 
 	for name_tree in bsd.block_name_trees:
@@ -150,6 +167,12 @@ func _load_bsd(bsd: BlockScriptData):
 	reload_ui_from_ast_list()
 
 
+func reload_variables(variables: Array[VariableResource]):
+	var block_list := CategoryFactory.get_variable_blocks(variables)
+	for block_resource in block_list:
+		_block_resource_cache[block_resource.block_name] = block_resource
+
+
 func reload_ui_from_ast_list():
 	for ast_pair in _current_ast_list.array:
 		var root_block = ui_tree_from_ast_node(ast_pair.ast.root)
@@ -159,6 +182,8 @@ func reload_ui_from_ast_list():
 
 func ui_tree_from_ast_node(ast_node: BlockAST.ASTNode) -> Block:
 	var block: StatementBlock = CategoryFactory.construct_block_from_resource(ast_node.data)
+	var category := get_cached_category_from_name(ast_node.data.category)
+	block.color = category.color
 	# Args
 	for arg_name in ast_node.arguments:
 		var argument = ast_node.arguments[arg_name]
@@ -189,6 +214,8 @@ func ui_tree_from_ast_node(ast_node: BlockAST.ASTNode) -> Block:
 
 func ui_tree_from_ast_value_node(ast_value_node: BlockAST.ASTValueNode) -> Block:
 	var block = CategoryFactory.construct_block_from_resource(ast_value_node.data)
+	var category := get_cached_category_from_name(ast_value_node.data.category)
+	block.color = category.color
 	# Args
 	for arg_name in ast_value_node.arguments:
 		var argument = ast_value_node.arguments[arg_name]
@@ -215,6 +242,20 @@ func clear_canvas():
 		child.queue_free()
 
 
+func get_cached_block_resource_from_name(block_name: String) -> BlockResource:
+	if not block_name in _block_resource_cache:
+		push_error("Block tried to load from name %s, but was not provided by block canvas cache." % block_name)
+
+	return _block_resource_cache[block_name]
+
+
+func get_cached_category_from_name(category_name: String) -> BlockCategory:
+	if not category_name in _block_category_cache:
+		push_error("Category tried to load from name %s, but was not provided by block canvas cache." % category_name)
+
+	return _block_category_cache[category_name]
+
+
 func ast_from_name_tree(tree: BlockNameTree) -> BlockAST:
 	var ast: BlockAST = BlockAST.new()
 	ast.root = ast_from_name_tree_recursive(tree.root)
@@ -223,8 +264,7 @@ func ast_from_name_tree(tree: BlockNameTree) -> BlockAST:
 
 func ast_from_name_tree_recursive(node: BlockNameTreeNode):
 	var ast_node := BlockAST.ASTNode.new()
-	var block_resource: BlockResource = CategoryFactory.get_block_resource_from_name(node.block_name)
-	ast_node.data = block_resource
+	ast_node.data = get_cached_block_resource_from_name(node.block_name)
 
 	for arg_name in node.arguments:
 		var argument = node.arguments[arg_name]
@@ -245,7 +285,7 @@ func ast_from_name_tree_recursive(node: BlockNameTreeNode):
 
 func value_ast_from_value_name_tree_recursive(value_node: ValueBlockNameTreeNode) -> BlockAST.ASTValueNode:
 	var ast_value_node := BlockAST.ASTValueNode.new()
-	ast_value_node.data = CategoryFactory.get_block_resource_from_name(value_node.block_name)
+	ast_value_node.data = get_cached_block_resource_from_name(value_node.block_name)
 	# Args
 	for arg_name in value_node.arguments:
 		var argument = value_node.arguments[arg_name]
@@ -499,9 +539,12 @@ func generate_script_from_current_window() -> String:
 		else:
 			combined_entry_asts[statement].root.children.append_array(entry_ast.root.children)
 
-	var script := ""
+	var script := "extends %s\n\n" % _current_bsd.script_inherits
+
+	for variable in _current_bsd.variables:
+		script += "var %s: %s\n\n" % [variable.var_name, type_string(variable.var_type)]
 
-	script += "extends %s\n\n" % _current_bsd.script_inherits
+	script += "\n"
 
 	for entry_statement in combined_entry_asts:
 		var entry_ast: BlockAST = combined_entry_asts[entry_statement]

addons/block_code/ui/blocks/block/block.gd

@@ -15,7 +15,7 @@ signal modified
 @export var color: Color = Color(1., 1., 1.)
 
 ## Type of block to check if can be attached to snap point
-@export var block_type: Types.BlockType = Types.BlockType.EXECUTE
+@export var block_type: Types.BlockType = Types.BlockType.STATEMENT
 
 ## Category to add the block to
 @export var category: String

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

@@ -12,7 +12,7 @@ var args_to_add_after_format: Dictionary  # Only used when loading
 func _ready():
 	super()
 
-	if block_type != Types.BlockType.EXECUTE:
+	if block_type != Types.BlockType.STATEMENT:
 		_background.show_top = false
 	_background.color = color
 

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

@@ -2,7 +2,7 @@
 class_name SnapPoint
 extends MarginContainer
 
-@export var block_type: Types.BlockType = Types.BlockType.EXECUTE
+@export var block_type: Types.BlockType = Types.BlockType.STATEMENT
 
 @export var snapped_block: Block:
 	get:

addons/block_code/ui/main_panel.gd

@@ -266,3 +266,4 @@ func _create_variable(variable: VariableResource):
 	undo_redo.commit_action()
 
 	_picker.reload_variables(new_variables)
+	_block_canvas.reload_variables(new_variables)