WIP: OpenAL audio system.
This commit is contained in:
@@ -5,6 +5,7 @@ using Voile.Systems.Particles;
|
|||||||
using System.Numerics;
|
using System.Numerics;
|
||||||
using System.Diagnostics.CodeAnalysis;
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using Voile.Rendering;
|
using Voile.Rendering;
|
||||||
|
using Voile.OpenAL;
|
||||||
|
|
||||||
public class TestGame : Game
|
public class TestGame : Game
|
||||||
{
|
{
|
||||||
@@ -15,7 +16,10 @@ public class TestGame : Game
|
|||||||
{
|
{
|
||||||
InitializeSystemsDefault();
|
InitializeSystemsDefault();
|
||||||
|
|
||||||
|
_audioSystem = new OpenALSystem();
|
||||||
_particleSystem = new ParticleSystem();
|
_particleSystem = new ParticleSystem();
|
||||||
|
|
||||||
|
AddSystemToUpdate(_audioSystem);
|
||||||
AddSystemToUpdate(_particleSystem);
|
AddSystemToUpdate(_particleSystem);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,6 +59,7 @@ public class TestGame : Game
|
|||||||
{
|
{
|
||||||
// ResourceManager.Reload();
|
// ResourceManager.Reload();
|
||||||
// _particleSystem!.RestartEmitter(_emitterId);
|
// _particleSystem!.RestartEmitter(_emitterId);
|
||||||
|
_audioSystem.PlaySound(_sound.Value, 1.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Input.KeyboardKeyJustPressed(KeyboardKey.One))
|
if (Input.KeyboardKeyJustPressed(KeyboardKey.One))
|
||||||
@@ -104,6 +109,7 @@ public class TestGame : Game
|
|||||||
}
|
}
|
||||||
|
|
||||||
[NotNull] private ParticleSystem _particleSystem;
|
[NotNull] private ParticleSystem _particleSystem;
|
||||||
|
private OpenALSystem _audioSystem;
|
||||||
private int _emitterId;
|
private int _emitterId;
|
||||||
private ResourceRef<ParticleEmitterSettingsResource> _fireEffect;
|
private ResourceRef<ParticleEmitterSettingsResource> _fireEffect;
|
||||||
private ResourceRef<Font> _font;
|
private ResourceRef<Font> _font;
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="../Voile/Voile.csproj" />
|
<ProjectReference Include="../Voile/Voile.csproj" />
|
||||||
|
<ProjectReference Include="../Voile.OpenAL/Voile.OpenAL.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
59
Voile.OpenAL/OpenALSystem.cs
Normal file
59
Voile.OpenAL/OpenALSystem.cs
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
using Voile.Audio;
|
||||||
|
using Silk.NET.OpenAL;
|
||||||
|
|
||||||
|
namespace Voile.OpenAL;
|
||||||
|
|
||||||
|
public class OpenALSystem : AudioSystem
|
||||||
|
{
|
||||||
|
public OpenALSystem()
|
||||||
|
{
|
||||||
|
_al = AL.GetApi();
|
||||||
|
_alc = ALContext.GetApi();
|
||||||
|
|
||||||
|
Init();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void PlaySound(Sound sound, float volume)
|
||||||
|
{
|
||||||
|
var buffer = CreateAlBuffer(sound.Buffer, sound.SampleRate, sound.Channel);
|
||||||
|
var source = CreateAlSource(buffer);
|
||||||
|
_al.SourcePlay(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Update(double deltaTime)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
private unsafe void Init()
|
||||||
|
{
|
||||||
|
_device = _alc.OpenDevice("");
|
||||||
|
_context = _alc.CreateContext(_device, null);
|
||||||
|
_alc.MakeContextCurrent(_context);
|
||||||
|
}
|
||||||
|
|
||||||
|
private uint CreateAlBuffer(ReadOnlyMemory<short> data, int sampleRate, SoundChannel channels)
|
||||||
|
{
|
||||||
|
var buffer = _al.GenBuffer();
|
||||||
|
var format = channels == SoundChannel.Mono ? BufferFormat.Mono16 : BufferFormat.Stereo16;
|
||||||
|
|
||||||
|
unsafe
|
||||||
|
{
|
||||||
|
_al.BufferData(buffer, format, data.Pin().Pointer, data.Length, sampleRate);
|
||||||
|
}
|
||||||
|
|
||||||
|
return buffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
private uint CreateAlSource(uint buffer)
|
||||||
|
{
|
||||||
|
var source = _al.GenSource();
|
||||||
|
_al.SetSourceProperty(source, SourceInteger.Buffer, buffer);
|
||||||
|
return source;
|
||||||
|
}
|
||||||
|
|
||||||
|
private unsafe Device* _device;
|
||||||
|
private ALContext _alc;
|
||||||
|
private unsafe Context* _context;
|
||||||
|
private AL _al;
|
||||||
|
}
|
||||||
17
Voile.OpenAL/Voile.OpenAL.csproj
Normal file
17
Voile.OpenAL/Voile.OpenAL.csproj
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="../Voile/Voile.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Silk.NET.OpenAL" Version="2.21.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
@@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Folder", "Solution
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestGame", "TestGame\TestGame.csproj", "{DBA85D7B-0A91-405B-9078-5463F49AE47E}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestGame", "TestGame\TestGame.csproj", "{DBA85D7B-0A91-405B-9078-5463F49AE47E}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Voile.OpenAL", "Voile.OpenAL\Voile.OpenAL.csproj", "{3ABB7D30-4B64-43AD-A14F-E532B12AFC60}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@@ -27,6 +29,10 @@ Global
|
|||||||
{DBA85D7B-0A91-405B-9078-5463F49AE47E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{DBA85D7B-0A91-405B-9078-5463F49AE47E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{DBA85D7B-0A91-405B-9078-5463F49AE47E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{DBA85D7B-0A91-405B-9078-5463F49AE47E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{DBA85D7B-0A91-405B-9078-5463F49AE47E}.Release|Any CPU.Build.0 = Release|Any CPU
|
{DBA85D7B-0A91-405B-9078-5463F49AE47E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{3ABB7D30-4B64-43AD-A14F-E532B12AFC60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{3ABB7D30-4B64-43AD-A14F-E532B12AFC60}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{3ABB7D30-4B64-43AD-A14F-E532B12AFC60}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{3ABB7D30-4B64-43AD-A14F-E532B12AFC60}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
7
Voile/Source/Audio/AudioSystem.cs
Normal file
7
Voile/Source/Audio/AudioSystem.cs
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
namespace Voile.Audio;
|
||||||
|
|
||||||
|
public abstract class AudioSystem : IUpdatableSystem
|
||||||
|
{
|
||||||
|
public abstract void Update(double deltaTime);
|
||||||
|
public abstract void PlaySound(Sound sound, float volume);
|
||||||
|
}
|
||||||
@@ -116,13 +116,6 @@ namespace Voile
|
|||||||
Input = new RaylibInputSystem();
|
Input = new RaylibInputSystem();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (AudioSystem is null)
|
|
||||||
{
|
|
||||||
AudioSystem = new StandardAudioSystem();
|
|
||||||
}
|
|
||||||
|
|
||||||
AudioSystem.Start();
|
|
||||||
|
|
||||||
Input.Start();
|
Input.Start();
|
||||||
InitializeRenderer();
|
InitializeRenderer();
|
||||||
}
|
}
|
||||||
@@ -131,7 +124,6 @@ namespace Voile
|
|||||||
{
|
{
|
||||||
Input?.Dispose();
|
Input?.Dispose();
|
||||||
Renderer?.Dispose();
|
Renderer?.Dispose();
|
||||||
AudioSystem?.Dispose();
|
|
||||||
ResourceManager.Dispose();
|
ResourceManager.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user