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

Merge pull request #869 from Azaezel/alpha401/audioFIxes

Browse source 
soundasset sourcegroup fallback
This commit is contained in:
Brian Roberts 2022-08-29 17:39:50 -05:00 • committed by GitHub
commit 7f598e18fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/assets/SoundAsset.cpp
View file

@ -225,6 +225,8 @@ bool SoundAsset::loadSound()
} }
else else
{// = new SFXProfile(mProfileDesc, mSoundFile, mPreload); {// = new SFXProfile(mProfileDesc, mSoundFile, mPreload);
if (mProfileDesc.mSourceGroup == NULL)
mProfileDesc.mSourceGroup = dynamic_cast<SFXSource*>(Sim::findObject("AudioChannelMaster"));
mSFXProfile.setDescription(&mProfileDesc); mSFXProfile.setDescription(&mProfileDesc);
mSFXProfile.setSoundFileName(mSoundPath); mSFXProfile.setSoundFileName(mSoundPath);
mSFXProfile.setPreload(mPreload); mSFXProfile.setPreload(mPreload);

2
Templates/BaseGame/game/data/UI/UI.tscript
View file

@ -30,7 +30,7 @@ function UI::initClient(%this)
{ {
//Load UI stuff //Load UI stuff
//we need to load this because some of the menu profiles use the sounds here //we need to load this because some of the menu profiles use the sounds here
//%this.queueExec("./datablocks/guiSounds"); %this.queueExec("./datablocks/guiSounds");
//Profiles //Profiles
%this.queueExec("./scripts/profiles"); %this.queueExec("./scripts/profiles");

5
Templates/BaseGame/game/data/UI/sounds/buttonClick.asset.taml
View file

@ -1 +1,4 @@
<SoundAsset canSave="true" canSaveDynamicFields="true" AssetName="buttonClick" soundFile="@assetFile=buttonClick.wav" PitchAdjust="1" VolumeAdjust="1" is3D="false" isLooping="false" isStreaming="false" useHardware="false" minDistance="1" maxDistance="100" coneInsideAngle="360" coneOutsideAngle="360" coneOutsideVolume="1" rolloffFactor="-1" scatterDistance="0 0 0"/> <SoundAsset
AssetName="buttonClick"
soundFile="@assetFile=buttonClick.wav"
sourceGroup="AudioChannelGui"/>

7
Templates/BaseGame/game/data/UI/sounds/buttonHover.asset.taml
View file

@ -1 +1,6 @@
<SoundAsset canSave="true" canSaveDynamicFields="true" AssetName="buttonHover" soundFile="@assetFile=buttonHover.wav" PitchAdjust="1" VolumeAdjust="1" is3D="false" isLooping="false" isStreaming="false" useHardware="true" minDistance="1" maxDistance="120" coneInsideAngle="360" coneOutsideAngle="360" coneOutsideVolume="1" rolloffFactor="-1" scatterDistance="0 0 0"/> <SoundAsset
AssetName="buttonHover"
soundFile="@assetFile=buttonHover.wav"
useHardware="true"
maxDistance="120"
sourceGroup="AudioChannelGui"/>