From 3dc841cf86415202305ce91b28adcbc695546e8b Mon Sep 17 00:00:00 2001 From: derek Date: Mon, 4 Nov 2024 15:34:24 -0600 Subject: [PATCH] more dead cam tweaks --- assets/dead_cam.tscn | 6 ++++-- scripts/dead_cam.gd | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/dead_cam.tscn b/assets/dead_cam.tscn index 45a094d..6c9b674 100644 --- a/assets/dead_cam.tscn +++ b/assets/dead_cam.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://scripts/dead_cam.gd" id="1_qxtd8"] [sub_resource type="SphereShape3D" id="SphereShape3D_qnbpl"] -radius = 0.25 +radius = 1.0 [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_2gkpp"] dof_blur_far_enabled = true @@ -54,7 +54,7 @@ _data = { script = ExtResource("1_qxtd8") [node name="CameraRigid" type="RigidBody3D" parent="."] -collision_mask = 33 +collision_layer = 0 gravity_scale = 0.0 continuous_cd = true @@ -62,10 +62,12 @@ continuous_cd = true shape = SubResource("SphereShape3D_qnbpl") [node name="Camera3D" type="Camera3D" parent="CameraRigid"] +rotation_edit_mode = 1 attributes = SubResource("CameraAttributesPractical_2gkpp") fov = 15.0 [node name="LookRay" type="RayCast3D" parent="."] +rotation_edit_mode = 1 target_position = Vector3(0, 0, -1) [node name="Timer" type="Timer" parent="."] diff --git a/scripts/dead_cam.gd b/scripts/dead_cam.gd index e77a9b9..beba6fe 100644 --- a/scripts/dead_cam.gd +++ b/scripts/dead_cam.gd @@ -87,7 +87,7 @@ func _process(delta): camera.fov = lerp(camera.fov, 40.0, delta * 5) 1: #aim at player from enemy - Engine.time_scale = .1 + Engine.time_scale = .05 AudioServer.set_bus_effect_enabled(0,0,true) taunt_node.visible = false var target_pos_adjusted = Vector3(target.position.x,target.position.y + 2.1,target.position.z) @@ -95,14 +95,13 @@ func _process(delta): look_ray.global_position = target.global_position look_ray.look_at(Vector3(level_control.player.global_position), Vector3.UP) camera.rotation = lerp(camera.rotation,look_ray.rotation,delta * CAMERA_LOOK_SPEED) - camera.fov = lerp(camera.fov, 110.0, delta * 100) + camera.fov = lerp(camera.fov, 100.0, delta * 100) 2: var target_pos_adjusted = Vector3(target.position.x,target.position.y + 2.1,target.position.z) cam_target.global_position = lerp(cam_target.global_position,target_pos_adjusted,delta * MOVE_SPEED) look_ray.global_position = target.global_position look_ray.look_at(Vector3(level_control.player.global_position), Vector3.UP) camera.rotation = lerp(camera.rotation,look_ray.rotation,delta * CAMERA_LOOK_SPEED) - camera.fov = lerp(camera.fov, 110.0, delta * 100) animation_player.play("whiteout")