diff --git a/scenes/levels/World.tscn b/scenes/levels/World.tscn index 86c9ffb..70932d4 100644 --- a/scenes/levels/World.tscn +++ b/scenes/levels/World.tscn @@ -262,21 +262,28 @@ grow_horizontal = 2 grow_vertical = 2 color = Color(0.0745098, 0.0745098, 0.0745098, 0.34902) -[node name="FullScreenNeeded" type="Button" parent="CanvasLayer/FullScreenRequest"] +[node name="Buttons" type="VBoxContainer" parent="CanvasLayer/FullScreenRequest"] layout_mode = 1 anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -503.5 -offset_top = -60.0 -offset_right = 503.5 -offset_bottom = 60.0 +offset_left = -35.0 +offset_top = -33.0 +offset_right = 35.0 +offset_bottom = 33.0 grow_horizontal = 2 grow_vertical = 2 + +[node name="FullScreenNeeded" type="Button" parent="CanvasLayer/FullScreenRequest/Buttons"] +layout_mode = 2 text = "Full screen is needed." +[node name="Menu" type="Button" parent="CanvasLayer/FullScreenRequest/Buttons"] +layout_mode = 2 +text = "Menu" + [node name="MouseCapturedRequested" type="Control" parent="CanvasLayer"] process_mode = 2 layout_mode = 3 @@ -315,6 +322,7 @@ text = "Mouse captured is needed." [connection signal="pause_game" from="Player" to="CanvasLayer/Pause" method="_on_player_pause_game"] [connection signal="pressed" from="CanvasLayer/Pause/Buttons/Resume" to="CanvasLayer/Pause" method="_on_resume_pressed"] [connection signal="pressed" from="CanvasLayer/Pause/Buttons/Menu" to="CanvasLayer/Pause" method="_on_menu_pressed"] -[connection signal="pressed" from="CanvasLayer/FullScreenRequest/FullScreenNeeded" to="." method="_on_full_screen_needed_pressed"] +[connection signal="pressed" from="CanvasLayer/FullScreenRequest/Buttons/FullScreenNeeded" to="." method="_on_full_screen_needed_pressed"] +[connection signal="pressed" from="CanvasLayer/FullScreenRequest/Buttons/Menu" to="CanvasLayer/Pause" method="_on_menu_pressed"] [connection signal="pressed" from="CanvasLayer/MouseCapturedRequested/MouseCapturedNeeded" to="." method="_on_mouse_captured_needed_pressed"] [connection signal="timeout" from="Timer" to="Player" method="_on_timer_timeout"] diff --git a/scripts/levels/World.gd b/scripts/levels/World.gd index 29787af..c4b65cc 100644 --- a/scripts/levels/World.gd +++ b/scripts/levels/World.gd @@ -26,8 +26,8 @@ func _ready(): for x in range(Global.game_type.number_of_initial_targets): spawn_target() - - +func _process(_delta): + full_screen_requested() func target_killed(): @@ -89,9 +89,9 @@ func _on_menu_pressed(): func full_screen_requested(): if (DisplayServer.window_get_mode() < 3): - get_tree().paused = true full_screen_needed.visible = true Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) + get_tree().paused = true diff --git a/scripts/ui/MainScreen.gd b/scripts/ui/MainScreen.gd index 78832e8..e7c7fa4 100644 --- a/scripts/ui/MainScreen.gd +++ b/scripts/ui/MainScreen.gd @@ -104,6 +104,7 @@ func AddGames(): gamelist.add_child(hboxc) func startTraining(type): + DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN) Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) Global.game_type = models3d[type] get_tree().change_scene_to_file("res://scenes/levels/World.tscn")