#109 Improve testability and cleanup

Examples/Minimal/Program.cs

@@ -16,6 +16,7 @@ public static void Main(string[] _)
         var game = new Minimal();
 
         using var window = new Window(game);
+        window.Initialize();
         window.Run();
     }
 }

Examples/MultipleWindows/Program.cs

@@ -25,7 +25,7 @@
     private static readonly List<IWindow> _windows = [];
     private static readonly List<IInputContext> _inputContexts = [];
     private static readonly ConcurrentQueue<WindowOptions> _windowQueue = [];
     private static readonly CancellationTokenSource _cancellationTokenSource = new();
 
     /// <summary>
     ///     The main entry point of the application.
@@ -39,7 +39,7 @@
         Console.WriteLine("end");
         Console.ReadLine();
 
         // StartWindowQueueTask();
         // 
         // while (!_cancellationTokenSource.IsCancellationRequested)
         // {
@@ -117,13 +117,16 @@
     private static void EnqueueWindow()
     {
         var window = CreateWindow();
-        foreach (var mouse in window!.Input!.Mice)
-            mouse.Click += Mouse_Click;
 
-        _inputContexts.Add(window.Input);
+        // Prefer the higher-level Window event to avoid wiring low-level input handlers.
+        window.OnButtonMouseDown += (mouse, button) => Mouse_Click(mouse, (MouseButton)button, mouse.Position);
+
+        if (window.Input is not null)
+            _inputContexts.Add(window.Input);
+
         _windows.Add(window);
     }
 
     private static void Mouse_Click(IMouse args1, MouseButton arg2, System.Numerics.Vector2 arg3)
         => _windowQueue.Enqueue(WindowOptions.Default);
 }

ObjLoader/DataStore.cs

@@ -79,5 +79,9 @@ public void AddNormal(Normal normal)
         /// <inheritdoc />
         public void AddVertex(Vertex vertex)
             => Vertices.Add(vertex);
+
+        /// <inheritdoc />
+        public void AddMaterial(Material currentMaterial)
+            => Materials.Add(currentMaterial);
     }
 }

ObjLoader/IMaterialDataStore.cs

@@ -1,14 +1,21 @@
-namespace SharpEngine.Core.ObjLoader;
+using SharpEngine.Core.Components.Properties;
+
+namespace SharpEngine.Core.ObjLoader;
 
 /// <summary>
 ///     Contains definitions for the material data store, which provides methods to manage material information during the OBJ file loading process.
 /// </summary>
 public interface IMaterialDataStore
 {
+    /// <summary>
+    ///     Adds a material to the material data store.
+    /// </summary>
+    /// <param name="currentMaterial">The material to add.</param>
+    void AddMaterial(Material currentMaterial);
+
     /// <summary>
     ///     Sets the material for the current group.
     /// </summary>
     /// <param name="materialName">The name of the material to set.</param>
-    public void SetMaterial(string materialName);
-
+    void SetMaterial(string materialName);
 }

ObjLoader/Loaders/IFileManager.cs

@@ -0,0 +1,13 @@
+using System.IO;
+
+namespace SharpEngine.Core.ObjLoader.Loader.Loaders
+{
+    /// <summary>
+    ///     Represents an abstraction of a stream reader for testability.
+    /// </summary>
+    public interface IFileManager
+    {
+        /// <inheritdoc cref="StreamReader.StreamReader(string)"/>
+        StreamReader StreamReader(string path);
+    }
+}

ObjLoader/Loaders/LoaderBase.cs

@@ -1,4 +1,5 @@
 using System.IO;
+using System.IO.Abstractions;
 
 namespace SharpEngine.Core.ObjLoader.Loader.Loaders
 {
@@ -7,6 +8,18 @@ namespace SharpEngine.Core.ObjLoader.Loader.Loaders
     /// </summary>
     public abstract class LoaderBase
     {
+        private readonly IFileStreamFactory _fileStreamFactory;
+        private readonly IFileManager _fileManager;
+
+        /// <summary>
+        ///     Initializes a new instance of the <see cref="LoaderBase"/>.
+        /// </summary>
+        protected LoaderBase(IFileStreamFactory fileStreamFactory, IFileManager fileManager)
+        {
+            _fileStreamFactory = fileStreamFactory;
+            _fileManager = fileManager;
+        }
+
         /// <summary>
         ///     Parses the file at the specified path and processes each line via <see cref="ParseLine(string, string)"/>.
         /// </summary>
@@ -16,8 +29,8 @@ public abstract class LoaderBase
         /// <param name="path">The path of the file to open and parse.</param>
         public void ParseFile(string path)
         {
-            using var fileStream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            using var lineStreamReader = new StreamReader(fileStream);
+            using var fileStream = _fileStreamFactory.FileSystem.FileStream.New(path, FileMode.Open, FileAccess.Read);
+            using var lineStreamReader = _fileManager.StreamReader(path);
 
             while (!lineStreamReader.EndOfStream)
             {

ObjLoader/Loaders/MaterialLoader/MaterialLibraryLoader.cs

@@ -1,9 +1,11 @@
-using SharpEngine.Core.Components.Properties;
+using SharpEngine.Core.Components.ObjLoader.DataStore;
+using SharpEngine.Core.Components.Properties;
 using SharpEngine.Core.ObjLoader.Loader.Loaders;
 using SharpEngine.Shared.Extensions;
 
 using System;
 using System.Collections.Generic;
+using System.IO.Abstractions;
 using System.Numerics;
 
 namespace SharpEngine.Core.ObjLoader.Loaders.MaterialLoader
@@ -19,7 +21,7 @@ namespace SharpEngine.Core.ObjLoader.Loaders.MaterialLoader
     /// </remarks>
     public class MaterialLibraryLoader : LoaderBase
     {
-        private readonly DataStore _dataStore;
+        private readonly IMaterialDataStore _dataStore;
         private readonly Dictionary<string, Action<string>> _parseActionDictionary = [];
         private readonly List<string> _unrecognizedLines = [];
 
@@ -35,7 +37,9 @@ public class MaterialLibraryLoader : LoaderBase
         ///     Ns, d, Tr, illum, map_*, bump, disp, decal) to populate Material instances.
         /// </remarks>
         /// <param name="dataStore">DataStore used to register and store parsed materials and texture references.</param>
-        public MaterialLibraryLoader(DataStore dataStore)
+        /// <param name="fileStreamFactory">Represents a factory for creating file streams.</param>
+        /// <param name="fileManager">Represents a manager for handling file operations.</param>
+        public MaterialLibraryLoader(IMaterialDataStore dataStore, IFileStreamFactory fileStreamFactory, IFileManager fileManager) : base(fileStreamFactory, fileManager)
         {         
             _dataStore = dataStore;
 
@@ -92,7 +96,7 @@ protected override void ParseLine(string keyword, string data)
         private void PushMaterial(string materialName)
         {
             _currentMaterial = new Material(materialName);
-            _dataStore.Materials.Add(_currentMaterial);
+            _dataStore.AddMaterial(_currentMaterial);
         }
 
         private static Vector3 ParseVec3(string data)

ObjLoader/Loaders/ObjLoader/ObjLoader.cs

@@ -1,8 +1,11 @@
 using SharpEngine.Core.Entities.Properties.Meshes;
 using SharpEngine.Core.ObjLoader.Loader.Loaders;
 using SharpEngine.Core.ObjLoader.TypeParsers;
+
 using Silk.NET.OpenGL;
+
 using System.Collections.Generic;
+using System.IO.Abstractions;
 
 namespace SharpEngine.Core.ObjLoader.Loaders.ObjLoader
 {
@@ -21,7 +24,9 @@ public class ObjLoader : LoaderBase
         /// </summary>
         /// <param name="path">The path to the OBJ file.</param>
         /// <param name="dataStore">The data store to populate during parsing.</param>
-        public ObjLoader(string path, DataStore dataStore)
+        /// <param name="fileStreamFactory">Represents a factory for creating file streams.</param>
+        /// <param name="fileManager">Represents a manager for handling file operations.</param>
+        public ObjLoader(string path, DataStore dataStore, IFileStreamFactory fileStreamFactory, IFileManager fileManager) : base(fileStreamFactory, fileManager)
         {
             _path = path;
             _dataStore = dataStore;

ObjLoader/Loaders/ObjLoader/ObjLoaderFactory.cs

@@ -1,21 +1,42 @@
+using SharpEngine.Core.Components.Properties.Meshes;
+using SharpEngine.Core.Entities.Properties.Meshes;
+using SharpEngine.Core.ObjLoader.Loader.Loaders;
+using SharpEngine.Core.ObjLoader.Loader.TypeParsers;
+using SharpEngine.Core.ObjLoader.Loaders.MaterialLoader;
+
 using Silk.NET.OpenGL;
 
 using System;
 using System.Collections.Generic;
 using System.IO;
-
-using SharpEngine.Core.Entities.Properties.Meshes;
-using SharpEngine.Core.Components.Properties.Meshes;
-using SharpEngine.Core.ObjLoader.Loaders.MaterialLoader;
-using SharpEngine.Core.ObjLoader.Loader.TypeParsers;
+using System.IO.Abstractions;
 
 namespace SharpEngine.Core.ObjLoader.Loaders.ObjLoader
 {
+    /// <summary>
+    ///     Represents a testable wrapper for creating stream file related objects.
+    /// </summary>
+    public class FileManager : IFileManager
+    {
+        /// <inheritdoc />
+        public StreamReader StreamReader(string path)
+            => new(path);
+    }
+
     /// <summary>
     ///     Handles loading 3D models.
     /// </summary>
     public static class ObjLoaderFactory
     {
+        private static readonly FileSystem _fileSystem;
+        private static readonly FileManager _fileManager;
+
+        static ObjLoaderFactory()
+        {
+            _fileSystem = new FileSystem();
+            _fileManager = new FileManager();
+        }
+
         const string FbxExtension = ".fbx";
         const string ObjExtension = ".obj";
 
@@ -56,13 +77,13 @@
             var textureParser = new TextureParser(dataStore);
             var vertexParser = new VertexParser(dataStore);
 
-            var materialLibraryLoader = new MaterialLibraryLoader(dataStore);
+            var materialLibraryLoader = new MaterialLibraryLoader(dataStore, _fileSystem.FileStream, _fileManager);
 
             var materialLoader = new MaterialLibraryLoaderFacade(materialLibraryLoader, path);
             var materialLibraryParser = new MaterialLibraryParser(materialLoader);
             var useMaterialParser = new UseMaterialParser(dataStore);
 
-            var loader = new ObjLoader(path, dataStore)
+            var loader = new ObjLoader(path, dataStore, _fileSystem.FileStream, _fileManager)
                 .SetupTypeParsers(faceParser, groupParser, normalParser, textureParser, vertexParser, materialLibraryParser, useMaterialParser);
 
             return loader.Load(gl);

ObjLoader/SharpEngine.Core.ObjLoader.csproj

@@ -7,6 +7,7 @@
   <!-- TODO: This should be used with unit testing. -->
   <ItemGroup>
     <PackageReference Include="System.IO.Abstractions" Version="22.1.1" />
+    <PackageReference Include="TestableIO.System.IO.Abstractions" Version="22.1.1" />
   </ItemGroup>
 
   <ItemGroup>

SharpEngine.Core.ArchitectureTests/Class1.cs

@@ -0,0 +1,6 @@
+namespace SharpEngine.Core.ArchitectureTests;
+
+public class Class1
+{
+
+}

SharpEngine.Core.ArchitectureTests/SharpEngine.Core.ArchitectureTests.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

SharpEngine.Core/Audio/Audio.cs

@@ -8,6 +8,8 @@ namespace SharpEngine.Core.Audio;
 /// </summary>
 public static class Audio
 {
+    private static AudioPlayerBase? audioPlayer = null;
+
     /// <summary>
     ///     Plays an audio file if it is in the WAV format.
     /// </summary>
@@ -18,11 +20,34 @@ public static void Play(string filePath)
         switch (Path.GetExtension(filePath))
         {
             case ".wav":
-                new WavPlayer().Play(filePath);
+                audioPlayer = new WavPlayer();
+                audioPlayer.Play(filePath);
+                break;
+
+            case ".mp3":
+                audioPlayer = new Mp3Player();
+                audioPlayer.Play(filePath);
                 break;
 
             default:
                 throw new NotSupportedException("Unsupported file format.");
         }
     }
+
+    /// <inheritdoc cref="AudioPlayerBase.Stop"/>
+    public static void Stop()
+    {
+        audioPlayer?.Stop();
+        audioPlayer = null;
+    }
+
+    /// <summary>
+    ///     Pauses the currently playing audio, if any.
+    /// </summary>
+    public static void Pause() => audioPlayer?.Pause();
+
+    /// <summary>
+    ///     Resumes the currently paused audio, if any.
+    /// </summary>
+    public static void Resume() => audioPlayer?.Resume();
 }

SharpEngine.Core/Audio/AudioBuffer.cs

@@ -29,7 +29,7 @@ public AudioBuffer(AL al)
     /// </summary>
     /// <param name="data">The data to be loaded into the buffer.</param>
     /// <param name="wavData">Details about the data.</param>
-    public void LoadData(ReadOnlySpan<byte> data, WavData wavData)
+    public void LoadData(ReadOnlySpan<byte> data, AudioData wavData)
     {
         unsafe
         {

SharpEngine.Core/Audio/WavData.cs → SharpEngine.Core/Audio/AudioData.cs

@@ -3,9 +3,9 @@
 namespace SharpEngine.Core.Audio;
 
 /// <summary>
-///     Represents audio data in WAV format.
+///     Represents the data in a audio file.
 /// </summary>
-public class WavData
+public class AudioData
 {
     /// <summary>Gets or sets the number of channels used in the data.</summary>
     public short NumChannels { get; set; }

SharpEngine.Core/Audio/AudioDevice.cs

@@ -8,6 +8,14 @@ namespace SharpEngine.Core.Audio;
 /// </summary>
 public unsafe class AudioDevice : IDisposable
 {
+    // Shared single AudioDevice instance to ensure a single OpenAL context is used
+    private static readonly AudioDevice _shared = new AudioDevice();
+
+    /// <summary>
+    ///     Gets the shared audio device instance used by the application.
+    /// </summary>
+    public static AudioDevice Shared => _shared;
+
     /// <summary>Gets the OpenAL context.</summary>
     public AL Al { get; }