TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1368 from Azaezel/alpha41/sourceGroupGrok

Browse source 
fill in asset based sound group if not specified by instanced emitter
This commit is contained in:
Brian Roberts 2025-01-27 11:31:41 -06:00 • committed by GitHub
commit 5feef0ec5c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/T3D/sfx/sfxEmitter.cpp
View file

@ -840,6 +840,9 @@ void SFXEmitter::_update()
if (mDirty.test(SourceGroup) && mInstanceDescription->mSourceGroup) if (mDirty.test(SourceGroup) && mInstanceDescription->mSourceGroup)
mInstanceDescription->mSourceGroup->addObject(mSource); mInstanceDescription->mSourceGroup->addObject(mSource);
else if (getSoundDescription() && getSoundDescription()->mSourceGroup)
getSoundDescription()->mSourceGroup->addObject(mSource);
// Skip these 3d only settings. // Skip these 3d only settings.
if(mInstanceDescription->mIs3D ) if(mInstanceDescription->mIs3D )
{ {

2
Engine/source/gui/shiny/guiAudioCtrl.cpp
View file

@ -184,6 +184,8 @@ void GuiAudioCtrl::_update()
mSoundPlaying->setFadeTimes(mFadeInTime, mFadeOutTime); mSoundPlaying->setFadeTimes(mFadeInTime, mFadeOutTime);
} }
else
getSoundDescription()->mSourceGroup->addObject(mSoundPlaying);
mSoundPlaying->play(); mSoundPlaying->play();
} }