Merge remote-tracking branch 'origin/caching-manager' into caching-ma…

…nager

Hypercube.Client/Audio/Event/AudioLibraryInitializedEvent.cs

@@ -0,0 +1,5 @@
+using Hypercube.Shared.EventBus.Events;
+
+namespace Hypercube.Client.Audio.Event;
+
+public readonly record struct AudioLibraryInitializedEvent : IEventArgs;

Hypercube.Client/Audio/Realisations/OpenAL/ContextExtension.cs → Hypercube.Client/Audio/Realisation/OpenAL/ContextExtension.cs

@@ -1,4 +1,4 @@
-namespace Hypercube.Client.Audio.Realisations.OpenAL;
+namespace Hypercube.Client.Audio.Realisation.OpenAL;
 
 public static class ContextExtension
 {

Hypercube.Client/Audio/Realisations/OpenAL/OpenALAudioManager.cs → Hypercube.Client/Audio/Realisation/OpenAL/OpenALAudioManager.cs

@@ -1,4 +1,5 @@
 using System.Collections.Frozen;
+using Hypercube.Client.Audio.Event;
 using Hypercube.Client.Audio.Loading;
 using Hypercube.Client.Utilities.Helpers;
 using Hypercube.Shared.Dependency;
@@ -9,7 +10,7 @@
 using Hypercube.Shared.Runtimes.Event;
 using OpenTK.Audio.OpenAL;
 
-namespace Hypercube.Client.Audio.Realisations.OpenAL;
+namespace Hypercube.Client.Audio.Realisation.OpenAL;
 
 /// <remarks>
 /// For some reason, on my Windows 11 machine there is no <c>openal32.dll</c>
@@ -57,6 +58,9 @@ public void Initialize()
             return;
 
         CreateContext();
+
+        _logger.EngineInfo("Initialized");
+        _eventBus.Raise(new AudioLibraryInitializedEvent());
     }
 
     private AudioStream CreateAudio(ResourcePath path, AudioSettings settings)

Hypercube.Client/Dependencies.cs

@@ -1,6 +1,6 @@
 using Hypercube.Client.Audio;
 using Hypercube.Client.Audio.Loading;
-using Hypercube.Client.Audio.Realisations.OpenAL;
+using Hypercube.Client.Audio.Realisation.OpenAL;
 using Hypercube.Client.Graphics.Drawing;
 using Hypercube.Client.Graphics.Rendering;
 using Hypercube.Client.Graphics.Texturing;

Hypercube.Client/Graphics/Event/GraphicsLibraryInitializedEvent.cs

@@ -0,0 +1,5 @@
+using Hypercube.Shared.EventBus.Events;
+
+namespace Hypercube.Client.Graphics.Event;
+
+public readonly record struct GraphicsLibraryInitializedEvent : IEventArgs;

Hypercube.Client/Graphics/Rendering/Renderer.OpenGL.cs

@@ -1,4 +1,5 @@
 using System.Runtime.InteropServices;
+using Hypercube.Client.Graphics.Event;
 using Hypercube.Shared.Logging;
 using OpenTK.Windowing.GraphicsLibraryFramework;
 using OpenToolkit.Graphics.OpenGL4;
@@ -43,6 +44,7 @@ private void InitOpenGL()
         GL.ClearColor(0, 0, 0, 0);
 
         _loggerOpenGL.EngineInfo("Initialized");
+        _eventBus.Raise(new GraphicsLibraryInitializedEvent());
     }
 
     private void DebugMessageCallback(DebugSource source, DebugType type, int id, DebugSeverity severity, int length, IntPtr messagePointer, IntPtr userparam)

Hypercube.Client/Graphics/Rendering/Renderer.cs

@@ -1,13 +1,11 @@
 using System.Collections.Frozen;
 using Hypercube.Client.Graphics.OpenGL;
 using Hypercube.Client.Graphics.Texturing;
-using Hypercube.Client.Graphics.Texturing.Events;
 using Hypercube.Client.Graphics.Viewports;
 using Hypercube.Client.Graphics.Windows;
 using Hypercube.Client.Graphics.Windows.Manager;
 using Hypercube.Shared.Dependency;
 using Hypercube.Shared.EventBus;
-using Hypercube.Shared.EventBus.Events;
 using Hypercube.Shared.Logging;
 using Hypercube.Shared.Resources.Caching;
 using Hypercube.Shared.Resources.Manager;
@@ -103,13 +101,7 @@ private void OnStartup(ref RuntimeStartupEvent args)
         var windowIcons = _windowManager.LoadWindowIcons(_textureManager, _resourceManager, "/Icons").ToList();
         _windowManager.SetWindowIcons(MainWindow, windowIcons);
 
-
         InitOpenGL();
-
-        _resourceCacher.PreloadTextures();
-        _resourceCacher.PreloadShaders();
-        _resourceCacher.PreloadAudio();
-
         OnLoad();
     }
 

Hypercube.Client/Graphics/Texturing/TextureSettings/Texture2DCreationSettings.cs

@@ -36,8 +36,8 @@ public Texture2DCreationSettings()
         {
             new TextureParameter(TextureParameterName.TextureWrapS, (int)TextureWrapMode.Repeat),
             new TextureParameter(TextureParameterName.TextureWrapT, (int)TextureWrapMode.Repeat),
-            new TextureParameter(TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear),
-            new TextureParameter(TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear),
+            new TextureParameter(TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Nearest),
+            new TextureParameter(TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Nearest),
         };
         PixelInternalFormat = PixelInternalFormat.Rgba;
         Level = 0;

Hypercube.Client/Resources/Caching/ResourceCacher.Preload.cs

@@ -1,4 +1,6 @@
 using System.Diagnostics;
+using Hypercube.Client.Audio.Event;
+using Hypercube.Client.Graphics.Event;
 using Hypercube.Shared.Dependency;
 using Hypercube.Shared.Logging;
 
@@ -7,20 +9,18 @@ namespace Hypercube.Client.Resources.Caching;
 public partial class ResourceCacher
 {
     private readonly Logger _loggerPreload = LoggingManager.GetLogger("cache.preload");
-    
-    public void PreloadTextures()
+
+    private void OnAudioLibraryInitialized(ref AudioLibraryInitializedEvent ev)
     {
-        PreloadTextures(_container);
+        PreloadAudio(_container);
     }
-    public void PreloadShaders()
+
+    private void OnGraphicsLibraryInitialized(ref GraphicsLibraryInitializedEvent ev)
     {
+        PreloadTextures(_container);
         PreloadShaders(_container);
     }
-    public void PreloadAudio()
-    {
-        PreloadAudio(_container);
-    }
-
+
     private void PreloadTextures(DependenciesContainer container)
     {
         _loggerPreload.EngineInfo("Preloading textures...");

Hypercube.Client/Resources/Caching/ResourceCacher.cs

@@ -1,5 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
+using Hypercube.Client.Audio.Event;
+using Hypercube.Client.Graphics.Event;
 using Hypercube.Shared.Dependency;
+using Hypercube.Shared.EventBus;
 using Hypercube.Shared.Logging;
 using Hypercube.Shared.Resources;
 using Hypercube.Shared.Resources.Caching;
@@ -8,16 +11,21 @@
 
 namespace Hypercube.Client.Resources.Caching;
 
-public partial class ResourceCacher : IResourceCacher
+public partial class ResourceCacher : IResourceCacher, IEventSubscriber, IPostInject
 {
+    [Dependency] private readonly IEventBus _eventBus = default!;
     [Dependency] private readonly IResourceManager _resourceManager = default!;
 
-    private Dictionary<Type, Dictionary<ResourcePath, Resource>> _cachedResources = new();
-
-    private DependenciesContainer _container = DependencyManager.GetContainer();
-
+    private readonly Dictionary<Type, Dictionary<ResourcePath, Resource>> _cachedResources = new();
+    private readonly DependenciesContainer _container = DependencyManager.GetContainer();
     private readonly Logger _logger = LoggingManager.GetLogger("cache");
 
+    public void PostInject()
+    {
+        _eventBus.Subscribe<AudioLibraryInitializedEvent>(this, OnAudioLibraryInitialized);
+        _eventBus.Subscribe<GraphicsLibraryInitializedEvent>(this, OnGraphicsLibraryInitialized);
+    }
+
     public T GetResource<T>(ResourcePath path, bool useFallback = true) where T : Resource, new()
     {
         var typeDict = GetTypeDict<T>();

Hypercube.Shared/Resources/Caching/IResourceCacher.cs

@@ -1,5 +1,4 @@
 using System.Diagnostics.CodeAnalysis;
-using Hypercube.Shared.Resources.Caching.Resource;
 
 namespace Hypercube.Shared.Resources.Caching;
 
@@ -12,8 +11,4 @@ bool TryGetResource<T>(ResourcePath path, [NotNullWhen(true)] out T? resource)
 
     void CacheResource<T>(ResourcePath path, T resource)
         where T : Resource.Resource, new();
-
-    void PreloadTextures();
-    void PreloadShaders();
-    void PreloadAudio();
 }