diff --git a/Assets/Audio/Master.bank b/Assets/Audio/Master.bank index 4ea1e4f2..a1b4e563 100644 Binary files a/Assets/Audio/Master.bank and b/Assets/Audio/Master.bank differ diff --git a/Assets/Audio/Master.strings.bank b/Assets/Audio/Master.strings.bank index 38298882..ecad89fe 100644 Binary files a/Assets/Audio/Master.strings.bank and b/Assets/Audio/Master.strings.bank differ diff --git a/Assets/Audio/Music.bank b/Assets/Audio/Music.bank deleted file mode 100644 index 25461a50..00000000 Binary files a/Assets/Audio/Music.bank and /dev/null differ diff --git a/Assets/Audio/SFX.bank b/Assets/Audio/SFX.bank deleted file mode 100644 index 1a2c58ac..00000000 Binary files a/Assets/Audio/SFX.bank and /dev/null differ diff --git a/Assets/Audio/footsteps.bank b/Assets/Audio/footsteps.bank new file mode 100644 index 00000000..ce53111e Binary files /dev/null and b/Assets/Audio/footsteps.bank differ diff --git a/Assets/Audio/testogg.ogg b/Assets/Audio/testogg.ogg deleted file mode 100644 index 65687ef6..00000000 Binary files a/Assets/Audio/testogg.ogg and /dev/null differ diff --git a/Assets/Audio/testwave.wav b/Assets/Audio/testwave.wav deleted file mode 100644 index 2a45456d..00000000 Binary files a/Assets/Audio/testwave.wav and /dev/null differ diff --git a/SHADE_Engine/src/AudioSystem/SHAudioSystem.cpp b/SHADE_Engine/src/AudioSystem/SHAudioSystem.cpp index e1fae750..be9ee832 100644 --- a/SHADE_Engine/src/AudioSystem/SHAudioSystem.cpp +++ b/SHADE_Engine/src/AudioSystem/SHAudioSystem.cpp @@ -15,6 +15,8 @@ #include #include #include +#include + namespace SHADE { SHAudioSystem::SHAudioSystem() @@ -79,18 +81,21 @@ namespace SHADE LoadBank("../../Assets/Audio/Master.bank"); LoadBank("../../Assets/Audio/Master.strings.bank"); - LoadBank("../../Assets/Audio/Music.bank"); - LoadBank("../../Assets/Audio/SFX.bank"); + //LoadBank("../../Assets/Audio/Music.bank"); + LoadBank("../../Assets/Audio/footsteps.bank"); //auto clip = CreateAudioClip("event:/Characters/sfx_footsteps_human"); //clip->Play(); - //PlayEventOnce("event:/Characters/sfx_footsteps_human"); - PlayEventOnce("event:/SFX/Dawn/Dawn_Attack"); + //PlayEventOnce("event:/Characters/sfx_footsteps_raccoon"); + //PlayEventOnce("event:/SFX/Dawn/Dawn_Attack"); } void SHADE::SHAudioSystem::Run(float dt) { - static_cast(dt); + static_cast(dt); + if (GetKeyState(VK_SPACE) & 0x8000) + PlayEventOnce("event:/Characters/sfx_footsteps_raccoon"); + fmodStudioSystem->update(); if (!denseListener->empty()) { diff --git a/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorInspector.cpp b/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorInspector.cpp index 44780784..247b4b8c 100644 --- a/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorInspector.cpp +++ b/SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorInspector.cpp @@ -42,6 +42,11 @@ namespace SHADE SHEditorWindow::Update(); if (Begin()) { + if(ImGui::Button("AUDIO")) + { + if(auto audioSystem = SHSystemManager::GetSystem()) + audioSystem->PlayEventOnce("event:/Characters/sfx_footsteps_raccoon"); + } if (!SHEditor::selectedEntities.empty()) { EntityID const& eid = SHEditor::selectedEntities[0];