Wooot

Author: Mathew O'Dwyer

src/Directory.Packages.props

@@ -1,9 +1,11 @@
 <Project>
   <ItemGroup>
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="[9.0.0,)" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="[9.0.6,)" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[9.0.6,)" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.6,)" />
     <PackageVersion Include="KinsonDigital.CASL" Version="[1.0.0-preview.21,)" />
-    <PackageVersion Include="System.IO.Abstractions" Version="[22.0.14,)" />
+    <PackageVersion Include="System.IO.Abstractions" Version="21.3.1" />
     <PackageVersion Include="SixLabors.ImageSharp" Version="[3.1.10,)" />
     <PackageVersion Include="OpenTK" Version="[4.8.2,)" />
     <PackageVersion Include="AutoMapper.Extensions.EnumMapping" Version="[4.1.0,)" />
@@ -15,4 +17,4 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[9.0.5,)" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="[9.0.5,)" />
   </ItemGroup>
-</Project>
+</Project>

src/ExampleGame/ExampleGame.csproj

@@ -7,7 +7,7 @@ namespace FinalEngine.Audio.Extensions;
 using FinalEngine.Audio.Factories;
 using FinalEngine.Audio.Loaders;
 using FinalEngine.Hosting;
-using FinalEngine.Resources;
+using FinalEngine.Resources.Extensions;
 using Microsoft.Extensions.DependencyInjection;
 
 public static class EngineBuilderExtensions
@@ -17,7 +17,7 @@ public static IEngineBuilder UseCasl(this IEngineBuilder builder)
         ArgumentNullException.ThrowIfNull(builder);
 
         builder.Services.AddSingleton<ICaslAudioFactory, CaslAudioFactory>();
-        builder.Services.AddSingleton<ResourceLoaderBase<ISound>, CaslSoundResourceLoader>();
+        builder.Services.AddResourceLoader<ISound, CaslSoundResourceLoader>();
 
         return builder;
     }

src/FinalEngine.Audio.OpenAL/Extensions/EngineBuilderExtensions.cs

@@ -10,6 +10,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\FinalEngine.Hosting\FinalEngine.Hosting.csproj" />
+    <ProjectReference Include="..\FinalEngine\FinalEngine.csproj" />
   </ItemGroup>
 </Project>

src/FinalEngine.Audio.OpenAL/FinalEngine.Audio.CASL.csproj

@@ -22,7 +22,7 @@ public CaslSoundResourceLoader(IFileSystem fileSystem, ICaslAudioFactory factory
         this.factory = factory ?? throw new ArgumentNullException(nameof(factory));
     }
 
-    protected override ISound LoadResource(string filePath)
+    public override ISound LoadResource(string filePath)
     {
         ArgumentException.ThrowIfNullOrWhiteSpace(filePath);
 

src/FinalEngine.Audio.OpenAL/Loaders/CaslSoundResourceLoader.cs

@@ -0,0 +1 @@
+<Project Sdk="Microsoft.NET.Sdk" />

src/FinalEngine.Audio/FinalEngine.Audio.csproj

@@ -0,0 +1,20 @@
+// <copyright file="ISound.cs" company="Software Antics">
+//     Copyright (c) Software Antics. All rights reserved.
+// </copyright>
+
+namespace FinalEngine.Audio;
+
+using FinalEngine.Resources;
+
+public interface ISound : IResource
+{
+    bool IsLooping { get; set; }
+
+    float Volume { get; set; }
+
+    void Pause();
+
+    void Play();
+
+    void Reset();
+}

src/FinalEngine.Audio/ISound.cs

@@ -0,0 +1 @@
+<Project Sdk="Microsoft.NET.Sdk" />

src/FinalEngine.Hosting/Extensions/ConfigurationBuilderExtensions.cs

@@ -0,0 +1,26 @@
+// <copyright file="IKeyboard.cs" company="Software Antics">
+//     Copyright (c) Software Antics. All rights reserved.
+// </copyright>
+
+namespace FinalEngine.Input.Keyboards;
+
+public interface IKeyboard
+{
+    bool IsAltDown { get; }
+
+    bool IsCapsLocked { get; }
+
+    bool IsControlDown { get; }
+
+    bool IsNumLocked { get; }
+
+    bool IsShiftDown { get; }
+
+    bool IsKeyDown(Key key);
+
+    bool IsKeyPressed(Key key);
+
+    bool IsKeyReleased(Key key);
+
+    internal void Update();
+}

src/FinalEngine.Hosting/Extensions/ServiceCollectionExtensions.cs

@@ -0,0 +1,14 @@
+// <copyright file="IKeyboardDevice.cs" company="Software Antics">
+//     Copyright (c) Software Antics. All rights reserved.
+// </copyright>
+
+namespace FinalEngine.Input.Keyboards;
+
+using System;
+
+public interface IKeyboardDevice : IDisposable
+{
+    event EventHandler<KeyEventArgs>? KeyDown;
+
+    event EventHandler<KeyEventArgs>? KeyUp;
+}