From a7ccd5455d44704d7e7e651505eeb20d3970ee07 Mon Sep 17 00:00:00 2001 From: erkkon Date: Fri, 28 Jul 2023 15:47:27 +0200 Subject: [PATCH] web --- assets/.htaccess | 6 ------ scripts/characters/CharacterBody3D.gd | 1 - scripts/levels/World.gd | 2 +- scripts/ui/MainScreen.gd | 13 ++++++++----- 4 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 assets/.htaccess diff --git a/assets/.htaccess b/assets/.htaccess deleted file mode 100644 index 6294bf2..0000000 --- a/assets/.htaccess +++ /dev/null @@ -1,6 +0,0 @@ -Header add Access-Control-Allow-Origin "*" -Header add Access-Control-Allow-Methods: "GET,POST,OPTIONS,DELETE,PUT" - -Header set Cross-Origin-Embedder-Policy "require-corp" -Header set Cross-Origin-Opener-Policy "same-origin" -Header set Cross-Origin-Resource-Policy "same-site" \ No newline at end of file diff --git a/scripts/characters/CharacterBody3D.gd b/scripts/characters/CharacterBody3D.gd index 5e2fe68..c1ba56a 100644 --- a/scripts/characters/CharacterBody3D.gd +++ b/scripts/characters/CharacterBody3D.gd @@ -32,7 +32,6 @@ var gravity = ProjectSettings.get_setting("physics/3d/default_gravity") func _ready(): paused.visible = false timer_label.set_text((str(seconds) + "s")) - Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) if DataManager.get_data("sensitivity_game_value"): conversion_sensitivity = DataManager.get_data("sensitivity_game_value") if DataManager.get_data("sensitivity"): diff --git a/scripts/levels/World.gd b/scripts/levels/World.gd index c4b65cc..6b81454 100644 --- a/scripts/levels/World.gd +++ b/scripts/levels/World.gd @@ -89,8 +89,8 @@ func _on_menu_pressed(): func full_screen_requested(): if (DisplayServer.window_get_mode() < 3): - full_screen_needed.visible = true Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) + full_screen_needed.visible = true get_tree().paused = true diff --git a/scripts/ui/MainScreen.gd b/scripts/ui/MainScreen.gd index e7c7fa4..5a516ce 100644 --- a/scripts/ui/MainScreen.gd +++ b/scripts/ui/MainScreen.gd @@ -56,7 +56,12 @@ var models3d: Dictionary = { # Called when the node enters the scene tree for the first time. func _ready(): if OS.has_feature("web"): + slider_quality.visible = false + resolution_label.visible = false exit_button.visible = false + else: + DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN) + AddGamesSensitivities() if DataManager.get_data("resolution"): slider_quality.value = DataManager.get_data("resolution") @@ -104,10 +109,10 @@ func AddGames(): gamelist.add_child(hboxc) func startTraining(type): - DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN) + if !OS.has_feature("web"): Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) - Global.game_type = models3d[type] - get_tree().change_scene_to_file("res://scenes/levels/World.tscn") + Global.game_type = models3d[type] + get_tree().change_scene_to_file("res://scenes/levels/World.tscn") func update_resolution_label() -> void: @@ -117,8 +122,6 @@ func update_resolution_label() -> void: func _on_play_pressed(): - Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) - var keys = [] for key in models3d.keys(): keys.push_back(key)