summary refs log tree commit diff
path: root/src/Assets.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Assets.cpp')
-rw-r--r--src/Assets.cpp44
1 files changed, 11 insertions, 33 deletions
diff --git a/src/Assets.cpp b/src/Assets.cpp
index dc2495e..7cf361c 100644
--- a/src/Assets.cpp
+++ b/src/Assets.cpp
@@ -1,41 +1,19 @@
 #include "Assets.hpp"
 
-namespace MC::Assets {
-
-Char const* Shaders::terrain::vertex =
-#include "../assets/generated/shaders/terrain.vert.glsl.include"
-;
-
-Char const* Shaders::terrain::fragment =
-#include "../assets/generated/shaders/terrain.frag.glsl.include"
-;
-
-Char const* Shaders::clouds::vertex =
-#include "../assets/generated/shaders/clouds.vert.glsl.include"
-;
+#define ASSET(ns, name, raw_name) \
+    namespace ns { Char const* name = ::MC::Assets::Files::raw_name; }
 
-Char const* Shaders::clouds::fragment =
-#include "../assets/generated/shaders/clouds.frag.glsl.include"
-;
+#define SHADER_ASSET(name) \
+    ASSET(Shaders::name, vertex, shaders_##name##_vertex) \
+    ASSET(Shaders::name, fragment, shaders_##name##_fragment)
 
-Char const* Shaders::image_viewer::vertex =
-#include "../assets/generated/shaders/image_viewer.vert.glsl.include"
-;
-
-Char const* Shaders::image_viewer::fragment =
-#include "../assets/generated/shaders/image_viewer.frag.glsl.include"
-;
-
-Char const* Shaders::block_outline::vertex =
-#include "../assets/generated/shaders/block_outline.vert.glsl.include"
-;
+namespace MC::Assets {
 
-Char const* Shaders::block_outline::fragment =
-#include "../assets/generated/shaders/block_outline.frag.glsl.include"
-;
+SHADER_ASSET(terrain)
+SHADER_ASSET(clouds)
+SHADER_ASSET(block_outline)
+SHADER_ASSET(image_viewer)
 
-Char const* Images::atlas =
-#include "../assets/generated/images/atlas.ppm.include"
-;
+ASSET(Images, atlas, images_atlas_ppm)
 
 }
\ No newline at end of file