diff --git a/Scenes/GUI/MainMenu.tscn b/Scenes/GUI/MainMenu.tscn index 34cb4b3..dd4d0e1 100644 --- a/Scenes/GUI/MainMenu.tscn +++ b/Scenes/GUI/MainMenu.tscn @@ -517,6 +517,7 @@ Step Forward: Right Arrow Step Backward: Left Arrow Stop: Home Change Camera Angle: Tab" +autowrap_mode = 2 [node name="FreeRoamLabel" type="Label" parent="ControlsScreen/DialogPanel"] layout_mode = 1 @@ -541,7 +542,10 @@ Run: Right Shift Toggle Flashlight: E Open Curtains: C Debug Info: F3 -Open Menu: ESC" +Open Menu: ESC +Zoom In/Out: Mouse Wheel +Zoom Reset: Middle Mouse Button" +autowrap_mode = 2 [node name="CreditsScreen" type="Control" parent="."] visible = false diff --git a/Scripts/Player/Player.gd b/Scripts/Player/Player.gd index 779eb2f..5361beb 100644 --- a/Scripts/Player/Player.gd +++ b/Scripts/Player/Player.gd @@ -64,6 +64,17 @@ func _unhandled_input(event: InputEvent) -> void: pass elif event.is_action_pressed(&"freeroam_debug_menu"): $DebugMenu.visible = !$DebugMenu.visible + elif event.is_action_pressed(&"freeroam_camera_zoom_in"): + if ($Camera.fov > 2): + $Camera.fov -= 2 + camera_sens = maxf(camera_sens - 0.1, 0.1) + elif event.is_action_pressed(&"freeroam_camera_zoom_out"): + if ($Camera.fov < 178): + $Camera.fov += 2 + camera_sens = minf(camera_sens + 0.1, 3) + elif event.is_action_pressed(&"freeroam_camera_zoom_reset"): + $Camera.fov = GlobalVariables.FOV + camera_sens = 3 func _physics_process(delta: float) -> void: if (interact): diff --git a/project.godot b/project.godot index 574a06e..c2e582e 100644 --- a/project.godot +++ b/project.godot @@ -524,6 +524,21 @@ freeroam_debug_menu={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194334,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } +freeroam_camera_zoom_in={ +"deadzone": 0.2, +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":4,"canceled":false,"pressed":false,"double_click":false,"script":null) +] +} +freeroam_camera_zoom_out={ +"deadzone": 0.2, +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":5,"canceled":false,"pressed":false,"double_click":false,"script":null) +] +} +freeroam_camera_zoom_reset={ +"deadzone": 0.2, +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":3,"canceled":false,"pressed":false,"double_click":false,"script":null) +] +} [rendering]