derekdz/fps_project_1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dead camera much improved and has the ability to step through multiple stages

Browse Source
This commit is contained in:
derek
2024-11-04 15:19:07 -06:00
parent 475c7967f5
commit 11052fdb99
11 changed files with 193 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/UI/SVG/hitmarkersvg.svg.import
View File

@@ -32,6 +32,6 @@ process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
svg/scale=2.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false

9
assets/bullet.tscn
View File

@@ -56,8 +56,12 @@ emission_energy_multiplier = 4.0
[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_3wvag"]
direction = Vector3(0, 0, 1)
initial_velocity_min = 3.0
initial_velocity_max = 5.0
initial_velocity_min = 1.0
initial_velocity_max = 2.0
collision_mode = 1
collision_friction = 1.0
collision_bounce = 1.0
collision_use_scale = true
[sub_resource type="BoxMesh" id="BoxMesh_qy3jk"]
size = Vector3(0.025, 0.025, 0.025)
@@ -74,6 +78,7 @@ emission_energy_multiplier = 8.0
size = Vector3(0.04, 0.04, 0.04)
[sub_resource type="CylinderShape3D" id="CylinderShape3D_tqvit"]
margin = 0.001
height = 1.5
radius = 0.055

20
assets/dead_cam.tscn
View File

@@ -1,7 +1,10 @@
[gd_scene load_steps=6 format=3 uid="uid://by7qyyhyurlw"]
[gd_scene load_steps=7 format=3 uid="uid://by7qyyhyurlw"]
[ext_resource type="Script" path="res://scripts/dead_cam.gd" id="1_qxtd8"]
[sub_resource type="SphereShape3D" id="SphereShape3D_qnbpl"]
radius = 0.25
[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_2gkpp"]
dof_blur_far_enabled = true
dof_blur_near_enabled = true
@@ -50,7 +53,15 @@ _data = {
[node name="DeadCam" type="Node3D" groups=["spawned"]]
script = ExtResource("1_qxtd8")
[node name="Camera3D" type="Camera3D" parent="."]
[node name="CameraRigid" type="RigidBody3D" parent="."]
collision_mask = 33
gravity_scale = 0.0
continuous_cd = true
[node name="CollisionShape3D" type="CollisionShape3D" parent="CameraRigid"]
shape = SubResource("SphereShape3D_qnbpl")
[node name="Camera3D" type="Camera3D" parent="CameraRigid"]
attributes = SubResource("CameraAttributesPractical_2gkpp")
fov = 15.0
@@ -58,8 +69,7 @@ fov = 15.0
target_position = Vector3(0, 0, -1)
[node name="Timer" type="Timer" parent="."]
wait_time = 0.25
one_shot = true
wait_time = 0.3
[node name="Whiteout" type="ColorRect" parent="."]
material = SubResource("CanvasItemMaterial_m5ien")
@@ -72,4 +82,6 @@ libraries = {
"": SubResource("AnimationLibrary_jsgjq")
}
[node name="CamTarget" type="Node3D" parent="."]
[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"]

42
assets/player.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=27 format=3 uid="uid://drwae3loscbw7"]
[gd_scene load_steps=26 format=3 uid="uid://drwae3loscbw7"]
[ext_resource type="Script" path="res://scripts/player.gd" id="1_x7wms"]
[ext_resource type="PackedScene" uid="uid://dcmno6wafk5hg" path="res://assets/dead_player.tscn" id="2_4hoys"]
@@ -10,7 +10,6 @@
[ext_resource type="Script" path="res://scripts/StaminaCounter.gd" id="6_bgi8o"]
[ext_resource type="Script" path="res://scripts/UIScreenAdjust.gd" id="7_pnp4a"]
[ext_resource type="AudioStream" uid="uid://bki17g7j4kqn4" path="res://assets/Audio/PickupSound Mixdown 3.wav" id="8_dwqsx"]
[ext_resource type="Texture2D" uid="uid://dhgyj08g1ge2o" path="res://assets/UI/SVG/hitmarkersvg.svg" id="8_kupqh"]
[ext_resource type="AudioStream" uid="uid://dyd272r7n2ecd" path="res://assets/Audio/footsteps-shoes-jump-land-beach-sand-SBA-300118001.wav" id="10_tn0pn"]
[ext_resource type="AudioStream" uid="uid://bl8yg1d3bsxs3" path="res://assets/Audio/constant-natural-strong-wind-looping-SBA-300062687.wav" id="11_he7p5"]
[ext_resource type="AudioStream" uid="uid://cy150nsjqp7lt" path="res://assets/Audio/grunt-male-SBA-300282985.wav" id="12_f51u4"]
@@ -38,21 +37,21 @@ shadow_color = Color(0, 0, 0, 1)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_ubnx7"]
shader = ExtResource("14_v5svg")
shader_parameter/overlay = true
shader_parameter/scanlines_opacity = 0.05
shader_parameter/scanlines_width = 0.5
shader_parameter/grille_opacity = 0.05
shader_parameter/scanlines_opacity = 0.4
shader_parameter/scanlines_width = 0.25
shader_parameter/grille_opacity = 0.3
shader_parameter/resolution = Vector2(640, 480)
shader_parameter/pixelate = false
shader_parameter/roll = true
shader_parameter/roll_speed = 1.0
shader_parameter/roll_size = 11.0
shader_parameter/roll_variation = 2.8
shader_parameter/distort_intensity = 0.002
shader_parameter/noise_opacity = 0.015
shader_parameter/roll_size = 15.0
shader_parameter/roll_variation = 1.8
shader_parameter/distort_intensity = 0.003
shader_parameter/noise_opacity = 0.16
shader_parameter/noise_speed = 5.0
shader_parameter/static_noise_intensity = 0.005
shader_parameter/aberration = 0.00300005
shader_parameter/brightness = 1.4
shader_parameter/aberration = 0.00400005
shader_parameter/brightness = 1.69
shader_parameter/discolor = true
shader_parameter/warp_amount = 0.0
shader_parameter/clip_warp = true
@@ -152,18 +151,20 @@ hit_back_faces = false
transform = Transform3D(1, 0, 0, 0, 0.992332, 0.123601, 0, -0.123601, 0.992332, 0, -0.921646, -0.000722691)
[node name="Crosshair" type="TextureRect" parent="Head/Recoil/Camera3D" groups=["hud"]]
offset_right = 40.0
offset_bottom = 40.0
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -20.0
offset_top = -20.0
offset_right = 20.0
offset_bottom = 20.0
grow_horizontal = 2
grow_vertical = 2
texture = ExtResource("6_5m60e")
script = ExtResource("7_pnp4a")
[node name="Hitmarker" type="TextureRect" parent="Head/Recoil/Camera3D"]
visible = false
offset_right = 49.285
offset_bottom = 40.0
texture = ExtResource("8_kupqh")
script = ExtResource("7_pnp4a")
[node name="BulletRay" type="RayCast3D" parent="Head/Recoil/Camera3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.462246)
target_position = Vector3(0, 0, -200)
@@ -188,7 +189,6 @@ offset_right = 0.0
offset_bottom = 0.0
[node name="crtFilter" type="ColorRect" parent="Head/Recoil/Camera3D"]
visible = false
material = SubResource("ShaderMaterial_ubnx7")
offset_right = 3840.0
offset_bottom = 2160.0

2
assets/spider2.tscn
View File

@@ -8,7 +8,7 @@
[ext_resource type="Texture2D" uid="uid://c54kwbix1mo58" path="res://assets/Models/spider1.turret.png" id="3_npupg"]
[ext_resource type="Texture2D" uid="uid://cvi0upsh0e1mu" path="res://assets/Models/spider1.turret.roughness1.png" id="4_hb265"]
[ext_resource type="PackedScene" uid="uid://bbxibqxuiyqic" path="res://assets/stamina_pickup.tscn" id="4_p0ci7"]
[ext_resource type="Texture2D" uid="uid://r7awur11yerj" path="res://assets/Models/spider1.gunbarrel.albedo.png" id="5_dtcjr"]
[ext_resource type="Texture2D" uid="uid://b4s3w1qnqcmgq" path="res://assets/Models/spider1.gunbarrel.albedo.png" id="5_dtcjr"]
[ext_resource type="PackedScene" uid="uid://bmbv6ujc00jhk" path="res://assets/ammo_pickup.tscn" id="5_k1lw4"]
[ext_resource type="PackedScene" uid="uid://c1sypdvjjuww" path="res://assets/money_pickup.tscn" id="6_ihv2y"]
[ext_resource type="Script" path="res://scripts/EnemyTarget.gd" id="7_8vkma"]