From 4822e7347764e638af67a3e363a0994a5d652f9e Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Fri, 16 Feb 2024 10:29:38 +0100 Subject: [PATCH] Added ambience audio bus --- client/player/Player.tscn | 20 +++++++++++--------- client/project.godot | 9 ++++----- client/world/AudioBusLayout.tres | 17 ++++++++++++++--- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/client/player/Player.tscn b/client/player/Player.tscn index 8957859..c35bf8f 100644 --- a/client/player/Player.tscn +++ b/client/player/Player.tscn @@ -15,17 +15,19 @@ [ext_resource type="PackedScene" uid="uid://d0onbq0ad1ap4" path="res://player/rotation/RotationComponent.tscn" id="9_agxqu"] [ext_resource type="PackedScene" uid="uid://bivxnxwi863o0" path="res://player/animation/AnimationComponent.tscn" id="10_bcaeg"] [ext_resource type="AnimationLibrary" uid="uid://d4n0puibh4hyt" path="res://assets/animations/human.blend" id="11_d0e6r"] -[ext_resource type="AudioStream" uid="uid://dlqcgg8v3lvhm" path="res://assets/footsteps/Footsteps-Human-Dirt-00.wav" id="12_h5nrh"] -[ext_resource type="AudioStream" uid="uid://bcn7rvvayhnib" path="res://assets/footsteps/Footsteps-Human-Dirt-02.wav" id="14_6dv65"] +[ext_resource type="AudioStream" uid="uid://dlqcgg8v3lvhm" path="res://assets/audio/footsteps/Footsteps-Human-Dirt-00.wav" id="12_h5nrh"] +[ext_resource type="AudioStream" uid="uid://bgdodasvt7ier" path="res://assets/audio/footsteps/Footsteps-Human-Dirt-01.wav" id="21_a8ikg"] +[ext_resource type="AudioStream" uid="uid://bcn7rvvayhnib" path="res://assets/audio/footsteps/Footsteps-Human-Dirt-02.wav" id="14_6dv65"] +[ext_resource type="AudioStream" uid="uid://bsc8b4ltoiflu" path="res://assets/audio/footsteps/Footsteps-Human-Dirt-03.wav" id="15_1rjwu"] +[ext_resource type="AudioStream" uid="uid://b5xq4cfmo02vw" path="res://assets/audio/footsteps/Footsteps-Human-Dirt-04.wav" id="16_d8yn0"] +[ext_resource type="AudioStream" uid="uid://cpldevudwvnkt" path="res://assets/audio/footsteps/Footsteps-Human-Dirt-05.wav" id="17_74v1j"] +[ext_resource type="AudioStream" uid="uid://biyotdu77a788" path="res://assets/audio/footsteps/Footsteps-Human-Dirt-06.wav" id="18_qkget"] +[ext_resource type="AudioStream" uid="uid://cdywep3dxm0y3" path="res://assets/audio/footsteps/Footsteps-Human-Dirt-07.wav" id="19_vvmo0"] +[ext_resource type="AudioStream" uid="uid://bp8pka7qhcetq" path="res://assets/audio/footsteps/Footsteps-Human-Dirt-08.wav" id="20_srjtb"] [ext_resource type="PackedScene" uid="uid://b8xf4ltqyorjv" path="res://player/skills/SkillsComponent.tscn" id="14_6idcf"] -[ext_resource type="AudioStream" uid="uid://bsc8b4ltoiflu" path="res://assets/footsteps/Footsteps-Human-Dirt-03.wav" id="15_1rjwu"] -[ext_resource type="AudioStream" uid="uid://b5xq4cfmo02vw" path="res://assets/footsteps/Footsteps-Human-Dirt-04.wav" id="16_d8yn0"] -[ext_resource type="AudioStream" uid="uid://cpldevudwvnkt" path="res://assets/footsteps/Footsteps-Human-Dirt-05.wav" id="17_74v1j"] [ext_resource type="PackedScene" uid="uid://clnfp813k7lep" path="res://player/audio/AudioComponent.tscn" id="17_ovrf7"] -[ext_resource type="AudioStream" uid="uid://biyotdu77a788" path="res://assets/footsteps/Footsteps-Human-Dirt-06.wav" id="18_qkget"] -[ext_resource type="AudioStream" uid="uid://cdywep3dxm0y3" path="res://assets/footsteps/Footsteps-Human-Dirt-07.wav" id="19_vvmo0"] -[ext_resource type="AudioStream" uid="uid://bp8pka7qhcetq" path="res://assets/footsteps/Footsteps-Human-Dirt-08.wav" id="20_srjtb"] -[ext_resource type="AudioStream" uid="uid://bgdodasvt7ier" path="res://assets/footsteps/Footsteps-Human-Dirt-01.wav" id="21_a8ikg"] + + [ext_resource type="PackedScene" uid="uid://sx4ein0bju6m" path="res://player/state/StateComponent.tscn" id="28_0i0of"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_2f50n"] diff --git a/client/project.godot b/client/project.godot index 9c36d42..ef56d2e 100644 --- a/client/project.godot +++ b/client/project.godot @@ -37,6 +37,10 @@ window/stretch/mode="canvas_items" window/stretch/aspect="expand" window/vsync/vsync_mode=0 +[editor] + +run/main_run_args="--offline" + [gui] theme/custom="res://ui/theme/theme.tres" @@ -159,8 +163,3 @@ skill_4={ [physics] 3d/run_on_separate_thread=true - -[rendering] - -scaling_3d/mode=2 -scaling_3d/scale=0.77 diff --git a/client/world/AudioBusLayout.tres b/client/world/AudioBusLayout.tres index cc2b456..d0b61fc 100644 --- a/client/world/AudioBusLayout.tres +++ b/client/world/AudioBusLayout.tres @@ -1,11 +1,14 @@ -[gd_resource type="AudioBusLayout" format=3 uid="uid://c4mndkm5mss5f"] +[gd_resource type="AudioBusLayout" load_steps=2 format=3 uid="uid://c4mndkm5mss5f"] + +[sub_resource type="AudioEffectReverb" id="AudioEffectReverb_f5en5"] +resource_name = "Reverb" [resource] bus/1/name = &"Music" bus/1/solo = false bus/1/mute = false bus/1/bypass_fx = false -bus/1/volume_db = 0.0 +bus/1/volume_db = -5 bus/1/send = &"Master" bus/2/name = &"Effects" bus/2/solo = false @@ -17,5 +20,13 @@ bus/3/name = &"Footsteps" bus/3/solo = false bus/3/mute = false bus/3/bypass_fx = false -bus/3/volume_db = -4.50411 +bus/3/volume_db = -4.5 bus/3/send = &"Effects" +bus/4/name = &"Ambience" +bus/4/solo = false +bus/4/mute = false +bus/4/bypass_fx = false +bus/4/volume_db = -25.0 +bus/4/send = &"Master" +bus/4/effect/0/effect = SubResource("AudioEffectReverb_f5en5") +bus/4/effect/0/enabled = true