MoonsideGames
/
MoonWorks
1
0
Fork 1
Code Issues 4 Pull Requests Projects Releases 1 Activity

reset static audio on free + rework filter API

pull/25/head
cosmonaut 2022-08-29 22:45:28 -07:00
parent 1af16231ce
commit 0933b8e70f
4 changed files with 101 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Audio/FilterType.cs Normal file
View File

@ -0,0 +1,10 @@
namespace MoonWorks.Audio
{
public enum FilterType
{
None,
LowPass,
BandPass,
HighPass
}
}

140
src/Audio/SoundInstance.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace MoonWorks.Audio namespace MoonWorks.Audio
@ -14,21 +14,21 @@ namespace MoonWorks.Audio
public virtual SoundState State { get; protected set; } public virtual SoundState State { get; protected set; }
private float _pan = 0; private float pan = 0;
public float Pan public float Pan
{ {
get => _pan; get => pan;
set set
{ {
_pan = value; pan = value;
if (_pan < -1f) if (pan < -1f)
{ {
_pan = -1f; pan = -1f;
} }
if (_pan > 1f) if (pan > 1f)
{ {
_pan = 1f; pan = 1f;
} }
if (Is3D) { return; } if (Is3D) { return; }
@ -45,41 +45,41 @@ namespace MoonWorks.Audio
} }
} }
private float _pitch = 0; private float pitch = 0;
public float Pitch public float Pitch
{ {
get => _pitch; get => pitch;
set set
{ {
_pitch = Math.MathHelper.Clamp(value, -1f, 1f); pitch = Math.MathHelper.Clamp(value, -1f, 1f);
UpdatePitch(); UpdatePitch();
} }
} }
private float _volume = 1; private float volume = 1;
public float Volume public float Volume
{ {
get => _volume; get => volume;
set set
{ {
_volume = value; volume = value;
FAudio.FAudioVoice_SetVolume(Handle, _volume, 0); FAudio.FAudioVoice_SetVolume(Handle, volume, 0);
} }
} }
private float _reverb; private float reverb;
public unsafe float Reverb public unsafe float Reverb
{ {
get => _reverb; get => reverb;
set set
{ {
_reverb = value; reverb = value;
float* outputMatrix = (float*) dspSettings.pMatrixCoefficients; float* outputMatrix = (float*) dspSettings.pMatrixCoefficients;
outputMatrix[0] = _reverb; outputMatrix[0] = reverb;
if (dspSettings.SrcChannelCount == 2) if (dspSettings.SrcChannelCount == 2)
{ {
outputMatrix[1] = _reverb; outputMatrix[1] = reverb;
} }
FAudio.FAudioVoice_SetOutputMatrix( FAudio.FAudioVoice_SetOutputMatrix(
@ -93,67 +93,83 @@ namespace MoonWorks.Audio
} }
} }
private float _lowPassFilter; private const float MAX_FILTER_FREQUENCY = 1f;
public float LowPassFilter private const float MAX_FILTER_ONEOVERQ = 1.5f;
private FAudio.FAudioFilterParameters filterParameters = new FAudio.FAudioFilterParameters
{ {
get => _lowPassFilter; Type = FAudio.FAudioFilterType.FAudioLowPassFilter,
Frequency = 1f,
OneOverQ = 1f
};
private float FilterFrequency
{
get => filterParameters.Frequency;
set set
{ {
_lowPassFilter = value; value = System.Math.Clamp(value, 0.01f, MAX_FILTER_FREQUENCY);
filterParameters.Frequency = value;
FAudio.FAudioFilterParameters p = new FAudio.FAudioFilterParameters
{
Type = FAudio.FAudioFilterType.FAudioLowPassFilter,
Frequency = _lowPassFilter,
OneOverQ = 1f
};
FAudio.FAudioVoice_SetFilterParameters( FAudio.FAudioVoice_SetFilterParameters(
Handle, Handle,
ref p, ref filterParameters,
0 0
); );
} }
} }
private float _highPassFilter; private float FilterOneOverQ
public float HighPassFilter
{ {
get => _highPassFilter; get => filterParameters.OneOverQ;
set set
{ {
_highPassFilter = value; value = System.Math.Clamp(value, 0.01f, MAX_FILTER_ONEOVERQ);
filterParameters.OneOverQ = value;
FAudio.FAudioFilterParameters p = new FAudio.FAudioFilterParameters
{
Type = FAudio.FAudioFilterType.FAudioHighPassFilter,
Frequency = _highPassFilter,
OneOverQ = 1f
};
FAudio.FAudioVoice_SetFilterParameters( FAudio.FAudioVoice_SetFilterParameters(
Handle, Handle,
ref p, ref filterParameters,
0 0
); );
} }
} }
private float _bandPassFilter; private FilterType filterType;
public float BandPassFilter public FilterType FilterType
{ {
get => _bandPassFilter; get => filterType;
set set
{ {
_bandPassFilter = value; filterType = value;
FAudio.FAudioFilterParameters p = new FAudio.FAudioFilterParameters switch (filterType)
{ {
Type = FAudio.FAudioFilterType.FAudioBandPassFilter, case FilterType.None:
Frequency = _bandPassFilter, filterParameters = new FAudio.FAudioFilterParameters
OneOverQ = 1f {
}; Type = FAudio.FAudioFilterType.FAudioLowPassFilter,
Frequency = 1f,
OneOverQ = 1f
};
break;
case FilterType.LowPass:
filterParameters.Type = FAudio.FAudioFilterType.FAudioLowPassFilter;
break;
case FilterType.BandPass:
filterParameters.Type = FAudio.FAudioFilterType.FAudioBandPassFilter;
break;
case FilterType.HighPass:
filterParameters.Type = FAudio.FAudioFilterType.FAudioHighPassFilter;
break;
}
FAudio.FAudioVoice_SetFilterParameters( FAudio.FAudioVoice_SetFilterParameters(
Handle, Handle,
ref p, ref filterParameters,
0 0
); );
} }
@ -281,7 +297,7 @@ namespace MoonWorks.Audio
FAudio.FAudioSourceVoice_SetFrequencyRatio( FAudio.FAudioSourceVoice_SetFrequencyRatio(
Handle, Handle,
(float) System.Math.Pow(2.0, _pitch) * doppler, (float) System.Math.Pow(2.0, pitch) * doppler,
0 0
); );
} }
@ -305,8 +321,8 @@ namespace MoonWorks.Audio
} }
else else
{ {
outputMatrix[0] = (_pan > 0.0f) ? (1.0f - _pan) : 1.0f; outputMatrix[0] = (pan > 0.0f) ? (1.0f - pan) : 1.0f;
outputMatrix[1] = (_pan < 0.0f) ? (1.0f + _pan) : 1.0f; outputMatrix[1] = (pan < 0.0f) ? (1.0f + pan) : 1.0f;
} }
} }
else else
@ -318,23 +334,23 @@ namespace MoonWorks.Audio
} }
else else
{ {
if (_pan <= 0.0f) if (pan <= 0.0f)
{ {
// Left speaker blends left/right channels // Left speaker blends left/right channels
outputMatrix[0] = 0.5f * _pan + 1.0f; outputMatrix[0] = 0.5f * pan + 1.0f;
outputMatrix[1] = 0.5f * -_pan; outputMatrix[1] = 0.5f * -pan;
// Right speaker gets less of the right channel // Right speaker gets less of the right channel
outputMatrix[2] = 0.0f; outputMatrix[2] = 0.0f;
outputMatrix[3] = _pan + 1.0f; outputMatrix[3] = pan + 1.0f;
} }
else else
{ {
// Left speaker gets less of the left channel // Left speaker gets less of the left channel
outputMatrix[0] = -_pan + 1.0f; outputMatrix[0] = -pan + 1.0f;
outputMatrix[1] = 0.0f; outputMatrix[1] = 0.0f;
// Right speaker blends right/left channels // Right speaker blends right/left channels
outputMatrix[2] = 0.5f * _pan; outputMatrix[2] = 0.5f * pan;
outputMatrix[3] = 0.5f * -_pan + 1.0f; outputMatrix[3] = 0.5f * -pan + 1.0f;
} }
} }
} }

1
src/Audio/StaticSound.cs
View File

@ -283,6 +283,7 @@ namespace MoonWorks.Audio
internal void FreeInstance(StaticSoundInstance instance) internal void FreeInstance(StaticSoundInstance instance)
{ {
instance.Reset();
Instances.Push(instance); Instances.Push(instance);
} }

12
src/Audio/StaticSoundInstance.cs
View File

@ -107,5 +107,17 @@ namespace MoonWorks.Audio
{ {
Parent.FreeInstance(this); Parent.FreeInstance(this);
} }
internal void Reset()
{
Pan = 0;
Pitch = 0;
Volume = 1;
Reverb = 0;
Loop = false;
Is3D = false;
FilterType = FilterType.None;
Reverb = 0;
}
} }
} }