hide hud on pause and dead camera

This commit is contained in:
derek
2024-10-31 17:00:42 -05:00
parent ec63e57c62
commit 0493216c25
4 changed files with 16 additions and 16 deletions

View File

@@ -9,7 +9,7 @@ dof_blur_near_transition = 4.0
dof_blur_amount = 0.2 dof_blur_amount = 0.2
[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_m5ien"] [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_m5ien"]
blend_mode = 1 blend_mode = 3
[sub_resource type="Animation" id="Animation_4scpm"] [sub_resource type="Animation" id="Animation_4scpm"]
resource_name = "whiteout" resource_name = "whiteout"
@@ -25,7 +25,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0, 0.05), "times": PackedFloat32Array(0, 0.05),
"transitions": PackedFloat32Array(1, 1), "transitions": PackedFloat32Array(1, 1),
"update": 0, "update": 0,
"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)] "values": [Color(1, 1, 1, 0), Color(0, 0, 0, 1)]
} }
tracks/1/type = "method" tracks/1/type = "method"
tracks/1/imported = false tracks/1/imported = false
@@ -58,14 +58,14 @@ fov = 15.0
target_position = Vector3(0, 0, -1) target_position = Vector3(0, 0, -1)
[node name="Timer" type="Timer" parent="."] [node name="Timer" type="Timer" parent="."]
wait_time = 0.2 wait_time = 0.25
one_shot = true one_shot = true
[node name="Whiteout" type="ColorRect" parent="."] [node name="Whiteout" type="ColorRect" parent="."]
material = SubResource("CanvasItemMaterial_m5ien") material = SubResource("CanvasItemMaterial_m5ien")
offset_right = 40.0 offset_right = 40.0
offset_bottom = 40.0 offset_bottom = 40.0
color = Color(1, 1, 1, 0) color = Color(0.8, 0.8, 0.8, 0.2)
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = { libraries = {

View File

@@ -146,7 +146,7 @@ func die():
instance_dead.camera.current = true instance_dead.camera.current = true
player.dead = true player.dead = true
player.crt_filter.visible = true player.crt_filter.visible = true
player.toggle_hud() player.toggle_hud(false)
player.gun.visible = false player.gun.visible = false
player.crosshair.visible = false player.crosshair.visible = false
@@ -162,13 +162,13 @@ func pause_menu():
if paused: if paused:
Engine.time_scale = engine_time_scale_cache Engine.time_scale = engine_time_scale_cache
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
player.toggle_hud() player.toggle_hud(true)
player.pause_menu.hide() player.pause_menu.hide()
else: else:
engine_time_scale_cache = Engine.time_scale engine_time_scale_cache = Engine.time_scale
Engine.time_scale = 0 Engine.time_scale = 0
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
player.toggle_hud() player.toggle_hud(false)
player.pause_menu.show() player.pause_menu.show()
paused = !paused paused = !paused

View File

@@ -73,11 +73,7 @@ func _process(delta):
camera.fov = lerp(camera.fov, 40.0, delta * 5) camera.fov = lerp(camera.fov, 40.0, delta * 5)
elif respawn == true: elif respawn == true:
position = lerp(position,respawn_position,delta * MOVE_SPEED) animation_player.play("whiteout")
camera.global_transform.basis = lerp(camera.global_transform.basis,respawn_rotation,delta * CAMERA_LOOK_SPEED * 1.5)
camera.fov = lerp(camera.fov, respawn_fov, delta * 10)
if global_position.distance_to(respawn_position) <= .5:
animation_player.play("whiteout")
func _on_timer_timeout(): func _on_timer_timeout():

View File

@@ -401,9 +401,13 @@ func enemy_hit():
await get_tree().create_timer(.1).timeout await get_tree().create_timer(.1).timeout
hitmarker.visible = false hitmarker.visible = false
func toggle_hud(): func toggle_hud(hud_on):
crosshair.visible = !hud_visible
ammo_counter.visible = !hud_visible
stamina_counter.visible = !hud_visible
if dead:
crt_filter.visible = hud_on
else:
crosshair.visible = hud_on
ammo_counter.visible = hud_on
stamina_counter.visible = hud_on
hud_visible = !hud_visible hud_visible = !hud_visible