unfa
/
liblast
Archived
3
6
Fork 5
Code Issues 41 Pull Requests 1 Projects Releases 4 Wiki Activity

Fixed Arena reverb and weapon sounds not playing in the center for First Person view.

pull/38/head
unfa 2021-03-30 00:42:51 +02:00
parent 67f1087d94
commit e5e9a8d866
7 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Characters/Default/Default.tscn
View File

@ -9,7 +9,10 @@
script = ExtResource( 2 )
[node name="Hand" parent="Camera" index="0"]
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.394253, -0.559 )
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.390237, -0.559 )
[node name="WeaponBobAnimationTree" parent="Camera/Hand" index="0"]
parameters/playback = SubResource( 1 )
[editable path="Camera/Hand/Weapon"]
[editable path="Camera/Hand/Weapon/Handgun"]

3
Assets/Effects/BulletTracerMaterial.tres
View File

@ -89,9 +89,8 @@ void fragment() {
vec3 n_out4p0 = n_out15p0 * vec3(n_out5p0);
// Fresnel:2
bool n_in2p2 = true;
float n_in2p3 = 0.50000;
float n_out2p0 = n_in2p2 ? (pow(clamp(dot(NORMAL, VIEW), 0.0, 1.0), n_in2p3)) : (pow(1.0 - clamp(dot(NORMAL, VIEW), 0.0, 1.0), n_in2p3));
float n_out2p0 = pow(clamp(dot(NORMAL, VIEW), 0.0, 1.0), n_in2p3);
// ScalarOp:12
float n_in12p1 = 0.50000;

9
Assets/Weapons/Handgun/Handgun.tscn
View File

@ -70,7 +70,10 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.331868, 0.125291, 0 )
[node name="Ejector" parent="Handgun" index="1"]
transform = Transform( -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 0, 0, 1, -0.0373496, 0.126382, -0.00737098 )
[node name="SoundShoot" type="AudioStreamPlayer3D" parent="."]
[node name="Sounds" type="Spatial" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.295478, 0.724833, 0.584699 )
[node name="SoundShoot" type="AudioStreamPlayer3D" parent="Sounds"]
transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0 )
stream = ExtResource( 3 )
attenuation_model = 3
@ -80,10 +83,10 @@ emission_angle_enabled = true
emission_angle_degrees = 60.0
attenuation_filter_cutoff_hz = 15000.0
[node name="SoundEmpty" type="AudioStreamPlayer3D" parent="."]
[node name="SoundEmpty" type="AudioStreamPlayer3D" parent="Sounds"]
stream = ExtResource( 5 )
[node name="SoundReload" type="AudioStreamPlayer3D" parent="."]
[node name="SoundReload" type="AudioStreamPlayer3D" parent="Sounds"]
stream = ExtResource( 6 )
[editable path="Handgun"]

7
Assets/Weapons/Weapon.gd
View File

@ -27,6 +27,9 @@ var cached_fire = false
var casing = preload("res://Assets/Weapons/Handgun/Casing.tscn")
var tracer = preload("res://Assets/Effects/BulletTracer.tscn")
func _ready():
$Sounds.global_transform.origin = get_parent().get_parent().global_transform.origin
func shoot(camera):
if cached_fire == true:
return
@ -93,7 +96,7 @@ func show_muzzle_flash(var rounds_left):
yield(get_tree().create_timer(0.07),"timeout")
$MuzzleFlash.emitting = false
$SoundShoot.play()
$Sounds/SoundShoot.play()
func show_tracer():
var tracer_instance = tracer.instance()
@ -141,4 +144,4 @@ func reload():
sync func play_reload_animation():
$Handgun/AnimationPlayer.play("Reload", 0.5, 1)
$SoundReload.play()
$Sounds/SoundReload.play()

5
Assets/Weapons/Weapon.tscn
View File

@ -69,9 +69,12 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.331868, 0.125291, 0 )
transform = Transform( -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 0, 0, 1, -0.0373496, 0.126382, -0.00737098 )
[node name="SoundShoot" type="AudioStreamPlayer3D" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0207291, 0.0180981, -0.0524354 )
transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.63089, 0.616708, 0.43745 )
stream = ExtResource( 3 )
unit_db = 4.0
unit_size = 25.0
emission_angle_enabled = true
emission_angle_degrees = 60.0
attenuation_filter_cutoff_hz = 15000.0
[editable path="Handgun"]

8
Player.tscn
View File

@ -136,7 +136,7 @@ script = ExtResource( 1 )
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.53592, -0.0651628 )
[node name="Hand" type="Spatial" parent="Camera"]
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.395092, -0.559 )
transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335, -0.393263, -0.559 )
[node name="WeaponBobAnimationTree" type="AnimationTree" parent="Camera/Hand"]
tree_root = SubResource( 12 )
@ -152,6 +152,9 @@ anims/Walk = SubResource( 17 )
[node name="Weapon" parent="Camera/Hand" instance=ExtResource( 2 )]
[node name="SoundShoot" parent="Camera/Hand/Weapon" index="2"]
transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.973939, 0.369099, 0.299776 )
[node name="Billboard" type="MeshInstance" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.49795, 0 )
mesh = SubResource( 18 )
@ -243,3 +246,6 @@ attenuation_filter_cutoff_hz = 15000.0
[connection signal="ammo_changed" from="Camera/Hand/Weapon" to="HUD" method="update_ammo"]
[connection signal="damage_dealt" from="Camera/Hand/Weapon" to="HUD" method="update_crosshair" binds= [ true, true ]]
[editable path="Camera/Hand/Weapon"]
[editable path="Camera/Hand/Weapon/Handgun"]

18
default_bus_layout.tres
View File

@ -1,21 +1,19 @@
[gd_resource type="AudioBusLayout" load_steps=3 format=2]
[gd_resource type="AudioBusLayout" load_steps=2 format=2]
[sub_resource type="AudioEffectDelay" id=1]
resource_name = "Delay"
feedback/active = true
[sub_resource type="AudioEffectReverb" id=2]
[sub_resource type="AudioEffectReverb" id=1]
resource_name = "Reverb"
predelay_feedback = 0.28
room_size = 0.91
hipass = 0.14
dry = 0.0
wet = 1.0
[resource]
bus/0/effect/0/effect = SubResource( 1 )
bus/0/effect/0/enabled = false
bus/1/name = "Reverb1"
bus/1/solo = false
bus/1/mute = false
bus/1/bypass_fx = false
bus/1/volume_db = 0.0
bus/1/volume_db = -30.1465
bus/1/send = "Master"
bus/1/effect/0/effect = SubResource( 2 )
bus/1/effect/0/effect = SubResource( 1 )
bus/1/effect/0/enabled = true