fix tornado asked

technologists-team · Jul 14, 2024 · f90493c · f90493c
1 parent 30cdeee
commit f90493c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/Hypercube.Client/Graphics/Rendering/Renderer.cs b/Hypercube.Client/Graphics/Rendering/Renderer.cs
@@ -107,6 +107,8 @@ private void OnStartup(ref RuntimeStartupEvent args)
         InitOpenGL();
 
         _resourceCacher.PreloadTextures();
+        _resourceCacher.PreloadShaders();
+        _resourceCacher.PreloadAudio();
 
         OnLoad();
     }

diff --git a/Hypercube.Client/Graphics/Texturing/TextureManager.cs b/Hypercube.Client/Graphics/Texturing/TextureManager.cs
@@ -22,9 +22,6 @@ public TextureManager()
         StbImage.stbi_set_flip_vertically_on_load(1);
     }
 
-
-    #region PublicAPI
-
     public ITextureHandle GetTextureHandle(ResourcePath path, ITextureCreationSettings settings)
     {
         return GetTextureHandleInternal(path, settings);
@@ -50,10 +47,6 @@ public ITextureHandle GetTextureHandle(ITexture texture, ITextureCreationSetting
         return GetTextureHandleInternal(texture.Path, settings);
     }
 
-    #endregion
-
-    #region Internal
-
     internal ITexture GetTextureInternal(ResourcePath path)
     {
         var texture = CreateTexture(path);
@@ -87,6 +80,4 @@ internal ITextureHandle CreateTextureHandle(ITexture texture, ITextureCreationSe
     {
         return new TextureHandle(texture, settings);
     }
-
-    #endregion
 }
diff --git a/Hypercube.Client/Resources/Caching/ResourceCacher.Preload.cs b/Hypercube.Client/Resources/Caching/ResourceCacher.Preload.cs
@@ -10,10 +10,15 @@ public partial class ResourceCacher
 
     public void PreloadTextures()
     {
-        var container = DependencyManager.GetContainer();
-        PreloadTextures(container);
-        PreloadShaders(container);
-        PreloadAudio(container);
+        PreloadTextures(_container);
+    }
+    public void PreloadShaders()
+    {
+        PreloadShaders(_container);
+    }
+    public void PreloadAudio()
+    {
+        PreloadAudio(_container);
     }
 
     private void PreloadTextures(DependenciesContainer container)

diff --git a/Hypercube.Shared/Resources/Caching/IResourceCacher.cs b/Hypercube.Shared/Resources/Caching/IResourceCacher.cs
@@ -14,4 +14,6 @@ void CacheResource<T>(ResourcePath path, T resource)
         where T : Resource.Resource, new();
 
     void PreloadTextures();
+    void PreloadShaders();
+    void PreloadAudio();
 }