From dc21ce532b56b56b1b60ff1bbe5726eff83e4dd5 Mon Sep 17 00:00:00 2001
From: Mel <einebeere@gmail.com>
Date: Sun, 14 Apr 2024 22:47:08 +0200
Subject: Fix SIOF [1] in asset system and rework for better flexibility

[1]: https://en.cppreference.com/w/cpp/language/siof
---
 src/GFX/Resources.hpp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'src/GFX/Resources.hpp')

diff --git a/src/GFX/Resources.hpp b/src/GFX/Resources.hpp
index 4206e33..8f9a79a 100644
--- a/src/GFX/Resources.hpp
+++ b/src/GFX/Resources.hpp
@@ -24,10 +24,23 @@ private:
     };
 
     static inline std::array<ProgramMetadata, ProgramCount> const m_program_metadata = {{
-        {Program::Terrain, Assets::Shaders::terrain::vertex, Assets::Shaders::terrain::fragment},
-        {Program::Clouds, Assets::Shaders::clouds::vertex, Assets::Shaders::clouds::fragment},
-        {Program::ImageViewer, Assets::Shaders::image_viewer::vertex, Assets::Shaders::image_viewer::fragment},
-        {Program::BlockOutline, Assets::Shaders::block_outline::vertex, Assets::Shaders::block_outline::fragment},
+        {
+            Program::Terrain,
+            asset<Assets::Shaders::terrain::vertex>(),
+            asset<Assets::Shaders::terrain::fragment>()
+        }, {
+            Program::Clouds,
+            asset<Assets::Shaders::clouds::vertex>(),
+            asset<Assets::Shaders::clouds::fragment>()
+        }, {
+            Program::ImageViewer,
+            asset<Assets::Shaders::image_viewer::vertex>(),
+            asset<Assets::Shaders::image_viewer::fragment>()
+        }, {
+            Program::BlockOutline,
+            asset<Assets::Shaders::block_outline::vertex>(),
+            asset<Assets::Shaders::block_outline::fragment>()
+        },
     }};
 
     Bool m_initialized = false;
-- 
cgit 1.4.1