Merge pull request #171 from endlessm/T35494-simple-node-no-scenes

Build simple node scenes in code

Author: manuq

addons/block_code/examples/pong_game/pong_game.tscn

@@ -949,7 +949,7 @@ version = 0
 
 [node name="Space" parent="." instance=ExtResource("1_y56ac")]
 
-[node name="PaddleLeft" type="CharacterBody2D" parent="." groups=["paddles"]]
+[node name="PaddleLeft" type="CharacterBody2D" parent="." groups=["affected_by_gravity", "paddles"]]
 modulate = Color(0.509804, 0.360784, 0.972549, 1)
 position = Vector2(64, 544)
 collision_mask = 5
@@ -960,7 +960,7 @@ texture = ExtResource("4_ra7bh")
 script = ExtResource("3_6jaq8")
 block_script = SubResource("Resource_m2svk")
 
-[node name="PaddleRight" type="CharacterBody2D" parent="." groups=["paddles"]]
+[node name="PaddleRight" type="CharacterBody2D" parent="." groups=["affected_by_gravity", "paddles"]]
 modulate = Color(0.509804, 0.360784, 0.972549, 1)
 position = Vector2(1856, 544)
 collision_mask = 5

addons/block_code/simple_nodes/simple_character/_simple_character.gd

@@ -8,8 +8,7 @@ const Types = preload("res://addons/block_code/types/types.gd")
 @export var texture: Texture2D:
 	set = _set_texture
 
-@export var speed: Vector2 = Vector2(300, 300):
-	set = _set_speed
+@export var speed: Vector2 = Vector2(300, 300)
 
 const PLAYER_KEYS = {
 	"player_1":
@@ -28,6 +27,9 @@ const PLAYER_KEYS = {
 	}
 }
 
+var sprite: Sprite2D
+var collision: CollisionShape2D
+
 # Get the gravity from the project settings to be synced with RigidBody nodes.
 var gravity = ProjectSettings.get_setting("physics/2d/default_gravity")
 
@@ -36,43 +38,47 @@ var _jumping = false
 
 func _set_texture(new_texture):
 	texture = new_texture
-
-	if not is_node_ready():
-		return
-
-	$Sprite2D.texture = texture
-	var shape = RectangleShape2D.new()
-	shape.size = Vector2(100, 100) if texture == null else texture.get_size()
-	$CollisionShape2D.shape = shape
+	if is_node_ready():
+		_texture_updated()
 
 
-func _set_speed(new_speed):
-	speed = new_speed
+func _texture_updated():
+	sprite.texture = texture
+	collision.shape.size = Vector2(100, 100) if texture == null else texture.get_size()
 
 
 ## Nodes in the "affected_by_gravity" group will receive gravity changes:
 func on_gravity_changed(new_gravity):
 	gravity = new_gravity
 
 
-func _init():
-	if self.get_parent():
-		return
-
-	var node = preload("res://addons/block_code/simple_nodes/simple_character/_simple_character.tscn").instantiate() as Node
-	node.replace_by(self, true)
-	node.queue_free()
-	scene_file_path = ""
-
-
 func _ready():
-	add_to_group("affected_by_gravity")
 	simple_setup()
 
 
 func simple_setup():
-	_set_texture(texture)
-	_set_speed(speed)
+	add_to_group("affected_by_gravity", true)
+
+	sprite = Sprite2D.new()
+	sprite.name = &"Sprite2D"
+	add_child(sprite)
+
+	collision = CollisionShape2D.new()
+	collision.name = &"CollisionShape2D"
+	collision.shape = RectangleShape2D.new()
+	add_child(collision)
+
+	_texture_updated()
+
+
+func _exit_tree():
+	if collision:
+		collision.queue_free()
+		collision = null
+
+	if sprite:
+		sprite.queue_free()
+		sprite = null
 
 
 func get_custom_class():

addons/block_code/simple_nodes/simple_character/_simple_character.tscn

@@ -11,25 +11,61 @@ const Types = preload("res://addons/block_code/types/types.gd")
 @export var score_right: int:
 	set = _set_score_right
 
-@onready var _score_labels = {
-	"left": %PlayerLeftScore,
-	"right": %PlayerRightScore,
-}
+var _score_labels: Dictionary
 
 const _POSITIONS_FOR_PLAYER = {
 	"1": "left",
 	"2": "right",
 }
 
 
-func _init():
-	if self.get_parent():
-		return
+func _create_score_label(player: String) -> Label:
+	var label := Label.new()
+
+	var x_pos: int
+	match player:
+		"left":
+			x_pos = 240
+		"right":
+			x_pos = 1200
+		_:
+			push_error('Unrecognized SimpleScoring player "%s"' % player)
+
+	label.name = &"Player%sScore" % player.capitalize()
+	label.set_size(Vector2(477, 1080))
+	label.set_position(Vector2(x_pos, 0))
+	label.pivot_offset = Vector2(240, 176)
+	label.size_flags_horizontal = Control.SizeFlags.SIZE_EXPAND_FILL
+	label.size_flags_vertical = Control.SizeFlags.SIZE_FILL
+	label.add_theme_font_size_override("font_size", 200)
+	label.text = "0"
+	label.horizontal_alignment = HorizontalAlignment.HORIZONTAL_ALIGNMENT_CENTER
+
+	return label
+
+
+func _ready():
+	simple_setup()
+
+
+func simple_setup():
+	add_to_group("hud", true)
+
+	var left_label := _create_score_label("left")
+	_score_labels["left"] = left_label
+	_update_label("left", score_left)
+	add_child(left_label)
+
+	var right_label := _create_score_label("right")
+	_score_labels["right"] = right_label
+	_update_label("right", score_right)
+	add_child(right_label)
+
 
-	var node = preload("res://addons/block_code/simple_nodes/simple_scoring/_simple_scoring.tscn").instantiate() as Node
-	node.replace_by(self, true)
-	node.queue_free()
-	scene_file_path = ""
+func _exit_tree():
+	for label in _score_labels.values():
+		label.queue_free()
+	_score_labels.clear()
 
 
 func get_custom_class():
@@ -38,17 +74,13 @@ func get_custom_class():
 
 func _set_score_left(new_score_left):
 	score_left = new_score_left
-	if not is_node_ready():
-		await ready
-	if score_left:
+	if score_left and is_node_ready():
 		_update_label("left", score_left)
 
 
 func _set_score_right(new_score_right):
 	score_right = new_score_right
-	if not is_node_ready():
-		await ready
-	if score_right:
+	if score_right and is_node_ready():
 		_update_label("right", score_right)