Skip to content

Commit a5d1373

Browse files
wnbaumwnbaum
authored
Merge pull request #178 from endlessm/T35536-renames
T35536 renames
2 parents 63db182 + b970b43 commit a5d1373

File tree

26 files changed

+191
-234
lines changed

26 files changed

+191
-234
lines changed

‎addons/block_code/block_code_node/block_code.gd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class_name BlockCode
44
extends Node
55

6-
@export var block_script: BlockScriptData = null
6+
@export var block_script: BlockScriptSerialization = null
77

88

99
func _ready():
@@ -25,10 +25,10 @@ func _enter_tree():
2525

2626
# Create script
2727
if block_script == null:
28-
var new_bsd: BlockScriptData = load("res://addons/block_code/ui/bsd_templates/default_bsd.tres").duplicate(true)
29-
new_bsd.script_inherits = _get_custom_or_native_class(get_parent())
30-
new_bsd.generated_script = new_bsd.generated_script.replace("INHERIT_DEFAULT", new_bsd.script_inherits)
31-
block_script = new_bsd
28+
var new_block_script: BlockScriptSerialization = load("res://addons/block_code/serialization/default_block_script.tres").duplicate(true)
29+
new_block_script.script_inherits = _get_custom_or_native_class(get_parent())
30+
new_block_script.generated_script = new_block_script.generated_script.replace("INHERIT_DEFAULT", new_block_script.script_inherits)
31+
block_script = new_block_script
3232

3333

3434
func _update_parent_script():

‎addons/block_code/block_code_plugin.gd‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@ var _selected_block_code: BlockCode
1919
var old_feature_profile: String = ""
2020

2121
const DISABLED_CLASSES := [
22-
"BlockScriptData",
2322
"Block",
2423
"ControlBlock",
2524
"ParameterBlock",
2625
"StatementBlock",
2726
"SnapPoint",
28-
"SerializedBlockTreeNodeArray",
29-
"SerializedBlockTreeNode",
30-
"SerializedBlock",
27+
"BlockSerialization",
28+
"BlockSerializedProperties",
29+
"BlockScriptSerialization",
3130
"CategoryFactory",
3231
]
3332

‎addons/block_code/block_definition.gd‎ renamed to ‎addons/block_code/code_generation/block_definition.gd‎

File renamed without changes.

‎addons/block_code/blocks_catalog.gd‎ renamed to ‎addons/block_code/code_generation/blocks_catalog.gd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extends Object
22

3-
const BlockDefinition = preload("res://addons/block_code/block_definition.gd")
3+
const BlockDefinition = preload("res://addons/block_code/code_generation/block_definition.gd")
44
const Types = preload("res://addons/block_code/types/types.gd")
55

66
static var _catalog: Dictionary
@@ -18,7 +18,7 @@ static func setup():
1818
block_definition.category = "Lifecycle"
1919
_catalog[&"ready_block"] = block_definition
2020

21-
block_definition = BlockDefinition.new(&"print", Types.BlockType.EXECUTE)
21+
block_definition = BlockDefinition.new(&"print", Types.BlockType.STATEMENT)
2222
block_definition.label_template = "print {text: STRING}"
2323
block_definition.code_template = "print({text})"
2424
block_definition.defaults = {"text": "Hello"}

‎addons/block_code/examples/pong_game/pong_game.tscn‎

Lines changed: 58 additions & 83 deletions
Large diffs are not rendered by default.

‎addons/block_code/block_script_data/block_script_data.gd‎ renamed to ‎addons/block_code/serialization/block_script_serialization.gd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
class_name BlockScriptData
1+
class_name BlockScriptSerialization
22
extends Resource
33

44
@export var script_inherits: String
5-
@export var block_trees: SerializedBlockTreeNodeArray
5+
@export var block_trees: Array[BlockSerialization]
66
@export var variables: Array[VariableResource]
77
@export var generated_script: String
88
@export var version: int
99

1010

11-
func _init(p_script_inherits: String = "", p_block_trees: SerializedBlockTreeNodeArray = null, p_variables: Array[VariableResource] = [], p_generated_script: String = "", p_version = 0):
11+
func _init(p_script_inherits: String = "", p_block_trees: Array[BlockSerialization] = [], p_variables: Array[VariableResource] = [], p_generated_script: String = "", p_version = 0):
1212
script_inherits = p_script_inherits
1313
block_trees = p_block_trees
1414
generated_script = p_generated_script

‎addons/block_code/ui/block_canvas/serialized_block_tree_node.gd‎ renamed to ‎addons/block_code/serialization/block_serialization.gd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
class_name SerializedBlockTreeNode
1+
class_name BlockSerialization
22
extends Resource
33

44
@export var name: StringName
55
@export var position: Vector2
66
@export var path_child_pairs: Array
77

88
# TODO: Remove once the data/UI decouple is done.
9-
@export var serialized_block: SerializedBlock
9+
@export var block_serialized_properties: BlockSerializedProperties
1010

1111

12-
func _init(p_name: StringName, p_position: Vector2 = Vector2.ZERO, p_serialized_block: SerializedBlock = null, p_path_child_pairs: Array = []):
12+
func _init(p_name: StringName, p_position: Vector2 = Vector2.ZERO, p_block_serialized_properties: BlockSerializedProperties = null, p_path_child_pairs: Array = []):
1313
name = p_name
1414
position = p_position
15-
serialized_block = p_serialized_block
15+
block_serialized_properties = p_block_serialized_properties
1616
path_child_pairs = p_path_child_pairs

‎addons/block_code/ui/block_canvas/serialized_block.gd‎ renamed to ‎addons/block_code/serialization/block_serialized_properties.gd‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
class_name SerializedBlock
1+
class_name BlockSerializedProperties
22
extends Resource
33

4+
# TODO: Remove this class after removing the remaining serialization.
5+
46
@export var block_class: StringName
57
@export var serialized_props: Array
68

‎addons/block_code/serialization/default_block_script.tres‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
[gd_resource type="Resource" script_class="BlockScriptSerialization" load_steps=6 format=3 uid="uid://dit7fykhl3h48"]
2+
3+
[ext_resource type="Script" path="res://addons/block_code/serialization/block_serialization.gd" id="1_barc5"]
4+
[ext_resource type="Script" path="res://addons/block_code/serialization/block_serialized_properties.gd" id="2_cgfpx"]
5+
[ext_resource type="Script" path="res://addons/block_code/serialization/block_script_serialization.gd" id="4_cqq7x"]
6+
7+
[sub_resource type="Resource" id="Resource_b0aen"]
8+
script = ExtResource("2_cgfpx")
9+
block_class = &"EntryBlock"
10+
serialized_props = [["color", Color(0.92549, 0.231373, 0.34902, 1)], ["scope", ""], ["param_input_strings", {}]]
11+
12+
[sub_resource type="Resource" id="Resource_1h6wi"]
13+
script = ExtResource("1_barc5")
14+
name = &"ready_block"
15+
position = Vector2(54, 47)
16+
path_child_pairs = []
17+
block_serialized_properties = SubResource("Resource_b0aen")
18+
19+
[resource]
20+
script = ExtResource("4_cqq7x")
21+
script_inherits = "INHERIT_DEFAULT"
22+
block_trees = Array[ExtResource("1_barc5")]([SubResource("Resource_1h6wi")])
23+
variables = Array[Resource("res://addons/block_code/ui/block_canvas/variable_resource.gd")]([])
24+
generated_script = "extends INHERIT_DEFAULT"
25+
version = 0

‎addons/block_code/simple_nodes/simple_character/simple_character.gd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ static func get_custom_blocks() -> Array[Block]:
118118
# Movement
119119
b = CategoryFactory.BLOCKS["statement_block"].instantiate()
120120
b.block_name = "simplecharacter_move"
121-
b.block_type = Types.BlockType.EXECUTE
121+
b.block_type = Types.BlockType.STATEMENT
122122
b.block_format = "Move with {player: OPTION} buttons as {kind: OPTION}"
123123
# TODO: delta here is assumed to be the parameter name of
124124
# the _process or _physics_process method:

0 commit comments

Comments
 (0)