Store assets nicely

6 files changed, 38 insertions, 34 deletions

diff --git a/src/Assets.cpp b/src/Assets.cpp
new file mode 100644
index 0000000..ffd09ec
--- /dev/null
+++ b/src/Assets.cpp
@@ -0,0 +1,17 @@
+#include "Assets.hpp"
+
+namespace MC::Assets {
+
+const char* Shaders::fragment =
+#include "../assets/generated/shaders/fragment.glsl.includable"
+;
+
+const char* Shaders::vertex =
+#include "../assets/generated/shaders/vertex.glsl.includable"
+;
+
+const char* Images::atlas =
+#include "../assets/generated/images/atlas.ppm.includable"
+;
+
+}
\ No newline at end of file
diff --git a/src/Assets.hpp b/src/Assets.hpp
new file mode 100644
index 0000000..641125a
--- /dev/null
+++ b/src/Assets.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+namespace MC::Assets {
+
+namespace Shaders {
+
+extern const char* vertex;
+extern const char* fragment;
+
+}
+
+namespace Images {
+
+extern const char* atlas;
+
+}
+
+}
\ No newline at end of file
diff --git a/src/Shader/Shader.hpp b/src/Shader/Shader.hpp
index 75c4f14..76a1197 100644
--- a/src/Shader/Shader.hpp
+++ b/src/Shader/Shader.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include "ShaderSources.hpp"
+#include "../Assets.hpp"
 
 namespace MC {
 
@@ -13,11 +13,11 @@ public:
     }
 
     static Shader create_vertex() {
-        return {GL_VERTEX_SHADER, ShaderSources::vertex_shader};
+        return {GL_VERTEX_SHADER, Assets::Shaders::vertex};
     }
 
     static Shader create_fragment() {
-        return {GL_FRAGMENT_SHADER, ShaderSources::fragment_shader};
+        return {GL_FRAGMENT_SHADER, Assets::Shaders::fragment};
     }
 
 private:
diff --git a/src/Shader/ShaderSources.hpp b/src/Shader/ShaderSources.hpp
deleted file mode 100644
index bd413b6..0000000
--- a/src/Shader/ShaderSources.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-namespace MC::ShaderSources {
-
-constexpr const char* vertex_shader =
-#include "Generated/vertex.glsl.includable"
-;
-
-constexpr const char* fragment_shader =
-#include "Generated/fragment.glsl.includable"
-;
-
-}
\ No newline at end of file
diff --git a/src/Shader/fragment.glsl b/src/Shader/fragment.glsl
deleted file mode 100644
index ba5ed93..0000000
--- a/src/Shader/fragment.glsl
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 330 core
-
-out vec4 color;
-
-void main() {
-    color = vec4(0.2f, 0.6f, 0.6f, 1.0f); // #339999
-}
\ No newline at end of file
diff --git a/src/Shader/vertex.glsl b/src/Shader/vertex.glsl
deleted file mode 100644
index e7b9e3d..0000000
--- a/src/Shader/vertex.glsl
+++ /dev/null
@@ -1,11 +0,0 @@
-#version 330 core
-
-uniform mat4 model_matrix;
-uniform mat4 view_matrix;
-uniform mat4 projection_matrix;
-
-in vec3 position;
-
-void main() {
-    gl_Position = projection_matrix * view_matrix * model_matrix * vec4(position, 1.0);
-}
\ No newline at end of file