github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 22:03:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

audio glossary proof of concept

Browse source
This commit is contained in:
Ryan 2024-03-15 20:43:21 -04:00
commit 4a0a2c9e88
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp
View file

@ -18,6 +18,10 @@
#include "soh/Enhancements/tts/tts.h" #include "soh/Enhancements/tts/tts.h"
#include "soh/Enhancements/game-interactor/GameInteractor.h" #include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/audio/AudioDecoder.h" #include "soh/Enhancements/audio/AudioDecoder.h"
std::vector<uint32_t> buttons = { BTN_A, BTN_B, BTN_CUP, BTN_CDOWN, BTN_CLEFT, BTN_CRIGHT, BTN_L,
BTN_Z, BTN_R, BTN_START, BTN_DUP, BTN_DDOWN, BTN_DLEFT, BTN_DRIGHT };
extern "C" { extern "C" {
extern PlayState* gPlayState; extern PlayState* gPlayState;
extern bool freezeGame; extern bool freezeGame;
@ -465,11 +469,25 @@ int ActorAccessibility_GetRandomStartingFrameCount(int min, int max) {
list = (VAList_t*)aa->currentSceneGlobal; list = (VAList_t*)aa->currentSceneGlobal;
for (VAList_t::iterator i = list->begin(); i != list->end(); i++) for (VAList_t::iterator i = list->begin(); i != list->end(); i++)
ActorAccessibility_RunAccessibilityForActor(play, &(*i)); ActorAccessibility_RunAccessibilityForActor(play, &(*i));
ActorAccessibility_AudioGlossary(play);
//Processes external audio engine. //Processes external audio engine.
ActorAccessibility_PrepareNextAudioFrame(); ActorAccessibility_PrepareNextAudioFrame();
} }
//Virtual actor config.
void ActorAccessibility_AudioGlossary(PlayState* play) {
AccessibleActorList_t::iterator i = aa->accessibleActorList.begin();
OSContPad* trackerButtonsPressed = LUS::Context::GetInstance()->GetControlDeck()->GetPads();
bool comboStartGlossary = trackerButtonsPressed != nullptr && trackerButtonsPressed[0].button & buttons[10] &&
trackerButtonsPressed[0].button & buttons[6];
if (comboStartGlossary) {
SpeechSynthesizer::Instance->Speak((*i).second.policy.englishName, GetLanguageCode());
return;
}
}
//Virtual actor config.
VirtualActorList* ActorAccessibility_GetVirtualActorList(s16 sceneNum, s8 roomNum) VirtualActorList* ActorAccessibility_GetVirtualActorList(s16 sceneNum, s8 roomNum)
{ {
SceneAndRoom sr; SceneAndRoom sr;

2
soh/soh/Enhancements/accessible-actors/ActorAccessibility.h
View file

@ -184,6 +184,8 @@ void ActorAccessibility_HandleSoundExtractionMode(PlayState* play);
//This is called by the audio thread when it's ready to try to pull sfx from the game. //This is called by the audio thread when it's ready to try to pull sfx from the game.
void ActorAccessibility_DoSoundExtractionStep(); void ActorAccessibility_DoSoundExtractionStep();
void ActorAccessibility_AudioGlossary(PlayState* play);
#ifdef __cplusplus #ifdef __cplusplus
} }