From 97d6fba2375053cf09c9a0a99d3e8f5cc9704024 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Mon, 12 Feb 2024 11:53:16 +0100 Subject: [PATCH] Improved camera zoom --- client/camera/Camera.gd | 8 +++++--- client/project.godot | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/client/camera/Camera.gd b/client/camera/Camera.gd index 5c2225b..bb3e182 100644 --- a/client/camera/Camera.gd +++ b/client/camera/Camera.gd @@ -12,14 +12,16 @@ func _ready(): target_distance = position.z Global.camera = self -func _unhandled_input(event): - if event.is_action_pressed("zoom_in"): +func _input(event): + if event.is_action_pressed("zoom_in", true): target_distance -= zoom_speed on_distance_changed() + get_viewport().set_input_as_handled() - if event.is_action_pressed("zoom_out"): + if event.is_action_pressed("zoom_out", true): target_distance += zoom_speed on_distance_changed() + get_viewport().set_input_as_handled() func on_distance_changed(): target_distance = clampf(target_distance, zoom_min, zoom_max) diff --git a/client/project.godot b/client/project.godot index 21635d0..59a8276 100644 --- a/client/project.godot +++ b/client/project.godot @@ -119,11 +119,15 @@ toggle_fullscreen={ zoom_in={ "deadzone": 0.5, "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) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null) +, 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":4194437,"key_label":0,"unicode":43,"echo":false,"script":null) ] } zoom_out={ "deadzone": 0.5, "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) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null) +, 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":4194435,"key_label":0,"unicode":45,"echo":false,"script":null) ] }