finally the stupid camera bobbing is working as intended
yay this took way too much time to figure out, btu now its good
This commit is contained in:
parent
42bddd5e87
commit
2a1aab5a14
3 changed files with 6 additions and 4 deletions
|
|
@ -27,10 +27,12 @@ func toggle_flashlight():
|
||||||
sound_controller.play_flashlight_sound()
|
sound_controller.play_flashlight_sound()
|
||||||
|
|
||||||
func _physics_process(delta: float) -> void:
|
func _physics_process(delta: float) -> void:
|
||||||
if not Console.toggled and not player_state.in_menu:
|
if not Console.toggled or not player_state.in_menu:
|
||||||
|
procedural_camera_mover.do(delta)
|
||||||
mouse_motion.y = clamp(mouse_motion.y, -1560, 1560)
|
mouse_motion.y = clamp(mouse_motion.y, -1560, 1560)
|
||||||
player.transform.basis = lerp(player.transform.basis, Basis.from_euler(Vector3(0, mouse_motion.x * -0.001 * PlayerConsts.LOOK_SENSITIVITY, 0)), delta * 30)
|
player.transform.basis = lerp(player.transform.basis, Basis.from_euler(Vector3(0, mouse_motion.x * -0.001 * PlayerConsts.LOOK_SENSITIVITY, 0)), delta * 30)
|
||||||
camera.transform.basis = lerp(camera.transform.basis, Basis.from_euler(Vector3(mouse_motion.y * -0.001 * PlayerConsts.LOOK_SENSITIVITY, 0, 0)), delta * 30)
|
camera.transform.basis = lerp(camera.transform.basis, Basis.from_euler(Vector3(mouse_motion.y * -0.001 * PlayerConsts.LOOK_SENSITIVITY, 0, 0)), delta * 30)
|
||||||
|
camera.rotation += procedural_camera_mover.target_rotation
|
||||||
#handle grabbed object
|
#handle grabbed object
|
||||||
if held_object != null:
|
if held_object != null:
|
||||||
var target_pos = hold_position.global_position
|
var target_pos = hold_position.global_position
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,6 @@ func _physics_process(delta: float) -> void:
|
||||||
player.velocity.z = lerpf(player.velocity.z, 0, delta * 10)
|
player.velocity.z = lerpf(player.velocity.z, 0, delta * 10)
|
||||||
|
|
||||||
player.move_and_slide()
|
player.move_and_slide()
|
||||||
procedural_camera_mover.do(delta)
|
|
||||||
|
|
||||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||||
#func _process(delta: float) -> void:
|
#func _process(delta: float) -> void:
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ var t_bob: float = 0.0
|
||||||
var last_bob_y: float = 0.0
|
var last_bob_y: float = 0.0
|
||||||
var t_breath: float = 0.0
|
var t_breath: float = 0.0
|
||||||
var last_breath_y: float = 0.0
|
var last_breath_y: float = 0.0
|
||||||
|
var target_rotation: Vector3 = Vector3.ZERO
|
||||||
|
|
||||||
var _last_camera_global_position: Vector3 = Vector3.ZERO
|
var _last_camera_global_position: Vector3 = Vector3.ZERO
|
||||||
var _breathing: bool = true
|
var _breathing: bool = true
|
||||||
|
|
@ -51,12 +52,12 @@ func do(delta):
|
||||||
|
|
||||||
camera.transform.origin = camera.transform.origin.lerp(target_pos, delta * 10)
|
camera.transform.origin = camera.transform.origin.lerp(target_pos, delta * 10)
|
||||||
|
|
||||||
var final_pitch = camera.rotation.x + target_rot.x
|
var final_pitch = target_rot.x
|
||||||
var final_roll = target_rot.z
|
var final_roll = target_rot.z
|
||||||
|
|
||||||
var target_basis = Basis.from_euler(Vector3(final_pitch, 0, final_roll))
|
var target_basis = Basis.from_euler(Vector3(final_pitch, 0, final_roll))
|
||||||
|
|
||||||
camera.transform.basis = camera.transform.basis.slerp(target_basis, delta * 5)
|
target_rotation = Vector3(final_pitch, 0, final_roll)
|
||||||
|
|
||||||
func ui_movement_handling(delta: float):
|
func ui_movement_handling(delta: float):
|
||||||
var mouse_offset = -input_controller.mouse_motion_delta * PlayerConsts.UI_MOVEMENT_SENSITIVITY
|
var mouse_offset = -input_controller.mouse_motion_delta * PlayerConsts.UI_MOVEMENT_SENSITIVITY
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue