diff --git a/scenes/Player/PersonCamera.tscn b/scenes/Player/PersonCamera.tscn index 28b4e34..a317453 100644 --- a/scenes/Player/PersonCamera.tscn +++ b/scenes/Player/PersonCamera.tscn @@ -4,6 +4,7 @@ [node name="PersonCamera" type="SpringArm"] transform = Transform( 1, -0.000510735, 0.000318044, 0.000510832, 1, -0.000278954, -0.00031789, 0.00027913, 1, 0, 0, 0 ) +collision_mask = 0 spring_length = 20.0 script = ExtResource( 1 ) diff --git a/scripts/Player/3rdPersonCamera.gd b/scripts/Player/3rdPersonCamera.gd index 493d53f..86851c8 100644 --- a/scripts/Player/3rdPersonCamera.gd +++ b/scripts/Player/3rdPersonCamera.gd @@ -5,6 +5,7 @@ extends SpringArm enum CameraMode { FIRST_PERSON , _3RD_PERSON = 2 } # _ is needed other wise it gets confused var scroll_speed = 0.1 #move this to CameraData +var mouse_sensitivity = Vector2(0.1,0.1) var spring_length_last = spring_length var current_camera_mode = CameraMode.FIRST_PERSON @@ -36,8 +37,8 @@ func _input_pass_through(event : InputEventMouse): if Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED: if event is InputEventMouseMotion: - rotation_degrees.x = clamp(rotation_degrees.x - event.relative.y*0.1,-90,90) - rotation_degrees.y -= event.relative.x*0.1 + rotation_degrees.x = clamp(rotation_degrees.x - event.relative.y*mouse_sensitivity.y,-90,90) + rotation_degrees.y -= event.relative.x*mouse_sensitivity.x else: if event.is_action_pressed("scroll_in"): spring_length -= scroll_speed