update type hints

fix issue with signal for tiles exiting the screen
Add signals for when tiles leave the screen
2024-10-12 15:19:15 -07:00 · 2024-10-06 17:58:26 -07:00 · 2024-10-05 19:05:53 -07:00 · 2024-10-05 14:09:45 -07:00 · 2024-10-04 18:25:33 -07:00 · 2024-10-04 10:01:33 -07:00
19 changed files with 658 additions and 124 deletions
--- a/Tiles/Tile.gd
+++ b/Tiles/Tile.gd
@ -0,0 +1,64 @@
+extends Node3D
+class_name Tile
+
+signal left_screen(tile: Tile)
+
+@onready var spawn_point: Marker3D = $SpawnPoint as Marker3D
+
+var paths: Array[TilePath]
+var path_index: int = 0
+var on_screen_notifier: VisibleOnScreenNotifier3D
+
+var path: TilePath:
+	get = get_current_path
+
+var follow: PathFollow3D:
+	get:
+		return path.follow
+
+var progress_marker: Marker3D:
+	get:
+		return path.marker
+
+var marker_position: Vector3:
+	get:
+		return progress_marker.global_position
+
+var marker_rotation: Vector3:
+	get:
+		return progress_marker.global_rotation
+
+
+func _ready() -> void:
+	on_screen_notifier = Utils.get_first_node_of_type(self, VisibleOnScreenNotifier3D) as VisibleOnScreenNotifier3D
+	on_screen_notifier.screen_exited.connect(_on_screen_exited)
+	load_path()
+
+
+func _process(delta: float) -> void:
+	if is_equal_approx(follow.progress_ratio, 1) and has_next_path():
+		get_next_path().receive_marker(progress_marker)
+		path_index += 1
+
+
+func load_path() -> void:
+	paths.append($MainPath)
+
+
+func get_current_path() -> TilePath:
+	return paths[path_index]
+
+
+func has_next_path() -> bool:
+	return path_index + 1 < paths.size()
+
+
+func get_next_path() -> TilePath:
+	if has_next_path():
+		return paths[path_index+1]
+	return null
+
+
+func _on_screen_exited():
+	if is_equal_approx(follow.progress_ratio, 1) and not has_next_path():
+		left_screen.emit(self)
--- a/Tiles/Tile1.tscn
+++ b/Tiles/Tile1.tscn
@ -0,0 +1,47 @@
+[gd_scene load_steps=7 format=3 uid="uid://cvtgigpmwwv4g"]
+
+[ext_resource type="Script" path="res://Tiles/tile.gd" id="1_wu32c"]
+[ext_resource type="PackedScene" uid="uid://dh2nm1sphyfqx" path="res://Tiles/TilePath.tscn" id="2_ij0mq"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cwetn"]
+cull_mode = 2
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_jju0s"]
+material = SubResource("StandardMaterial3D_cwetn")
+size = Vector2(10, 10)
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_rsriu"]
+material = SubResource("StandardMaterial3D_cwetn")
+size = Vector2(2, 10)
+
+[sub_resource type="Curve3D" id="Curve3D_q1142"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -10),
+"tilts": PackedFloat32Array(0, 0)
+}
+point_count = 2
+
+[node name="Tile1" type="Node3D"]
+script = ExtResource("1_wu32c")
+
+[node name="Floor" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -5)
+mesh = SubResource("PlaneMesh_jju0s")
+
+[node name="Wall1" type="MeshInstance3D" parent="."]
+transform = Transform3D(-4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -5, 1, -5)
+mesh = SubResource("PlaneMesh_rsriu")
+
+[node name="Wall2" type="MeshInstance3D" parent="."]
+transform = Transform3D(-4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, 5, 1, -5)
+mesh = SubResource("PlaneMesh_rsriu")
+
+[node name="SpawnPoint" type="Marker3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -10)
+
+[node name="MainPath" parent="." instance=ExtResource("2_ij0mq")]
+curve = SubResource("Curve3D_q1142")
+
+[node name="OnScreenNotifier" type="VisibleOnScreenNotifier3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -5)
+aabb = AABB(-5, -1, -5, 10, 2, 10)
--- a/Tiles/TilePath.tscn
+++ b/Tiles/TilePath.tscn
@ -0,0 +1,12 @@
+[gd_scene load_steps=2 format=3 uid="uid://dh2nm1sphyfqx"]
+
+[ext_resource type="Script" path="res://Tiles/tile_path.gd" id="1_6jxwt"]
+
+[node name="TilePath" type="Path3D"]
+script = ExtResource("1_6jxwt")
+
+[node name="Follow" type="PathFollow3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 5)
+rotation_mode = 1
+loop = false
+tilt_enabled = false
--- a/Tiles/TileRamp1.tscn
+++ b/Tiles/TileRamp1.tscn
@ -0,0 +1,47 @@
+[gd_scene load_steps=7 format=3 uid="uid://fafw4evt372"]
+
+[ext_resource type="Script" path="res://Tiles/tile.gd" id="1_qgvt0"]
+[ext_resource type="PackedScene" uid="uid://dh2nm1sphyfqx" path="res://Tiles/TilePath.tscn" id="2_66bgp"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cwetn"]
+cull_mode = 2
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_jju0s"]
+material = SubResource("StandardMaterial3D_cwetn")
+size = Vector2(10, 10)
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_rsriu"]
+material = SubResource("StandardMaterial3D_cwetn")
+size = Vector2(2, 10)
+
+[sub_resource type="Curve3D" id="Curve3D_8f65e"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0.00492096, 0.00431776, 0, 0, 0, 0, 0, 0, 0, 4.99628, -8.66443),
+"tilts": PackedFloat32Array(0, 0)
+}
+point_count = 2
+
+[node name="Tile1" type="Node3D"]
+script = ExtResource("1_qgvt0")
+
+[node name="Floor" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 0.866025, -0.5, 0, 0.5, 0.866025, 0, 2.48097, -4.33106)
+mesh = SubResource("PlaneMesh_jju0s")
+
+[node name="Wall1" type="MeshInstance3D" parent="."]
+transform = Transform3D(-4.37114e-08, 1, 0, -0.866025, -3.78552e-08, -0.5, -0.5, -2.18557e-08, 0.866025, -5, 3.347, -3.83106)
+mesh = SubResource("PlaneMesh_rsriu")
+
+[node name="Wall2" type="MeshInstance3D" parent="."]
+transform = Transform3D(-4.37114e-08, 1, 0, -0.866025, -3.78552e-08, -0.5, -0.5, -2.18557e-08, 0.866025, 5, 3.347, -3.83106)
+mesh = SubResource("PlaneMesh_rsriu")
+
+[node name="SpawnPoint" type="Marker3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.95971, -8.6685)
+
+[node name="MainPath" parent="." instance=ExtResource("2_66bgp")]
+curve = SubResource("Curve3D_8f65e")
+
+[node name="OnScreenNotifier" type="VisibleOnScreenNotifier3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.38611, -4.31944)
+aabb = AABB(-5, -3.36357, -4.43531, 10, 6.72714, 8.87062)
--- a/Tiles/TileTurnLeft1.tscn
+++ b/Tiles/TileTurnLeft1.tscn
@ -0,0 +1,90 @@
+[gd_scene load_steps=12 format=3 uid="uid://c0xv7v6ako25a"]
+
+[ext_resource type="Script" path="res://Tiles/tile_turn.gd" id="1_f1mql"]
+[ext_resource type="PackedScene" uid="uid://dh2nm1sphyfqx" path="res://Tiles/TilePath.tscn" id="2_yvi2s"]
+[ext_resource type="PackedScene" uid="uid://dkcjoccsgbggg" path="res://obstacles/Obstacle.tscn" id="3_us011"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cwetn"]
+cull_mode = 2
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_jju0s"]
+material = SubResource("StandardMaterial3D_cwetn")
+size = Vector2(10, 10)
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_rsriu"]
+material = SubResource("StandardMaterial3D_cwetn")
+size = Vector2(2, 10)
+
+[sub_resource type="Curve3D" id="Curve3D_r80si"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4),
+"tilts": PackedFloat32Array(0, 0)
+}
+point_count = 2
+
+[sub_resource type="Curve3D" id="Curve3D_gpbgb"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, -4, 0, 0, 0, 0, 0, 0, 0, 0, -11),
+"tilts": PackedFloat32Array(0, 0)
+}
+point_count = 2
+
+[sub_resource type="Curve3D" id="Curve3D_f5rtl"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, -4, 0, 0, 0, 0, 0, 0, 0, 0, -5, 0, 0, 0, 0, 0, 0, 5, 0, -5),
+"tilts": PackedFloat32Array(0, 0, 0)
+}
+point_count = 3
+
+[sub_resource type="Curve3D" id="Curve3D_a3s3y"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, -4, 0, 0, 0, 0, 0, 0, 0, 0, -5, 0, 0, 0, 0, 0, 0, -5, 0, -5),
+"tilts": PackedFloat32Array(0, 0, 0)
+}
+point_count = 3
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_uvh3q"]
+size = Vector3(9.80943, 5.486, 17.6183)
+
+[node name="Tile1" type="Node3D"]
+script = ExtResource("1_f1mql")
+
+[node name="Floor" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -5)
+mesh = SubResource("PlaneMesh_jju0s")
+
+[node name="Wall1" type="MeshInstance3D" parent="."]
+transform = Transform3D(4.37114e-08, -1, -8.74228e-08, -1, -4.37114e-08, 0, -3.82137e-15, 8.74228e-08, -1, 5, 1, -5)
+mesh = SubResource("PlaneMesh_rsriu")
+
+[node name="Wall2" type="MeshInstance3D" parent="."]
+transform = Transform3D(1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, 0, 1, -10)
+mesh = SubResource("PlaneMesh_rsriu")
+
+[node name="MainPath" parent="." instance=ExtResource("2_yvi2s")]
+curve = SubResource("Curve3D_r80si")
+
+[node name="PathForward" parent="." instance=ExtResource("2_yvi2s")]
+curve = SubResource("Curve3D_gpbgb")
+
+[node name="PathRight" parent="." instance=ExtResource("2_yvi2s")]
+curve = SubResource("Curve3D_f5rtl")
+
+[node name="PathLeft" parent="." instance=ExtResource("2_yvi2s")]
+curve = SubResource("Curve3D_a3s3y")
+
+[node name="SpawnPoint" type="Marker3D" parent="."]
+transform = Transform3D(1.31134e-07, 0, 1, 0, 1, 0, -1, 0, 1.31134e-07, -5, 0, -5)
+
+[node name="Area3D" type="Area3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0194125, 2.2431, -0.65315)
+shape = SubResource("BoxShape3D_uvh3q")
+
+[node name="Obstacle" parent="." instance=ExtResource("3_us011")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -10.1477)
+
+[node name="OnScreenNotifier" type="VisibleOnScreenNotifier3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -5)
+aabb = AABB(-5, -1, -5, 10, 2, 10)
--- a/Tiles/TileTurnRight1.tscn
+++ b/Tiles/TileTurnRight1.tscn
@ -0,0 +1,90 @@
+[gd_scene load_steps=12 format=3 uid="uid://b88nuwe42bhc1"]
+
+[ext_resource type="Script" path="res://Tiles/tile_turn.gd" id="1_wj6en"]
+[ext_resource type="PackedScene" uid="uid://dkcjoccsgbggg" path="res://obstacles/Obstacle.tscn" id="2_tnkvo"]
+[ext_resource type="PackedScene" uid="uid://dh2nm1sphyfqx" path="res://Tiles/TilePath.tscn" id="3_e2l5m"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cwetn"]
+cull_mode = 2
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_jju0s"]
+material = SubResource("StandardMaterial3D_cwetn")
+size = Vector2(10, 10)
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_rsriu"]
+material = SubResource("StandardMaterial3D_cwetn")
+size = Vector2(2, 10)
+
+[sub_resource type="Curve3D" id="Curve3D_r80si"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4),
+"tilts": PackedFloat32Array(0, 0)
+}
+point_count = 2
+
+[sub_resource type="Curve3D" id="Curve3D_gpbgb"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, -4, 0, 0, 0, 0, 0, 0, 0, 0, -11),
+"tilts": PackedFloat32Array(0, 0)
+}
+point_count = 2
+
+[sub_resource type="Curve3D" id="Curve3D_f5rtl"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, -4, 0, 0, 0, 0, 0, 0, 0, 0, -5, 0, 0, 0, 0, 0, 0, 5, 0, -5),
+"tilts": PackedFloat32Array(0, 0, 0)
+}
+point_count = 3
+
+[sub_resource type="Curve3D" id="Curve3D_jhtrd"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, -4, 0, 0, 0, 0, 0, 0, 0, 0, -5, 0, 0, 0, 0, 0, 0, -5, 0, -5),
+"tilts": PackedFloat32Array(0, 0, 0)
+}
+point_count = 3
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_uvh3q"]
+size = Vector3(9.80943, 5.486, 17.6183)
+
+[node name="Tile1" type="Node3D"]
+script = ExtResource("1_wj6en")
+
+[node name="Floor" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -5)
+mesh = SubResource("PlaneMesh_jju0s")
+
+[node name="Wall1" type="MeshInstance3D" parent="."]
+transform = Transform3D(-4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -5, 1, -5)
+mesh = SubResource("PlaneMesh_rsriu")
+
+[node name="Wall2" type="MeshInstance3D" parent="."]
+transform = Transform3D(1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, 0, 1, -10)
+mesh = SubResource("PlaneMesh_rsriu")
+
+[node name="MainPath" parent="." instance=ExtResource("3_e2l5m")]
+curve = SubResource("Curve3D_r80si")
+
+[node name="PathForward" parent="." instance=ExtResource("3_e2l5m")]
+curve = SubResource("Curve3D_gpbgb")
+
+[node name="PathRight" parent="." instance=ExtResource("3_e2l5m")]
+curve = SubResource("Curve3D_f5rtl")
+
+[node name="PathLeft" parent="." instance=ExtResource("3_e2l5m")]
+curve = SubResource("Curve3D_jhtrd")
+
+[node name="SpawnPoint" type="Marker3D" parent="."]
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 5, 0, 0)
+
+[node name="Area3D" type="Area3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0194125, 2.2431, -0.65315)
+shape = SubResource("BoxShape3D_uvh3q")
+
+[node name="Obstacle" parent="." instance=ExtResource("2_tnkvo")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -10.1477)
+
+[node name="OnScreenNotifier" type="VisibleOnScreenNotifier3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -5)
+aabb = AABB(-5, -1, -5, 10, 2, 10)
--- a/Tiles/tile_path.gd
+++ b/Tiles/tile_path.gd
@ -0,0 +1,26 @@
+extends Path3D
+class_name TilePath
+
+@onready var follow: PathFollow3D = $Follow as PathFollow3D
+
+var _marker: Marker3D
+var marker: Marker3D:
+	get:
+		if not has_progress_marker():
+			create_marker()
+		return _marker
+
+
+func has_progress_marker() -> bool:
+	return _marker != null
+
+
+func create_marker() -> Marker3D:
+	_marker = Marker3D.new()
+	follow.add_child(_marker)
+	return _marker
+
+
+func receive_marker(node: Marker3D) -> void:
+	node.reparent(follow)
+	_marker = node
--- a/Tiles/tile_turn.gd
+++ b/Tiles/tile_turn.gd
@ -0,0 +1,52 @@
+extends Tile
+class_name TileTurn
+
+@onready var area_3d: Area3D = $Area3D as Area3D
+@onready var path_forward: TilePath = $PathForward as TilePath
+@onready var path_right: TilePath = $PathRight as TilePath
+@onready var path_left: TilePath = $PathLeft as TilePath
+
+var connected: bool = false
+var current_direction: String = "forward"
+var character: Character
+
+var on_main_path: bool:
+	get:
+		return path_index == 0
+
+
+func _process(delta: float) -> void:
+	var character_found = false
+	for area in area_3d.get_overlapping_areas():
+		if area is Character:
+			character_found = true
+			if connected:
+				break
+			character = area as Character
+			character.turn.connect(turn)
+			connected = true
+	if not character_found and connected:
+		character.turn.disconnect(turn)
+		connected = false
+	super(delta)
+
+
+func load_path() -> void:
+	paths.append($MainPath)
+	paths.append($PathForward)
+
+
+func turn(direction: String) -> void:
+	if on_main_path:
+		current_direction = direction
+		paths[path_index+1] = get_path_by_direction(current_direction)
+
+
+func get_path_by_direction(direction: String) -> TilePath:
+	if direction == "forward" and path_forward != null:
+		return path_forward
+	elif direction == "right" and path_right != null:
+		return path_right
+	elif direction == "left" and path_left != null:
+		return path_left
+	return null
--- a/character/character.gd
+++ b/character/character.gd
@ -1,51 +1,44 @@
-@tool
 extends Area3D
+class_name Character

+signal turn(direction: String)

-@export var path: Path3D:
-	set = set_path
-@export var speed: float = 5.0
+@export var speed: float = 10.0
+@export var tile: Tile

-var follow: PathFollow3D
-var marker: Marker3D
 var total_distance: float = 0.0

+
 func _ready() -> void:
-	if path == null or path is not Path3D:
-		printerr("path is not set to a Path3D")
+	if tile == null or tile is not Tile:
+		printerr("tile is not set to a Tile")
 		return
-	follow = path.get_node("Follow")
-	marker = follow.get_node("Marker")


-func _process(delta):
-	if path == null:
+func _process(delta: float):
+	if tile == null:
 		return
-	global_position = marker.global_position
-	if follow.progress_ratio >= 1:
+	
+	if Input.is_action_just_pressed("ui_right"):
+		turn.emit("right")
+	if Input.is_action_just_pressed("ui_left"):
+		turn.emit("left")
+	
+	global_position = tile.marker_position
+	global_rotation = tile.marker_rotation
+	if tile.follow.progress_ratio >= 1:
 		return
-	var travel = speed * delta
-	follow.progress += travel
+	var travel: float = speed * delta
+	tile.follow.progress += travel
 	total_distance += travel
-	#if is_equal_approx(follow.progress, change_distance):
-		#path = $Path3D2
-		#follow = path.get_node(("Follow"))
-		#change_distance = path.curve.get_baked_length()
-		#marker.reparent(follow)


-func set_path(new_path: Path3D):
-	if new_path is not Path3D:
-		printerr("path must be a Path3D")
-		return
-	path = new_path
-	follow = path.get_node("Follow")
-	marker = follow.get_node("Marker")
-	update_configuration_warnings()
+func _on_area_entered(area):
+	if area is Obstacle:
+		handle_obstacle(area)


-func _get_configuration_warnings() -> PackedStringArray:
-	var warnings = []
-	if path == null or path is not Path3D:
-		warnings.append("path must be set to a Path3D.")
-	return warnings
+func handle_obstacle(obstacle: Obstacle) -> void:
+	if obstacle.effect == Obstacle.ObstacleEffect.Kill:
+		print("kill")
+		speed = 0
--- a/character/character.tscn
+++ b/character/character.tscn
@ -20,3 +20,5 @@ skeleton = NodePath("")

 [node name="Camera3D" type="Camera3D" parent="."]
 transform = Transform3D(1, -4.52535e-08, 1.68888e-07, -1.77636e-15, 0.965926, 0.258819, -1.74846e-07, -0.258819, 0.965926, 0, 2, 2.558)
+
+[connection signal="area_entered" from="." to="." method="_on_area_entered"]
--- a/obstacles/obstacle.gd
+++ b/obstacles/obstacle.gd
@ -0,0 +1,16 @@
+extends Area3D
+class_name Obstacle
+
+@export var effect: ObstacleEffect
+
+enum ObstacleEffect {
+	Kill,
+	Trip,
+}
+
+func _ready() -> void:
+	pass
+
+
+func _process(delta: float) -> void:
+	pass
--- a/obstacles/obstacle.tscn
+++ b/obstacles/obstacle.tscn
@ -0,0 +1,12 @@
+[gd_scene load_steps=3 format=3 uid="uid://dkcjoccsgbggg"]
+
+[ext_resource type="Script" path="res://obstacles/obstacle.gd" id="1_78mjh"]
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_c6wik"]
+size = Vector3(10, 2, 0.5)
+
+[node name="Obstacle" type="Area3D"]
+script = ExtResource("1_78mjh")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("BoxShape3D_c6wik")
--- a/project.godot
+++ b/project.godot
@ -11,9 +11,15 @@ config_version=5
 [application]

 config/name="Fantasy Run"
+run/main_scene="res://world.tscn"
 config/features=PackedStringArray("4.3", "Mobile")
 config/icon="res://icon.svg"

+[autoload]
+
+Utils="*res://utils.gd"
+TileGenerator="*res://tile_generator.gd"
+
 [rendering]

 renderer/rendering_method="mobile"
--- a/tile_generator.gd
+++ b/tile_generator.gd
@ -0,0 +1,82 @@
+extends Node
+
+var tile_set: FR_TileSet = preload("res://tile_set1.tres") as FR_TileSet
+
+var tiles: Array[Tile]
+var tile_index: int = 0
+var run_started: bool = false
+var tile_parent: Node
+var character: Character
+
+var current_tile: Tile:
+	get = get_current_tile
+
+
+func _ready() -> void:
+	pass
+
+
+func _process(delta: float) -> void:
+	if not run_started:
+		return
+	if tiles.size() == 0:
+		return
+	if tiles.size() < 15:
+		add_tile()
+	if is_equal_approx(current_tile.follow.progress_ratio, 1) and has_next_tile():
+		if current_tile.has_next_path():
+			return
+		tile_index += 1
+		character.tile = current_tile
+
+
+func start_run(tile_parent: Node) -> void:
+	self.tile_parent = tile_parent
+	character = Utils.get_first_node_of_type(get_tree().root, Character) as Character
+	get_current_tiles()
+	if tiles.size() == 0:
+		var tile: Tile = generate_tile()
+		tiles.append(tile)
+		tile_parent.add_child(tile)
+	character.tile = current_tile
+	run_started = true
+
+
+func get_current_tiles() -> void:
+	tiles.assign(Utils.get_nodes_of_class(get_tree().root, Tile))
+	for tile in tiles:
+		tile.left_screen.connect(tile_left_screen, CONNECT_ONE_SHOT)
+
+
+func generate_tile() -> Tile:
+	var index = randi_range(0, tile_set.strait_tiles.size()-1)
+	var tile_scene: PackedScene = tile_set.strait_tiles[index]
+	var tile: Tile = tile_scene.instantiate() as Tile
+	tile.left_screen.connect(tile_left_screen, CONNECT_ONE_SHOT)
+	return tile
+
+
+func add_tile() -> void:
+	var last_tile: Tile = tiles[tiles.size()-1]
+	var tile: Tile = generate_tile()
+	tiles.append(tile)
+	tile_parent.add_child(tile)
+	tile.global_position = last_tile.spawn_point.global_position
+	tile.global_rotation = last_tile.spawn_point.global_rotation
+
+
+func has_next_tile() -> bool:
+	return tile_index + 1 < tiles.size()
+
+
+func get_current_tile() -> Tile:
+	return tiles[tile_index]
+
+
+func tile_left_screen(tile: Tile):
+	var index: int = tiles.find(tile)
+	tiles.remove_at(index)
+	if index < tile_index:
+		tile_index -= 1
+	await get_tree().create_timer(1.0).timeout
+	tile.queue_free()
--- a/tile_set.gd
+++ b/tile_set.gd
@ -0,0 +1,6 @@
+extends Resource
+class_name FR_TileSet
+
+@export var strait_tiles: Array[PackedScene]
+@export var ramp_tiles: Array[PackedScene]
+@export var turn_tiles: Array[PackedScene]
--- a/tile_set1.tres
+++ b/tile_set1.tres
@ -0,0 +1,12 @@
+[gd_resource type="Resource" script_class="FR_TileSet" load_steps=5 format=3 uid="uid://b1bl33xgipadd"]
+
+[ext_resource type="Script" path="res://tile_set.gd" id="1_oesq8"]
+[ext_resource type="PackedScene" uid="uid://cvtgigpmwwv4g" path="res://Tiles/Tile1.tscn" id="3_4xf43"]
+[ext_resource type="PackedScene" uid="uid://c0xv7v6ako25a" path="res://Tiles/TileTurnLeft1.tscn" id="4_xn546"]
+[ext_resource type="PackedScene" uid="uid://b88nuwe42bhc1" path="res://Tiles/TileTurnRight1.tscn" id="5_tir2o"]
+
+[resource]
+script = ExtResource("1_oesq8")
+strait_tiles = Array[PackedScene]([ExtResource("3_4xf43")])
+ramp_tiles = Array[PackedScene]([null])
+turn_tiles = Array[PackedScene]([ExtResource("4_xn546"), ExtResource("5_tir2o")])
--- a/utils.gd
+++ b/utils.gd
@ -0,0 +1,23 @@
+extends Node
+
+func get_first_node_of_type(parent: Node, type: Variant, include_internal: bool = false) -> Node:
+	var result = null
+	for child in parent.get_children(include_internal):
+		if is_instance_of(child, type):
+			result = child
+			break
+		elif child.get_child_count(include_internal) > 0:
+			result = get_first_node_of_type(child, type, include_internal)
+			if result != null:
+				break
+	return result
+
+
+func get_nodes_of_class(parent: Node, type: Variant, include_internal: bool = false) -> Array[Variant]:
+	var nodes: Array[Variant] = []
+	for child in parent.get_children(include_internal):
+		if is_instance_of(child, type):
+			nodes.append(child)
+		elif child.get_child_count(include_internal) > 0:
+			nodes.append_array(get_nodes_of_class(child, type, include_internal))
+	return nodes
--- a/world.gd
+++ b/world.gd
@ -1,32 +1,5 @@
 extends Node3D

-@export var speed: float = 10
-@onready var path_3d_2: Path3D = $Path3D2
-@onready var path: Path3D = $Path
-@onready var follow: PathFollow3D = $Path/Follow
-@onready var marker: Marker3D = $Path/Follow/Marker

-var points_added = false
-
-var point_removed = false
-var change_distance: float
-var total_distance: float = 0
-
-# Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	change_distance = path.curve.get_baked_length()
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	%Character.global_position = marker.global_position
-	if follow.progress_ratio >= 1:
-		return
-	var travel = speed * delta
-	follow.progress += travel
-	total_distance += travel
-	if is_equal_approx(follow.progress, change_distance):
-		path = $Path3D2
-		follow = path.get_node(("Follow"))
-		change_distance = path.curve.get_baked_length()
-		marker.reparent(follow)
+	TileGenerator.start_run(self)
--- a/world.tscn
+++ b/world.tscn
@ -1,79 +1,60 @@
-[gd_scene load_steps=9 format=3 uid="uid://blupjt2ulo2g1"]
+[gd_scene load_steps=10 format=3 uid="uid://blupjt2ulo2g1"]

-[ext_resource type="PackedScene" uid="uid://vamte52rvfhy" path="res://character/character.tscn" id="1_nfwx6"]
+[ext_resource type="PackedScene" uid="uid://vamte52rvfhy" path="res://character/Character.tscn" id="1_nfwx6"]
 [ext_resource type="Script" path="res://world.gd" id="1_oloil"]
+[ext_resource type="PackedScene" uid="uid://cvtgigpmwwv4g" path="res://Tiles/Tile1.tscn" id="3_vddfn"]
+[ext_resource type="PackedScene" uid="uid://fafw4evt372" path="res://Tiles/TileRamp1.tscn" id="4_uxk3v"]
+[ext_resource type="PackedScene" uid="uid://b88nuwe42bhc1" path="res://Tiles/TileTurnRight1.tscn" id="5_ynp1e"]
+[ext_resource type="PackedScene" uid="uid://c0xv7v6ako25a" path="res://Tiles/TileTurnLeft1.tscn" id="6_327qh"]

-[sub_resource type="PlaneMesh" id="PlaneMesh_okds2"]
-size = Vector2(10, 10)
+[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_dhu5e"]
+sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
+ground_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)

-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_gqvdt"]
-cull_mode = 2
-albedo_color = Color(1, 0, 0, 1)
+[sub_resource type="Sky" id="Sky_16rbt"]
+sky_material = SubResource("ProceduralSkyMaterial_dhu5e")

-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_2ipub"]
-cull_mode = 2
-albedo_color = Color(0, 1, 0, 1)
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_k12sw"]
-cull_mode = 2
-albedo_color = Color(0, 0, 1, 1)
-
-[sub_resource type="Curve3D" id="Curve3D_5ttj7"]
-_data = {
-"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0.425, 4.6, 0, 0, 0, 0, 0, 0, 0, 0.47, -4.745, 0, 0, 0, 0, 0, 0, 0, 2.84942, -14.0262),
-"tilts": PackedFloat32Array(0, 0, 0)
-}
-point_count = 3
-
-[sub_resource type="Curve3D" id="Curve3D_3mog2"]
-_data = {
-"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 2.8487, -14.2054, 0, 0, 0, 0, 0, 0, 0, 2.81399, -24.5989, 0, 0, 0, 0, 0, 0, -0.0390603, 2.79813, -35.8309),
-"tilts": PackedFloat32Array(0, 0, 0)
-}
-point_count = 3
+[sub_resource type="Environment" id="Environment_c08wk"]
+background_mode = 2
+sky = SubResource("Sky_16rbt")
+tonemap_mode = 2
+glow_enabled = true

 [node name="World" type="Node3D"]
 script = ExtResource("1_oloil")

-[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
-mesh = SubResource("PlaneMesh_okds2")
-
-[node name="MeshInstance3D2" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 0.978896, -0.204359, 0, 0.204359, 0.978896, 0, 0.696645, -10.0891)
-material_override = SubResource("StandardMaterial3D_gqvdt")
-mesh = SubResource("PlaneMesh_okds2")
-
-[node name="MeshInstance3D3" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5446, -20.8633)
-material_override = SubResource("StandardMaterial3D_2ipub")
-mesh = SubResource("PlaneMesh_okds2")
-
-[node name="MeshInstance3D4" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5446, -31.7451)
-material_override = SubResource("StandardMaterial3D_k12sw")
-mesh = SubResource("PlaneMesh_okds2")
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = SubResource("Environment_c08wk")

 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
-transform = Transform3D(-0.827728, -0.0513662, 0.558773, 0.136568, 0.947417, 0.289396, -0.544256, 0.315852, -0.777189, 3.45982, 2.03445, -6.78341)
+transform = Transform3D(0.763207, -0.546639, 0.344531, 0.296667, 0.770123, 0.564712, -0.574024, -0.328781, 0.749933, 3.45982, 2.03445, -6.78341)
+shadow_enabled = true

-[node name="Path" type="Path3D" parent="."]
-curve = SubResource("Curve3D_5ttj7")
+[node name="Character" parent="." node_paths=PackedStringArray("tile") instance=ExtResource("1_nfwx6")]
+tile = NodePath("../Tile1")

-[node name="Follow" type="PathFollow3D" parent="Path"]
-transform = Transform3D(1, 0, 0, 0, 0.999858, 0, 0, 0, 0.999858, 0, 0.425, 4.6)
-rotation_mode = 0
-loop = false
-tilt_enabled = false
+[node name="Tile1" parent="." instance=ExtResource("3_vddfn")]

-[node name="Marker" type="Marker3D" parent="Path/Follow"]
+[node name="Tile2" parent="." instance=ExtResource("3_vddfn")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -10)

-[node name="Path3D2" type="Path3D" parent="."]
-curve = SubResource("Curve3D_3mog2")
+[node name="Tile3" parent="." instance=ExtResource("4_uxk3v")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0861304, -19.3201)

-[node name="Follow" type="PathFollow3D" parent="Path3D2"]
-transform = Transform3D(1, 0, 0, 0, 0.999858, 0, 0, 0, 0.999858, 0, 2.8487, -14.2054)
-rotation_mode = 0
-loop = false
-tilt_enabled = false
+[node name="Tile4" parent="." instance=ExtResource("3_vddfn")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, -27.9971)

-[node name="Character" parent="." instance=ExtResource("1_nfwx6")]
+[node name="Tile5" parent="." instance=ExtResource("5_ynp1e")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, -37.9673)
+
+[node name="Tile6" parent="." instance=ExtResource("3_vddfn")]
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 5.01222, 5, -42.9558)
+
+[node name="Tile7" parent="." instance=ExtResource("5_ynp1e")]
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 15.0122, 5, -42.9555)
+
+[node name="Tile8" parent="." instance=ExtResource("3_vddfn")]
+transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 20, 5, -37.9705)
+
+[node name="Tile9" parent="." instance=ExtResource("6_327qh")]
+transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 20, 5, -27.9764)
Author	SHA1	Message	Date
Matthew Welch	5669da34c5	update type hints fix issue with signal for tiles exiting the screen	2024-10-12 15:19:15 -07:00
Matthew Welch	6da8c2afe5	Add signals for when tiles leave the screen	2024-10-06 17:58:26 -07:00
Matthew Welch	bc8d3a71ef	Continue work on tile generator to replace world.gd	2024-10-05 19:05:53 -07:00
Matthew Welch	c1bb198be6	Start work on tile generator autoload update tile positioning to work with the spawn points	2024-10-05 14:09:45 -07:00
Matthew Welch	932dfd8177	Start work on obstacles	2024-10-04 18:25:33 -07:00
Matthew Welch	d6da1268d8	Update to make scripts use a Tile instead of a Path3D	2024-10-04 10:01:33 -07:00
Matthew Welch	9343dcd520	Start change to talk directly to a Tile instead of a Path3D	2024-10-01 19:45:11 -07:00
Matthew Welch	05d285a750	Update typing Add Tile class	2024-09-30 20:50:05 -07:00
Matthew Welch	0ebd3f2de3	Fix error with moving marker Fix rotation on ramp tile	2024-09-29 19:10:44 -07:00
Matthew Welch	7819007b01	Add initial tile scenes Update script to dynamically find paths to follow	2024-09-27 16:49:56 -07:00