evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

immediateSound and persistentSound now supports random sound pools

Browse Source
This commit is contained in:
Kae 2023-07-02 02:26:13 +10:00
parent 2a610211a1
commit 3c65474062
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/game/StarNetworkedAnimator.cpp
View File

@ -726,7 +726,14 @@ void NetworkedAnimator::update(float dt, DynamicTarget* dynamicTarget) {
if (dynamicTarget) { if (dynamicTarget) {
dynamicTarget->clearFinishedAudio(); dynamicTarget->clearFinishedAudio();
String persistentSoundFile = activeState.properties.value("persistentSound", "").toString(); Json jPersistentSound = activeState.properties.value("persistentSound", "");
String persistentSoundFile;
if (jPersistentSound.isType(Json::Type::String))
persistentSoundFile = jPersistentSound.toString();
else if (jPersistentSound.isType(Json::Type::Array))
persistentSoundFile = Random::randValueFrom(jPersistentSound.toArray(), "").toString();
if (!persistentSoundFile.empty()) if (!persistentSoundFile.empty())
persistentSoundFile = AssetPath::relativeTo(m_relativePath, persistentSoundFile); persistentSoundFile = AssetPath::relativeTo(m_relativePath, persistentSoundFile);
@ -748,7 +755,14 @@ void NetworkedAnimator::update(float dt, DynamicTarget* dynamicTarget) {
} }
} }
String immediateSoundFile = activeState.properties.value("immediateSound", "").toString(); Json jImmediateSound = activeState.properties.value("immediateSound", "");
String immediateSoundFile = "";
if (jImmediateSound.isType(Json::Type::String))
immediateSoundFile = jImmediateSound.toString();
else if (jImmediateSound.isType(Json::Type::Array))
immediateSoundFile = Random::randValueFrom(jImmediateSound.toArray(), "").toString();
if (!immediateSoundFile.empty()) if (!immediateSoundFile.empty())
immediateSoundFile = AssetPath::relativeTo(m_relativePath, immediateSoundFile); immediateSoundFile = AssetPath::relativeTo(m_relativePath, immediateSoundFile);