From dd1ba0fa9a2cece25e080511d021b8499c258e79 Mon Sep 17 00:00:00 2001 From: Overside srl Date: Sun, 1 Feb 2026 11:22:46 +0100 Subject: [PATCH] fix rail switch --- .godot/editor/editor_script_doc_cache.res | Bin 6243 -> 0 bytes scenes/train_control.tscn | 41 +++++++++++++--------- scripts/rail_swtich.gd | 3 ++ scripts/train_movement.gd | 9 ++--- scripts/traincontrol.gd | 29 ++++++++++++--- 5 files changed, 58 insertions(+), 24 deletions(-) delete mode 100644 .godot/editor/editor_script_doc_cache.res diff --git a/.godot/editor/editor_script_doc_cache.res b/.godot/editor/editor_script_doc_cache.res deleted file mode 100644 index 9284e45e92562e5765333bfab001a3c4b9041710..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6243 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 NQ>o-7Q~^>`Lqqa+TVMbH diff --git a/scenes/train_control.tscn b/scenes/train_control.tscn index c87e58c..5558f9e 100644 --- a/scenes/train_control.tscn +++ b/scenes/train_control.tscn @@ -18,7 +18,7 @@ albedo_color = Color(2.153851e-06, 0.25305444, 0.03645257, 1) [sub_resource type="Curve3D" id="Curve3D_0b1nv"] closed = true _data = { -"points": PackedVector3Array(-2.1678085, -0.043792725, 1.658886, 2.1678085, 0.043792725, -1.658886, -41.962486, 0.03566742, -44.78871, 0, 0, 0, 0, 0, 0, -7.760188, 0.036315918, -45.60305, -6.559948, 0.007423401, -0.16356277, 6.559948, -0.007423401, 0.16356277, 21.603975, 0.03604126, -45.26774, -3.4513588, 0.124176025, -4.544277, 3.4513588, -0.124176025, 4.544277, 40.931072, 0.032211304, -40.35701, 0.5563507, 0.09750366, -3.6268482, -0.5563507, -0.09750366, 3.6268482, 45.43544, 0.021453857, -26.947992, 3.438774, 0.09018707, -3.405755, -3.438774, -0.09018707, 3.405755, 38.412643, 0.47789, -9.150471, 6.6514378, -0.022911072, 0.7331085, -6.6514378, 0.022911072, -0.7331085, 26.96904, 0.003112793, -3.9279928, 5.315757, -0.10071564, 3.6390858, -5.315757, 0.10071564, -3.6390858, 3.4968712, 0.0079574585, -10.011598, 4.9409637, -0.0754776, 2.709568, -4.9409637, 0.0754776, -2.709568, -3.8321874, 0.024543762, -30.849133, 6.360344, 0.0488739, -1.9223251, -6.360344, -0.0488739, 1.9223251, -22.311077, 0.005493164, -31.887383, -0.9378357, 0.12989807, -4.797656, 0.9378357, -0.12989807, 4.797656, -31.28027, 0.015075684, -18.969343, -7.12364, 0.096969604, -3.4738579, 7.12364, -0.096969604, 3.4738579, -23.472174, 0.003479004, -4.4070177, -9.224047, 0.08418274, -2.961853, 9.224047, -0.08418274, 2.961853, 12.167218, -0.011207581, 14.035401, -8.825874, 0.03265381, -1.0564928, 8.825874, -0.03265381, 1.0564928, 32.632145, -0.011894226, 14.993831, 0, 0, 0, 0, 0, 0, 39.98447, -0.019104004, 24.146927, 4.9879036, 0.122177124, -4.6163826, -4.9879036, -0.122177124, 4.6163826, 35.724655, 0.047676086, 33.444454, 8.1661625, 0.014076233, -0.6628723, -8.1661625, -0.014076233, 0.6628723, 11.495622, 0.0951767, 40.647045, 4.9570847, -0.058029175, 2.0650558, -4.9570847, 0.058029175, -2.0650558, -22.318954, 0.051948547, 40.504288, 4.9869003, -0.18069458, 6.610588, -4.9869003, 0.18069458, -6.610588, -37.494194, 0.080329895, 26.992659, -1.5943985, -0.19984436, 7.435757, 1.5943985, 0.19984436, -7.435757, -46.58226, 0.10346222, 8.63745, -0.4270401, -0.16287994, 6.045038, 0.4270401, 0.16287994, -6.045038, -39.930115, 0.050865173, -11.514841, 4.8086166, -0.20992279, 7.687052, -4.8086166, 0.20992279, -7.687052, -35.56163, 0.15759277, -32.8561, -0.73628235, -0.15232849, 5.656826, 0.73628235, 0.15232849, -5.656826, -45.566254, 1.1692886, -39.59991), +"points": PackedVector3Array(-2.1678085, -0.043792725, 1.658886, 2.1678085, 0.043792725, -1.658886, -41.962486, 0.03566742, -44.78871, 0, 0, 0, 0, 0, 0, -7.760188, 0.036315918, -45.60305, -6.559948, 0.007423401, -0.16356277, 6.559948, -0.007423401, 0.16356277, 21.603975, 0.03604126, -45.26774, -3.4513588, 0.124176025, -4.544277, 3.4513588, -0.124176025, 4.544277, 40.931072, 0.032211304, -40.35701, 0.5563507, 0.09750366, -3.6268482, -0.5563507, -0.09750366, 3.6268482, 45.43544, 0.021453857, -26.947992, 3.438774, 0.09018707, -3.405755, -3.438774, -0.09018707, 3.405755, 38.412643, 0.47789, -9.150471, 6.6514378, -0.022911072, 0.7331085, -6.6514378, 0.022911072, -0.7331085, 25.856459, 0.10243797, -3.7440395, 5.315757, -0.10071564, 3.6390858, -5.315757, 0.10071564, -3.6390858, 3.4968712, 0.0079574585, -10.011598, 4.9409637, -0.0754776, 2.709568, -4.9409637, 0.0754776, -2.709568, -3.8321874, 0.024543762, -30.849133, 6.360344, 0.0488739, -1.9223251, -6.360344, -0.0488739, 1.9223251, -22.311077, 0.005493164, -31.887383, -0.9378357, 0.12989807, -4.797656, 0.9378357, -0.12989807, 4.797656, -31.28027, 0.015075684, -18.969343, -7.12364, 0.096969604, -3.4738579, 7.12364, -0.096969604, 3.4738579, -23.472174, 0.003479004, -4.4070177, -9.224047, 0.08418274, -2.961853, 9.224047, -0.08418274, 2.961853, 12.167218, -0.011207581, 14.035401, -8.825874, 0.03265381, -1.0564928, 8.825874, -0.03265381, 1.0564928, 32.632145, -0.011894226, 14.993831, 0, 0, 0, 0, 0, 0, 39.98447, -0.019104004, 24.146927, 4.9879036, 0.122177124, -4.6163826, -4.9879036, -0.122177124, 4.6163826, 35.724655, 0.047676086, 33.444454, 8.1661625, 0.014076233, -0.6628723, -8.1661625, -0.014076233, 0.6628723, 11.495622, 0.0951767, 40.647045, 4.9570847, -0.058029175, 2.0650558, -4.9570847, 0.058029175, -2.0650558, -22.318954, 0.051948547, 40.504288, 4.9869003, -0.18069458, 6.610588, -4.9869003, 0.18069458, -6.610588, -37.494194, 0.080329895, 26.992659, -1.5943985, -0.19984436, 7.435757, 1.5943985, 0.19984436, -7.435757, -46.58226, 0.10346222, 8.63745, -0.4270401, -0.16287994, 6.045038, 0.4270401, 0.16287994, -6.045038, -39.930115, 0.050865173, -11.514841, 4.8086166, -0.20992279, 7.687052, -4.8086166, 0.20992279, -7.687052, -35.56163, 0.15759277, -32.8561, -0.73628235, -0.15232849, 5.656826, 0.73628235, 0.15232849, -5.656826, -45.566254, 0.602231, -39.59991), "tilts": PackedFloat32Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) } point_count = 23 @@ -72,14 +72,6 @@ main_scene = ExtResource("2_0b1nv") mesh = SubResource("PlaneMesh_23vqf") surface_material_override/0 = SubResource("StandardMaterial3D_23vqf") -[node name="Train" type="MeshInstance3D" parent="Ground" unique_id=65189673 node_paths=PackedStringArray("rail_a", "rail_b")] -transform = Transform3D(0.6867333, -0.014397784, -0.89729905, 0, 1.1300678, -0.018126683, 0.8974134, 0.011017708, 0.68664587, -41.962486, 0.03566742, -44.78871) -mesh = ExtResource("3_jy5c4") -skeleton = NodePath("../Rails1/TrainEngine") -script = ExtResource("6_1lqs8") -rail_a = NodePath("../Rails1") -rail_b = NodePath("../Rails2") - [node name="Rails1" type="Path3D" parent="Ground" unique_id=1160818899] curve = SubResource("Curve3D_0b1nv") @@ -131,7 +123,7 @@ path_joined = true material = SubResource("StandardMaterial3D_ihlg3") [node name="TrainEngine" type="PathFollow3D" parent="Ground/Rails1" unique_id=973990755] -transform = Transform3D(0.6867333, -0.014397784, -0.89729905, 0, 1.1300678, -0.018126683, 0.8974134, 0.011017708, 0.68664587, -41.962486, 0.03566742, -44.78871) +transform = Transform3D(0.6867339, -0.014397825, -0.8973005, 0, 1.130071, -0.018126711, 0.8974141, 0.01101774, 0.68664694, -41.962486, 0.03566742, -44.78871) rotation_mode = 4 script = ExtResource("2_jgp6u") @@ -190,6 +182,12 @@ transform = Transform3D(-0.39616987, 0.010450672, -1.0582525, 0, 1.1301593, 0.01 rotation_mode = 4 script = ExtResource("2_jgp6u") +[node name="Train" type="MeshInstance3D" parent="Ground" unique_id=65189673] +transform = Transform3D(0.6867333, -0.014397784, -0.89729905, 0, 1.1300678, -0.018126683, 0.8974134, 0.011017708, 0.68664587, -41.962486, 0.03566742, -44.78871) +mesh = ExtResource("3_jy5c4") +skeleton = NodePath("../Rails1/TrainEngine") +script = ExtResource("6_1lqs8") + [node name="RailSwtich" type="Area3D" parent="Ground" unique_id=1897237029 node_paths=PackedStringArray("rail_a", "rail_b", "switch_to_rail")] script = ExtResource("7_cenvf") rail_a = NodePath("../Rails1") @@ -210,6 +208,7 @@ fov = 11.9 near = 0.001 script = ExtResource("4_jy5c4") train = NodePath("../Ground/Train") +follow_distance = 30.0 [node name="HUD" type="Control" parent="." unique_id=563257159] layout_mode = 3 @@ -229,9 +228,9 @@ label_settings = SubResource("LabelSettings_1lqs8") [node name="camera_label" type="Label" parent="HUD" unique_id=1719494020] layout_mode = 0 -offset_left = 20.0 +offset_left = 19.0 offset_top = 43.0 -offset_right = 1280.0 +offset_right = 1279.0 offset_bottom = 66.0 size_flags_vertical = 0 text = "Camera: " @@ -239,10 +238,10 @@ label_settings = SubResource("LabelSettings_1lqs8") [node name="controls_label" type="Label" parent="HUD" unique_id=1262113688] layout_mode = 0 -offset_left = 20.0 -offset_top = 64.0 -offset_right = 1280.0 -offset_bottom = 217.0 +offset_left = 19.0 +offset_top = 83.0 +offset_right = 1279.0 +offset_bottom = 236.0 size_flags_vertical = 0 text = "Comandi: \"W / S - Accelera / Rallenta\", @@ -251,3 +250,13 @@ text = "Comandi: \"TAB\" - Cambia binario, \"ESC - Esci\"" label_settings = SubResource("LabelSettings_1lqs8") + +[node name="switch_label" type="Label" parent="HUD" unique_id=462391845] +layout_mode = 0 +offset_left = 19.0 +offset_top = 64.0 +offset_right = 1279.0 +offset_bottom = 87.0 +size_flags_vertical = 0 +text = "Binario: " +label_settings = SubResource("LabelSettings_1lqs8") diff --git a/scripts/rail_swtich.gd b/scripts/rail_swtich.gd index ddb6334..68738c7 100644 --- a/scripts/rail_swtich.gd +++ b/scripts/rail_swtich.gd @@ -11,4 +11,7 @@ func toggle_switch() -> void: switch_to_rail = rail_b else: switch_to_rail = rail_a + +#func get_state_name() -> String: + #return "BIANRIO 1" if current_state == SwitchState.LEFT else "BINARIO 2" diff --git a/scripts/train_movement.gd b/scripts/train_movement.gd index 333b547..745bb36 100644 --- a/scripts/train_movement.gd +++ b/scripts/train_movement.gd @@ -9,8 +9,8 @@ signal rail_switched(old_rail: Path3D, new_rail: Path3D) @export var max_speed: float = 50.0 @export var min_speed: float = 3.0 @export var acceleration: float = 12.0 -@export var rail_a: Path3D -@export var rail_b: Path3D +@onready var rail_a: Path3D = $"../Rails1" +@onready var rail_b: Path3D = $"../Rails2" var current_follower: PathFollow3D var current_rail: Path3D @@ -24,6 +24,7 @@ func _ready() -> void: func _process(delta: float) -> void: _handle_input(delta) current_follower.progress += current_speed * delta + global_transform = current_follower.global_transform func _handle_input(delta: float) -> void: @@ -48,8 +49,8 @@ func switch_to_rail(new_rail: Path3D) -> void: var closest_offset = find_closest_point_on_path(new_rail, global_position) current_follower.progress = closest_offset - - + + func find_closest_point_on_path(path: Path3D, point: Vector3) -> float: var curve = path.curve var closest_offset = 0.0 diff --git a/scripts/traincontrol.gd b/scripts/traincontrol.gd index b461bcd..6b4faa9 100644 --- a/scripts/traincontrol.gd +++ b/scripts/traincontrol.gd @@ -5,7 +5,9 @@ extends Node3D @onready var camera_label : Label = $HUD/camera_label @onready var train: MeshInstance3D = $Ground/Train @onready var camera: TrainControlCamera = $TrainCamera - +@onready var rail_switch: Area3D = $Ground/RailSwtich +@onready var switch_label : Label = $HUD/switch_label + func _process(_delta: float) -> void: _update_ui() @@ -14,9 +16,9 @@ func _process(_delta: float) -> void: SceneSwitcher.switch_scene(main_scene.resource_path) if Input.is_action_just_pressed("change_train"): - SceneSwitcher.switch_scene(main_scene.resource_path) - - + _toggle_rail() + + func _update_ui() -> void: if speed_label and train: var kmh = train.get_speed() * 3.6 @@ -24,3 +26,22 @@ func _update_ui() -> void: if camera_label and camera: camera_label.text = "Camera: %s" % camera.get_mode_name() + + +func _toggle_rail() -> void: + if train and rail_switch: + rail_switch.toggle_switch() + train.switch_to_rail(rail_switch.switch_to_rail) + + +func _update_switch_status(): + if not switch_label: + return + + #if rail_switch: + #var state_name = rail_switch.get_state_name() + #var color = Color.YELLOW if rail_switch.current_state == rail_switch.SwitchState.LEFT else Color.CYAN + #switch_label.text = "Scambio: %s" % state_name + #switch_label.add_theme_color_override("font_color", color) + #else: + #switch_label.text = "Scambio: N/A"