From 838de336a8a04e0abc24a4ad7806b2bf9cec50df Mon Sep 17 00:00:00 2001 From: Hellie-xd Date: Fri, 14 Aug 2026 18:10:29 +0200 Subject: [PATCH] added changable sound emitter you can change in runtime whether its raytraced audio, or audiostream3d (cpu saver) --- default_bus_layout.tres | 22 +++ entities/backpack/backpack_base.tscn | 6 +- entities/player/movement_component.gd | 147 +++++++++++++++++- entities/player/player.gd | 18 +-- entities/player/player.tscn | 84 ++++------ entities/player/prompt_handler.gd | 21 ++- entities/player/sound_controller_component.gd | 20 +-- entities/usable/button/button.tscn | 10 ++ entities/usable/music_player.gd | 10 +- entities/usable/music_player.tscn | 19 +-- .../blocks/wall_base.gd | 7 + .../blocks/wall_base.gd.uid | 1 + .../blocks/wall_base.tscn | 9 ++ project.godot | 1 + scenes/changable_sound_emitter.gd | 99 ++++++++++++ scenes/changable_sound_emitter.gd.uid | 1 + scenes/changable_sound_emitter.tscn | 6 + 17 files changed, 375 insertions(+), 106 deletions(-) create mode 100644 maps/procedural_map_parts_ver_premade/blocks/wall_base.gd create mode 100644 maps/procedural_map_parts_ver_premade/blocks/wall_base.gd.uid create mode 100644 scenes/changable_sound_emitter.gd create mode 100644 scenes/changable_sound_emitter.gd.uid create mode 100644 scenes/changable_sound_emitter.tscn diff --git a/default_bus_layout.tres b/default_bus_layout.tres index f26d8a7..f0ed2cf 100644 --- a/default_bus_layout.tres +++ b/default_bus_layout.tres @@ -13,6 +13,18 @@ cutoff_hz = 32.0 [sub_resource type="AudioEffectLimiter" id="AudioEffectLimiter_j3pel"] resource_name = "Limiter" +[sub_resource type="AudioEffectDelay" id="AudioEffectDelay_j3pel"] +resource_name = "Delay" +tap1_delay_ms = 953.0 +feedback_active = true + +[sub_resource type="AudioEffectReverb" id="AudioEffectReverb_j3pel"] +resource_name = "Reverb" +predelay_msec = 20.0 +predelay_feedback = 0.0 +hipass = 0.42 +wet = 0.24 + [resource] bus/1/name = &"wind" bus/1/solo = false @@ -28,3 +40,13 @@ bus/1/effect/2/effect = SubResource("AudioEffectHighPassFilter_j3pel") bus/1/effect/2/enabled = true bus/1/effect/3/effect = SubResource("AudioEffectLimiter_j3pel") bus/1/effect/3/enabled = true +bus/2/name = &"reverb" +bus/2/solo = false +bus/2/mute = false +bus/2/bypass_fx = false +bus/2/volume_db = 0.0 +bus/2/send = &"Master" +bus/2/effect/0/effect = SubResource("AudioEffectDelay_j3pel") +bus/2/effect/0/enabled = true +bus/2/effect/1/effect = SubResource("AudioEffectReverb_j3pel") +bus/2/effect/1/enabled = true diff --git a/entities/backpack/backpack_base.tscn b/entities/backpack/backpack_base.tscn index 0c7cc3a..ebd5c1f 100644 --- a/entities/backpack/backpack_base.tscn +++ b/entities/backpack/backpack_base.tscn @@ -6,8 +6,12 @@ [sub_resource type="BoxShape3D" id="BoxShape3D_60a4j"] -[node name="BackpackBase" type="RigidBody3D" unique_id=1120864530] +[node name="BackpackBase" type="RigidBody3D" unique_id=1120864530 node_paths=PackedStringArray("mesh", "collision")] script = ExtResource("1_lb1lj") +inventory_size = 5 +scene_path = "uid://bmqm4andgetsd" +mesh = NodePath("MeshInstance3D") +collision = NodePath("CollisionShape3D") metadata/_custom_type_script = "uid://r4y2lmkaoou6" [node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=320717816] diff --git a/entities/player/movement_component.gd b/entities/player/movement_component.gd index 30470af..ac7fed0 100644 --- a/entities/player/movement_component.gd +++ b/entities/player/movement_component.gd @@ -1,3 +1,145 @@ +#class_name MovementComponent extends Node +# +#@export var camera_pivot: Node3D +#@export var player_hit_box: CollisionShape3D +#@export var player: Player +# +#signal jumped +#signal landed(speed: float) +#signal state_changed(state: String) +# +#var mouse_motion: Vector2 = Vector2.ZERO +#var mouse_motion_delta: Vector2 = Vector2.ZERO +#var crouched: bool = false +#var runs: bool = false +#var walks: bool = false +# +#var _player_spawned: bool = false +#var _current_state: String = "idle" +#var _move_toggled: bool = false +# +## CACHE: Fetching Scene Unique Nodes (%) every frame is slightly expensive. +## Cache it once when the node loads. +#@onready var noclip_component: Node = %Noclip +# +#func _ready() -> void: + #Input.mouse_mode = Input.MOUSE_MODE_CAPTURED + #get_tree().create_timer(0.5).timeout.connect(func(): _player_spawned = true) +# +#func _input(event: InputEvent) -> void: + ## EARLY EXIT: Check the fastest conditions first to save CPU cycles + #if Input.get_mouse_mode() != Input.MOUSE_MODE_CAPTURED: + #return + # + #if event is InputEventMouseMotion and not UiManager.in_game_menu.visible: + ## Anti-yank threshold + #if event.relative.length() > 400: + #return + # + #mouse_motion += event.relative + #mouse_motion_delta = event.relative +# +#func toggle_movement(): + #_move_toggled = !_move_toggled + #if _move_toggled: + #Input.mouse_mode = Input.MOUSE_MODE_VISIBLE + #else: + #Input.mouse_mode = Input.MOUSE_MODE_CAPTURED +# +#func handle_joypad_movement(): + #var controller_look = Input.get_vector("look_left", "look_right", "look_up", "look_down") * 50.0 + #if controller_look != Vector2.ZERO: + #mouse_motion += controller_look + #mouse_motion_delta += controller_look +# +#func head_movement(delta: float) -> void: + ## 1. Gather all inputs FIRST + #handle_joypad_movement() + # + ## 2. Clamp the Y motion BEFORE applying it to rotation (Fixes 1-frame camera jitter) + #mouse_motion.y = clampf(mouse_motion.y, -1560.0, 1560.0) + # + ## 3. Apply rotations based on the finalized inputs + #player.rotation.y = lerp_angle(player.rotation.y, mouse_motion.x * -0.001 * PlayerConsts.LOOK_SENSITIVITY, delta * 30.0) + # + #var target_pitch = mouse_motion.y * -0.001 * PlayerConsts.LOOK_SENSITIVITY + #camera_pivot.rotation.x = lerp_angle(camera_pivot.rotation.x, target_pitch, delta * 30.0) +# +#func _physics_process(delta: float) -> void: + #head_movement(delta) + # + #if Console.toggled or UiManager.in_game_menu.visible or UiManager.inventory_menu.visible: + ## Use move_toward for stopping. lerpf() never truly reaches 0, which + ## leaves tiny float decimals calculating forever. + #player.velocity.x = move_toward(player.velocity.x, 0.0, delta * 100.0) + #player.velocity.z = move_toward(player.velocity.z, 0.0, delta * 100.0) + #player.move_and_slide() + #return + # + #if noclip_component.is_noclip: + #noclip_component._process_noclip_movement(delta) + #return + # + #var was_on_floor: bool = player.is_on_floor() + #var fall_velocity: float = player.velocity.y + # + #if not was_on_floor: + #player.velocity += player.get_gravity() * delta + # + #var input_dir := Vector2.ZERO + #if not _move_toggled: + #input_dir = Input.get_vector("left", "right", "forward", "backward") + # + #var target_speed = PlayerConsts.SPEED + #var new_state := "idle" + #var is_moving := input_dir != Vector2.ZERO + # + #if Input.is_action_pressed("crouch"): + #target_speed *= PlayerConsts.CROUCH_SPEED_MULTIPLIER + #new_state = "crouching" + #player_hit_box.shape.height = lerpf(player_hit_box.shape.height, 0.5, delta * 3.0) + #else: + #player_hit_box.shape.height = lerpf(player_hit_box.shape.height, 2.0, delta * 3.0) + # + #if is_moving: + #if Input.is_action_pressed("sprint") and player.stamina_component.stamina > 0: + #target_speed *= PlayerConsts.SPRINT_MULTIPLIER + #new_state = "running" + #else: + #new_state = "walking" + # + #if new_state != _current_state: + #_current_state = new_state + #state_changed.emit(new_state) + # + #if Input.is_action_just_pressed("jump") and was_on_floor and player.stamina_component.stamina > PlayerConsts.JUMP_STAMINA_COST: + #player.velocity.y += PlayerConsts.JUMP_VELOCITY + #jumped.emit() + # + ## Calculate horizontal velocity + #var direction = (player.transform.basis * Vector3(input_dir.x, 0, input_dir.y)).normalized() + #var accel_rate = 6.0 if is_moving else 9.0 + # + ## Vectorize the lerp for cleaner math + #var h_vel = Vector2(player.velocity.x, player.velocity.z) + #var target_h_vel = Vector2(direction.x, direction.z) * target_speed + #h_vel = h_vel.lerp(target_h_vel, delta * accel_rate) + # + #player.velocity.x = h_vel.x + #player.velocity.z = h_vel.y + # + ## Leaning + #var lean_dir = -Input.get_axis("lean_left", "lean_right") * 0.1 + #camera_pivot.rotation.z = lerpf(camera_pivot.rotation.z, lean_dir, delta * 10.0) + # + #var target_lean_pos = -lean_dir * 5.0 + #camera_pivot.position.x = lerpf(camera_pivot.position.x, target_lean_pos, delta * 7.0) + # + #player.move_and_slide() + # + #if not was_on_floor and player.is_on_floor() and _player_spawned: + #landed.emit(fall_velocity) + class_name MovementComponent extends Node @export var camera_pivot: Node3D @@ -47,13 +189,16 @@ func _ready() -> void: Input.mouse_mode = Input.MOUSE_MODE_CAPTURED get_tree().create_timer(0.5).timeout.connect(func(): _player_spawned = true) -func _physics_process(delta: float) -> void: +func head_movement(delta:float) -> void: player.rotation.y = lerp_angle(player.rotation.y, mouse_motion.x * -0.001 * PlayerConsts.LOOK_SENSITIVITY, delta * 30) var target_pitch = mouse_motion.y * -0.001 * PlayerConsts.LOOK_SENSITIVITY camera_pivot.rotation.x = lerp_angle(camera_pivot.rotation.x, target_pitch, delta * 30) handle_joypad_movement() + +func _physics_process(delta: float) -> void: + head_movement(delta) if Console.toggled or UiManager.in_game_menu.visible or UiManager.inventory_menu.visible: player.velocity.x = lerpf(player.velocity.x, 0, delta * 10) diff --git a/entities/player/player.gd b/entities/player/player.gd index c8aa986..6c0c766 100644 --- a/entities/player/player.gd +++ b/entities/player/player.gd @@ -69,15 +69,15 @@ func _ready() -> void: movement_component.state_changed.connect(player_state.handle_state_change) - SignalSniffer.watch(stamina_component) - SignalSniffer.watch(flashlight_component) - SignalSniffer.watch(hotbar_component) - SignalSniffer.watch(movement_component) - SignalSniffer.watch(input_controller) - SignalSniffer.watch(procedural_animator) - SignalSniffer.watch(sound_controller) - SignalSniffer.watch(player_state) - SignalSniffer.watch(inventory_component) + #SignalSniffer.watch(stamina_component) + #SignalSniffer.watch(flashlight_component) + #SignalSniffer.watch(hotbar_component) + #SignalSniffer.watch(movement_component) + #SignalSniffer.watch(input_controller) + #SignalSniffer.watch(procedural_animator) + #SignalSniffer.watch(sound_controller) + #SignalSniffer.watch(player_state) + #SignalSniffer.watch(inventory_component) #temporary so i can prototype func _process(delta: float) -> void: diff --git a/entities/player/player.tscn b/entities/player/player.tscn index 6f39686..a852723 100644 --- a/entities/player/player.tscn +++ b/entities/player/player.tscn @@ -9,12 +9,12 @@ [ext_resource type="Script" uid="uid://cdfis3askl3gb" path="res://entities/player/stamina_component.gd" id="12_kvlxm"] [ext_resource type="PackedScene" uid="uid://bmqm4andgetsd" path="res://entities/backpack/backpack_base.tscn" id="13_b2kln"] [ext_resource type="PackedScene" uid="uid://c02fkimxlbrje" path="res://entities/player/prompt.tscn" id="13_ugbui"] +[ext_resource type="Script" uid="uid://v7j6ovrub5cp" path="res://scenes/changable_sound_emitter.gd" id="13_we0b7"] [ext_resource type="PackedScene" uid="uid://blh2biuk44qqj" path="res://entities/player/cursor.tscn" id="14_fcs02"] [ext_resource type="AudioStream" uid="uid://0q6nhlhgnxu2" path="res://assets/sounds/whitenoise.mp3" id="14_ugbui"] [ext_resource type="Script" uid="uid://dr2lwciaohf6f" path="res://entities/player/movement_component.gd" id="60_s3g0c"] [ext_resource type="Script" uid="uid://cjk6a0da11ge6" path="res://entities/player/procedural_animator.gd" id="61_hggc2"] [ext_resource type="Script" uid="uid://v8er7yn0hdh8" path="res://entities/player/sound_controller_component.gd" id="62_b2j0d"] -[ext_resource type="Script" uid="uid://y8x4svl5kej2" path="res://addons/spatial_audio_3d/spatial_audio_3d.gd" id="62_jbx34"] [ext_resource type="Script" uid="uid://7aa26wi66kqq" path="res://entities/player/prompt_handler.gd" id="63_7l6ig"] [ext_resource type="Script" uid="uid://bvvwwkswavy5x" path="res://entities/player/input_controller_component.gd" id="64_j3r50"] [ext_resource type="Script" uid="uid://7hmwhf7acwpj" path="res://entities/player/state_handler_component.gd" id="65_kssj8"] @@ -22,9 +22,6 @@ [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_g4v7s"] radius = 0.6166992 -[sub_resource type="CylinderShape3D" id="CylinderShape3D_g4v7s"] -radius = 0.04638672 - [sub_resource type="CapsuleMesh" id="CapsuleMesh_b5l5s"] [node name="Player" type="CharacterBody3D" unique_id=423228143 node_paths=PackedStringArray("stamina_component", "flashlight_component", "hotbar_component", "movement_component", "input_controller", "procedural_animator", "sound_controller", "player_state", "inventory_component", "equipped_backpack") groups=["player"]] @@ -71,11 +68,12 @@ head = NodePath("../../CameraPivot/Head") head_texture = NodePath("../../CameraPivot/Head/HeadTexture") wind = NodePath("../../SoundEmitters/Wind") -[node name="PromptHandler" type="Node" parent="Components" unique_id=1264775993 node_paths=PackedStringArray("prompt", "player")] +[node name="PromptHandler" type="Node" parent="Components" unique_id=1264775993 node_paths=PackedStringArray("prompt", "player", "grabbable_finder")] unique_name_in_owner = true script = ExtResource("63_7l6ig") prompt = NodePath("../../Prompt") player = NodePath("../..") +grabbable_finder = NodePath("../../CameraPivot/PlayerCamera/GrabbableFinder") [node name="InputController" type="Node" parent="Components" unique_id=1680856401 node_paths=PackedStringArray("cursor_raycast", "prompt", "player", "hold_position")] unique_name_in_owner = true @@ -125,21 +123,19 @@ shape = SubResource("CapsuleShape3D_g4v7s") [node name="CameraPivot" type="Node3D" parent="." unique_id=963377832] unique_name_in_owner = true -[node name="Head" type="AudioStreamPlayer3D" parent="CameraPivot" unique_id=799817251] +[node name="Head" type="AudioStreamPlayer3D" parent="CameraPivot" unique_id=824331652] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.53598464, 0) -script = ExtResource("62_jbx34") -reverb_volume_db = -12.0 -reverb_fadeintime = -1.0 -reverb_fadeouttime = -1.0 -audiophysics_ticks = 30 -metadata/_custom_type_script = "uid://y8x4svl5kej2" +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6971706, -0.42015946) +panning_strength = 0.0 +script = ExtResource("13_we0b7") +metadata/_custom_type_script = "uid://v7j6ovrub5cp" -[node name="HeadTexture" type="AudioStreamPlayer3D" parent="CameraPivot/Head" unique_id=732916843] +[node name="HeadTexture" type="AudioStreamPlayer3D" parent="CameraPivot/Head" unique_id=2073564595] unique_name_in_owner = true -script = ExtResource("62_jbx34") -audiophysics_ticks = 30 -metadata/_custom_type_script = "uid://y8x4svl5kej2" +panning_strength = 0.0 +script = ExtResource("13_we0b7") +reverb_enabled = false +metadata/_custom_type_script = "uid://v7j6ovrub5cp" [node name="PlayerCamera" type="Camera3D" parent="CameraPivot" unique_id=303347613] unique_name_in_owner = true @@ -169,11 +165,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.5) unique_name_in_owner = true transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0.4, -0.30000004, -0.7) -[node name="GrabbableFinder" type="Area3D" parent="CameraPivot/PlayerCamera" unique_id=988433915] - -[node name="GrabbableFinderShape" type="CollisionShape3D" parent="CameraPivot/PlayerCamera/GrabbableFinder" unique_id=1432103460] -transform = Transform3D(1, 0, 0, 0, -4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, -1) -shape = SubResource("CylinderShape3D_g4v7s") +[node name="GrabbableFinder" type="RayCast3D" parent="CameraPivot/PlayerCamera" unique_id=1419402232] +unique_name_in_owner = true +target_position = Vector3(0, 0, -2) [node name="PlayerAmbiantLight" type="OmniLight3D" parent="CameraPivot/PlayerCamera" unique_id=450850774] light_energy = 0.1 @@ -189,9 +183,6 @@ current = true mesh = SubResource("CapsuleMesh_b5l5s") [node name="BackpackBase" parent="CameraPivot/MeshInstance3D" unique_id=1120864530 instance=ExtResource("13_b2kln")] -unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.18192899, 0.7772218) -inventory_size = 5 [node name="Prompt" parent="." unique_id=318901794 instance=ExtResource("13_ugbui")] unique_name_in_owner = true @@ -245,49 +236,30 @@ one_shot = true [node name="SoundEmitters" type="Node3D" parent="." unique_id=661429541] -[node name="LeftFoot" type="AudioStreamPlayer3D" parent="SoundEmitters" unique_id=575461780] +[node name="LeftFoot" type="AudioStreamPlayer3D" parent="SoundEmitters" unique_id=166056711] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.43042383, -0.90646136, 0) -script = ExtResource("62_jbx34") -reverb_volume_db = -12.0 -reverb_fadeintime = -1.0 -reverb_fadeouttime = -1.0 -audiophysics_ticks = 30 -metadata/_custom_type_script = "uid://y8x4svl5kej2" +script = ExtResource("13_we0b7") +metadata/_custom_type_script = "uid://v7j6ovrub5cp" -[node name="LeftFootTexture" type="AudioStreamPlayer3D" parent="SoundEmitters/LeftFoot" unique_id=1541799094] +[node name="LeftFootTexture" type="AudioStreamPlayer3D" parent="SoundEmitters/LeftFoot" unique_id=412267863] unique_name_in_owner = true -script = ExtResource("62_jbx34") -reverb_volume_db = -12.0 -reverb_fadeintime = -1.0 -reverb_fadeouttime = -1.0 -audiophysics_ticks = 30 -metadata/_custom_type_script = "uid://y8x4svl5kej2" +script = ExtResource("13_we0b7") +metadata/_custom_type_script = "uid://v7j6ovrub5cp" -[node name="RightFoot" type="AudioStreamPlayer3D" parent="SoundEmitters" unique_id=1964632523] +[node name="RightFoot" type="AudioStreamPlayer3D" parent="SoundEmitters" unique_id=1825432395] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.3428033, -0.8860581, 0) -script = ExtResource("62_jbx34") -reverb_volume_db = -12.0 -reverb_fadeintime = -1.0 -reverb_fadeouttime = -1.0 -audiophysics_ticks = 30 -metadata/_custom_type_script = "uid://y8x4svl5kej2" +script = ExtResource("13_we0b7") +metadata/_custom_type_script = "uid://v7j6ovrub5cp" -[node name="RightFootTexture" type="AudioStreamPlayer3D" parent="SoundEmitters/RightFoot" unique_id=370583799] +[node name="RightFootTexture" type="AudioStreamPlayer3D" parent="SoundEmitters/RightFoot" unique_id=332096966] unique_name_in_owner = true -script = ExtResource("62_jbx34") -reverb_volume_db = -12.0 -reverb_fadeintime = -1.0 -reverb_fadeouttime = -1.0 -audiophysics_ticks = 30 -metadata/_custom_type_script = "uid://y8x4svl5kej2" +script = ExtResource("13_we0b7") +metadata/_custom_type_script = "uid://v7j6ovrub5cp" [node name="Wind" type="AudioStreamPlayer3D" parent="SoundEmitters" unique_id=1950929206] unique_name_in_owner = true transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.7, 0) stream = ExtResource("14_ugbui") bus = &"wind" - -[connection signal="body_entered" from="CameraPivot/PlayerCamera/GrabbableFinder" to="Components/PromptHandler" method="_on_action_finder_body_entered"] -[connection signal="body_exited" from="CameraPivot/PlayerCamera/GrabbableFinder" to="Components/PromptHandler" method="_on_action_finder_body_exited"] diff --git a/entities/player/prompt_handler.gd b/entities/player/prompt_handler.gd index 97a3fa2..97ac9ef 100644 --- a/entities/player/prompt_handler.gd +++ b/entities/player/prompt_handler.gd @@ -2,10 +2,11 @@ extends Node @export var prompt: Node @export var player: Player +@export var grabbable_finder: RayCast3D var action_panel_body = null -func _on_action_finder_body_entered(body: Node3D) -> void: +func handle_body(body: Node3D) -> void: if body != null: if body.is_in_group("grabbable"): prompt.change_text("[LMB] to grab") @@ -19,12 +20,16 @@ func _on_action_finder_body_entered(body: Node3D) -> void: prompt.position = -(get_viewport().get_visible_rect().size / 2 - player.camera.unproject_position(action_panel_body.global_position)) / 2 prompt.visible = true -func _on_action_finder_body_exited(body: Node3D) -> void: - if body != null and body == action_panel_body: - action_panel_body = null - prompt.visible = false +func hide_prompt() -> void: + action_panel_body = null + prompt.visible = false func _process(delta: float) -> void: - if action_panel_body != null: - var target_position = get_viewport().get_visible_rect().size / 2 - player.camera.unproject_position(action_panel_body.global_position) - prompt.position = prompt.position.lerp(-target_position / 2, delta * 50) + if grabbable_finder.get_collider(): + var body = grabbable_finder.get_collider() + handle_body(body) + if action_panel_body != null: + var target_position = get_viewport().get_visible_rect().size / 2 - player.camera.unproject_position(action_panel_body.global_position) + prompt.position = prompt.position.lerp(-target_position / 2, delta * 50) + else: + hide_prompt() diff --git a/entities/player/sound_controller_component.gd b/entities/player/sound_controller_component.gd index a864eef..40381bc 100644 --- a/entities/player/sound_controller_component.gd +++ b/entities/player/sound_controller_component.gd @@ -51,12 +51,12 @@ var cur_priorities: Dictionary = { @export var player: Player -@export var left_foot: SpatialAudio3D -@export var right_foot: SpatialAudio3D -@export var right_foot_texture: SpatialAudio3D -@export var left_foot_texture: SpatialAudio3D -@export var head: SpatialAudio3D -@export var head_texture: SpatialAudio3D +@export var left_foot: ChangableAudioStreamPlayer3D +@export var right_foot: ChangableAudioStreamPlayer3D +@export var right_foot_texture: ChangableAudioStreamPlayer3D +@export var left_foot_texture: ChangableAudioStreamPlayer3D +@export var head: ChangableAudioStreamPlayer3D +@export var head_texture: ChangableAudioStreamPlayer3D @export var wind: AudioStreamPlayer3D #var audio_cooldowns = { @@ -86,10 +86,10 @@ enum Priority { } var debug: bool = false -var reverb: bool = true +var reverb: bool = false func _ready() -> void: - var sound_players:Array[SpatialAudio3D] = [left_foot, left_foot_texture, right_foot, right_foot_texture, head, head_texture] + var sound_players:Array[ChangableAudioStreamPlayer3D] = [left_foot, left_foot_texture, right_foot, right_foot_texture, head, head_texture] for i in sound_players: i.debug = debug @@ -107,7 +107,7 @@ func _process(delta: float) -> void: play_wind() -var is_right_leg := func () -> SpatialAudio3D: +var is_right_leg := func () -> ChangableAudioStreamPlayer3D: if _current_leg_is_right: _current_leg_is_right = !_current_leg_is_right return right_foot @@ -139,7 +139,7 @@ func create_spatial_audio_sphere(pos:Vector3, audio:AudioStream, pitch:float = 1 spatial_audio.queue_free() @warning_ignore("shadowed_variable") -func play_stream_on_player(audio_player:SpatialAudio3D, audio:AudioStream, pitch: float = randf_range(.8, 1.2), volume = 1.0, priority: Priority = Priority.LOW): +func play_stream_on_player(audio_player:ChangableAudioStreamPlayer3D, audio:AudioStream, pitch: float = randf_range(.8, 1.2), volume = 1.0, priority: Priority = Priority.LOW): if not is_instance_valid(audio_player) or audio == null or not audio_player: return diff --git a/entities/usable/button/button.tscn b/entities/usable/button/button.tscn index f630a58..e3f39c6 100644 --- a/entities/usable/button/button.tscn +++ b/entities/usable/button/button.tscn @@ -2,10 +2,20 @@ [ext_resource type="Script" uid="uid://d0n5sjpvtitix" path="res://entities/usable/button/button.gd" id="1_r4dn2"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_f58a4"] +albedo_color = Color(0.48374587, 0.48374587, 0.4837458, 1) +metallic = 1.0 +metallic_specular = 1.0 + [sub_resource type="BoxMesh" id="BoxMesh_b5l5s"] +material = SubResource("StandardMaterial3D_f58a4") size = Vector3(1, 1, 0.36279297) +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5rii2"] +albedo_color = Color(0.8627451, 0, 0, 1) + [sub_resource type="CylinderMesh" id="CylinderMesh_b5l5s"] +material = SubResource("StandardMaterial3D_5rii2") top_radius = 0.25927734 bottom_radius = 0.25927734 height = 0.12780762 diff --git a/entities/usable/music_player.gd b/entities/usable/music_player.gd index 1a9d8fd..b70da27 100644 --- a/entities/usable/music_player.gd +++ b/entities/usable/music_player.gd @@ -1,16 +1,12 @@ extends Node3D +@onready var audio_player: ChangableAudioStreamPlayer3D = $ChangableAudioStreamPlayer3D + var is_playing: bool = false -@onready var audio_player: SpatialAudio3D = %SpatialAudio3D -@onready var audiostream_player: AudioStreamPlayer3D = %AudioStreamPlayer3D - func toggle(): is_playing = !is_playing - if is_playing: - audio_player.do_play() - else: - audio_player.do_stop() + audio_player.do_play(3.5) # Called when the node enters the scene tree for the first time. func _ready() -> void: diff --git a/entities/usable/music_player.tscn b/entities/usable/music_player.tscn index 121b6a2..e74d74b 100644 --- a/entities/usable/music_player.tscn +++ b/entities/usable/music_player.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://dw22i7cf5ekjx" path="res://entities/usable/music_player.gd" id="1_johh1"] [ext_resource type="PackedScene" uid="uid://cbpl3s326ok8d" path="res://entities/usable/button/button.tscn" id="1_t1vpp"] -[ext_resource type="Script" uid="uid://y8x4svl5kej2" path="res://addons/spatial_audio_3d/spatial_audio_3d.gd" id="2_gor86"] +[ext_resource type="Script" uid="uid://v7j6ovrub5cp" path="res://scenes/changable_sound_emitter.gd" id="3_johh1"] [ext_resource type="AudioStream" uid="uid://b14wn4nntykxv" path="res://assets/sounds/music/Bach_ Toccata and Fugue in D Minor, BWV 565.mp3" id="3_rf3au"] [sub_resource type="CylinderMesh" id="CylinderMesh_b5l5s"] @@ -33,17 +33,8 @@ mesh = SubResource("CylinderMesh_b5l5s") transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 1.9501299, -0.08872458) mesh = SubResource("TubeTrailMesh_b5l5s") -[node name="SpatialAudio3D" type="AudioStreamPlayer3D" parent="." unique_id=1544705708] -unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.953211, 0.26459026) -stream = ExtResource("3_rf3au") -script = ExtResource("2_gor86") -occlusion_lp_cutoff = 300 -collision_mask = 17 -reverb_raycast_count = 8 -debug = true -metadata/_custom_type_script = "uid://y8x4svl5kej2" - -[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="." unique_id=602010304] -unique_name_in_owner = true +[node name="ChangableAudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="." unique_id=2198078 groups=["sound_player"]] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.9425293, 0.23302945) stream = ExtResource("3_rf3au") +script = ExtResource("3_johh1") +metadata/_custom_type_script = "uid://v7j6ovrub5cp" diff --git a/maps/procedural_map_parts_ver_premade/blocks/wall_base.gd b/maps/procedural_map_parts_ver_premade/blocks/wall_base.gd new file mode 100644 index 0000000..153a642 --- /dev/null +++ b/maps/procedural_map_parts_ver_premade/blocks/wall_base.gd @@ -0,0 +1,7 @@ +extends StaticBody3D + +func _on_visible_on_screen_notifier_3d_screen_entered() -> void: + disable_mode = CollisionObject3D.DISABLE_MODE_MAKE_STATIC + +func _on_visible_on_screen_notifier_3d_screen_exited() -> void: + disable_mode = CollisionObject3D.DISABLE_MODE_REMOVE diff --git a/maps/procedural_map_parts_ver_premade/blocks/wall_base.gd.uid b/maps/procedural_map_parts_ver_premade/blocks/wall_base.gd.uid new file mode 100644 index 0000000..3496b8d --- /dev/null +++ b/maps/procedural_map_parts_ver_premade/blocks/wall_base.gd.uid @@ -0,0 +1 @@ +uid://0iyg3xfklibl diff --git a/maps/procedural_map_parts_ver_premade/blocks/wall_base.tscn b/maps/procedural_map_parts_ver_premade/blocks/wall_base.tscn index 2589177..e58b63f 100644 --- a/maps/procedural_map_parts_ver_premade/blocks/wall_base.tscn +++ b/maps/procedural_map_parts_ver_premade/blocks/wall_base.tscn @@ -1,5 +1,7 @@ [gd_scene format=3 uid="uid://dpipi1pttxrcp"] +[ext_resource type="Script" uid="uid://0iyg3xfklibl" path="res://maps/procedural_map_parts_ver_premade/blocks/wall_base.gd" id="1_0vkv4"] + [sub_resource type="BoxShape3D" id="BoxShape3D_pxn7n"] size = Vector3(3, 3, 0.5260132) @@ -7,6 +9,7 @@ size = Vector3(3, 3, 0.5260132) size = Vector3(3, 3, 0.5432373) [node name="WallBase" type="StaticBody3D" unique_id=1490575404] +script = ExtResource("1_0vkv4") [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=1929329994] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.042295262) @@ -15,3 +18,9 @@ shape = SubResource("BoxShape3D_pxn7n") [node name="MeshInstance3D" type="MeshInstance3D" parent="CollisionShape3D" unique_id=460229788] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.035827667) mesh = SubResource("BoxMesh_dikcp") + +[node name="VisibleOnScreenNotifier3D" type="VisibleOnScreenNotifier3D" parent="." unique_id=67351565] +aabb = AABB(-1.580836, -1.4946201, -0.28607294, 3.161672, 2.9892402, 0.5721459) + +[connection signal="screen_entered" from="VisibleOnScreenNotifier3D" to="." method="_on_visible_on_screen_notifier_3d_screen_entered"] +[connection signal="screen_exited" from="VisibleOnScreenNotifier3D" to="." method="_on_visible_on_screen_notifier_3d_screen_exited"] diff --git a/project.godot b/project.godot index 3a4f1ed..dc58295 100644 --- a/project.godot +++ b/project.godot @@ -74,6 +74,7 @@ grabbable="this object can be grabbed" player="players" pickupable="the item is equippable" equippable="" +sound_player="" [input] diff --git a/scenes/changable_sound_emitter.gd b/scenes/changable_sound_emitter.gd new file mode 100644 index 0000000..9747e7d --- /dev/null +++ b/scenes/changable_sound_emitter.gd @@ -0,0 +1,99 @@ +class_name ChangableAudioStreamPlayer3D extends AudioStreamPlayer3D +## If enabled, it will default to an [color=#f00] AudioStreamPlayer3D [/color] [br] +## If disabled, it will use [color=#ff0]SpatialAudio3D [/color] +@export var easy_audio: bool = true: + set(value): + easy_audio = value + if value: + set_to_easy_audio() + else: + set_to_raytraced_audio() + +@export_group("SpatialAudio3D properties") +@export_subgroup("Sound Properties") +@export var reverb_enabled: bool = true ## Enable reverb-effects with all its computations.[br][br]Disable if you just need it for occlusion detection, for example fading ambient rain when entering a house. +@export_range(-81, +80, 3.0, "suffix:dB") var reverb_volume_db: float = -6 ## Maximum volume of the reverbs. +@export_range(-1, 5, 0.05, "or_greater", "suffix:s") var reverb_fadeintime: float = 2.0 ## Fade-in time when a reverb is added at a wall.[br][br]The default of 2s is a good value where changes in environment merge well into the overall sound mix.[br]If you have small areas with little changes of distances, set this value to low (0.2s) so that repositioned reverbs don't get stuck for too long in a position. In a large area, when the raycast suddenly hits a close wall, the sudden appearing reverb can sound unnatural.[br][br]Set to -1 for dynamic fade time (based on wetness). +@export_range(-1, 8, 0.05, "or_greater", "suffix:s") var reverb_fadeouttime: float = 2.0 ## Fade-out time when a reverb is removed.[br][br]The default of 2s is a good value where changes in environment merge well into the overall sound mix.[br]If you have small areas with little changes of distances, set this value to low (0.2s) so that repositioned reverbs don't get stuck for too long in a position.[br][br]Set to -1 for dynamic fade time (based on wetness). +@export_range(1, 20_000, 0.1, "suffix:Hz") var occlusion_lp_cutoff: int = 600 ## Frequency when soundsource is occluded behind walls. +@export_range(0, 5, 0.05, "or_greater", "suffix:s") var occlusion_fadetime: float = 0.5 ## Fadetime when occlusion changes. +@export_range(0, 100, 0.1, "or_greater", "suffix:m") var bass_proximity: int = 50 ## The closer you are to a wall, the more bass you will hear.[br][br]The effect starts at this value (distance to the wall).[br][br]0 to disable. + +@export_subgroup("Physics") +@export_range(1, 100, 1, "or_greater", "suffix:m") var max_raycast_distance: int = 100 ## Maximum distance for the reverb raycasts. +@export_flags_3d_physics var collision_mask: int = 1 ## Mask for the raycast where to add reverb. +@export var roomsize_multiplicator: float = 6.0 ## How much hall to add compared to room size.[br]Sometimes you have a small room but you need a long reverb. +@export_range(1, 340, 1, "or_greater", "suffix:m/s") var speed_of_sound: int = 340 ## How fast sound travels through the air. +@export var prox_reduction: float = 24.0 ## How much proximity reduces the reverb +@export_range(4,32,1) var reverb_raycast_count: int = 4 ##how many reverb raycasts to shoot out horizontally + +@export_subgroup("System") +@export_range(1, 60, 0.1, "or_greater", "suffix:per second") var audiophysics_ticks: int = 10 ## The number of audio physics calculations per second.[br]Tied to _physics_process().[br][br]Use 30-60 for fast moving sounds like a motorcycle passing by.[br][br]Default: 10. +@export var loop: bool = false ## Loop audio indefinitely. +@export var shut_up: bool = false ## Mute output. +@export var debug: bool = false ## Visualize raycasts, measurement rays and reverb-audioplayers. + +var audio_player: AudioStreamPlayer3D = null + +func do_set_stream(new_stream:AudioStream): + stream = new_stream + if easy_audio: + audio_player.stream = new_stream + else: + audio_player.do_set_stream(new_stream) + +func do_play(start_position: float = 0.0) -> void: + if audio_player is SpatialAudio3D: + audio_player.do_play(start_position) + else: + audio_player.play(start_position) + +func do_stop() -> void: + if audio_player is SpatialAudio3D: + audio_player.do_stop() + else: + audio_player.stop() + +func set_to_easy_audio(): + if audio_player != null: + audio_player.queue_free() + + audio_player = self + +func set_to_raytraced_audio() -> void: + if audio_player != null: + audio_player.queue_free() + + audio_player = SpatialAudio3D.new() + audio_player.do_set_stream(stream) + audio_player.global_position = global_position + + audio_player.reverb_enabled = reverb_enabled + audio_player.reverb_volume_db = reverb_volume_db + audio_player.reverb_fadeintime = reverb_fadeintime + audio_player.reverb_fadeouttime = reverb_fadeouttime + audio_player.occlusion_lp_cutoff = occlusion_lp_cutoff + audio_player.occlusion_fadetime = occlusion_fadetime + audio_player.bass_proximity = bass_proximity + + audio_player.max_raycast_distance = max_raycast_distance + audio_player.collision_mask = collision_mask + audio_player.roomsize_multiplicator = roomsize_multiplicator + audio_player.speed_of_sound = speed_of_sound + audio_player.prox_reduction = prox_reduction + audio_player.reverb_raycast_count = reverb_raycast_count + + audio_player.audiophysics_ticks = 10 + audio_player.loop = false + audio_player.shut_up = false + audio_player.debug = false + + + add_child(audio_player) + +func _ready() -> void: + add_to_group("sound_player") + if easy_audio: + set_to_easy_audio() + else: + set_to_raytraced_audio() diff --git a/scenes/changable_sound_emitter.gd.uid b/scenes/changable_sound_emitter.gd.uid new file mode 100644 index 0000000..5caf3d8 --- /dev/null +++ b/scenes/changable_sound_emitter.gd.uid @@ -0,0 +1 @@ +uid://v7j6ovrub5cp diff --git a/scenes/changable_sound_emitter.tscn b/scenes/changable_sound_emitter.tscn new file mode 100644 index 0000000..92a17fa --- /dev/null +++ b/scenes/changable_sound_emitter.tscn @@ -0,0 +1,6 @@ +[gd_scene format=3 uid="uid://uwrlh36ij3y2"] + +[ext_resource type="Script" uid="uid://v7j6ovrub5cp" path="res://scenes/changable_sound_emitter.gd" id="1_yhyrq"] + +[node name="ChangableAudioStreamPlayer3D" type="AudioStreamPlayer3D" unique_id=783874887] +script = ExtResource("1_yhyrq")