xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

god knows whats diff but audio is sort of working ish

This commit is contained in:
Glence 2022-09-27 23:57:11 +08:00
parent 3c3b6a285b
commit 7fcac5e0eb
8 changed files with 66 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Audio/Master.bank
View File

Binary file not shown.

BIN
Assets/Audio/Master.strings.bank
View File

Binary file not shown.

BIN
Assets/Audio/Music.bank Normal file
View File

Binary file not shown.

BIN
Assets/Audio/SFX.bank Normal file
View File

Binary file not shown.

BIN
Assets/Audio/testogg.ogg Normal file
View File

Binary file not shown.

BIN
Assets/Audio/testwave.wav Normal file
View File

Binary file not shown.

11
SHADE_Engine/src/AudioSystem/SHAudioSystem.cpp
View File

@ -79,12 +79,13 @@ namespace SHADE
LoadBank("../../Assets/Audio/Master.bank");
LoadBank("../../Assets/Audio/Master.strings.bank");
//LoadBank("resources/audio/banks/Music.bank");
//LoadBank("resources/audio/banks/SFX.bank");
LoadBank("../../Assets/Audio/Music.bank");
LoadBank("../../Assets/Audio/SFX.bank");
//auto clip = CreateAudioClip("event:/SFX/Dawn/Dawn_Attack");
//auto clip = CreateAudioClip("event:/Characters/sfx_footsteps_human");
//clip->Play();
//PlayEventOnce("event:/SFX/Dawn/Dawn_Attack");
//PlayEventOnce("event:/Characters/sfx_footsteps_human");
PlayEventOnce("event:/SFX/Dawn/Dawn_Attack");
}
void SHADE::SHAudioSystem::Run(float dt)
@ -147,7 +148,7 @@ namespace SHADE
ErrorCheck();
}
if (system)
if (fmodStudioSystem)
{
result = fmodStudioSystem->release();
ErrorCheck();

11
SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorInspector.cpp
View File

@ -13,6 +13,9 @@
#include "SHEditorComponentView.hpp"
#include "Graphics/MiddleEnd/Interface/SHRenderable.h"
#include "ECS_Base/Managers/SHSystemManager.h"
#include "AudioSystem/SHAudioSystem.h"
namespace SHADE
{
template<typename ComponentType, std::enable_if_t<std::is_base_of_v<SHComponent, ComponentType>, bool> = true>
@ -50,6 +53,14 @@ namespace SHADE
ImGui::InputText("##EntityName", &entity->name);
if (ImGui::Button("AUDIO"))
{
if (auto audioSystem = SHSystemManager::GetSystem<SHADE::SHAudioSystem>())
{
audioSystem->PlayEventOnce("event:/SFX/Dawn/Dawn_Attack");
}
}
if (auto transformComponent = SHComponentManager::GetComponent_s<SHTransformComponent>(eid))
{
DrawComponent(transformComponent);