move shaders to cpp file

5 files changed, 15 insertions, 12 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b54ba75063..55cd4b6571 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(llmr_SOURCES
     renderer/shader-line.cpp
     renderer/shader-outline.cpp
     renderer/shader.cpp
-    shader/shaders.c
+    shader/shaders.cpp
     util/animation.cpp
     util/mat4.c
 )
@@ -28,6 +28,7 @@ SET(llmr_HEADERS
     ../include/llmr/renderer/shader-line.hpp
     ../include/llmr/renderer/shader-outline.hpp
     ../include/llmr/renderer/shader.hpp
+    ../include/llmr/shader/shaders.hpp
     ../include/llmr/util/animation.hpp
     ../include/llmr/util/math.hpp
     ../include/llmr/util/vec2.hpp
diff --git a/src/renderer/shader-fill.cpp b/src/renderer/shader-fill.cpp
index 99cc84eb2a..623d061188 100644
--- a/src/renderer/shader-fill.cpp
+++ b/src/renderer/shader-fill.cpp
@@ -1,13 +1,13 @@
 #include <llmr/renderer/shader-fill.hpp>
-#include <llmr/shader/shaders.h>
+#include <llmr/shader/shaders.hpp>
 #include <llmr/platform/gl.hpp>
 
 using namespace llmr;
 
 FillShader::FillShader()
     : Shader(
-        llmr_shaders[FILL_SHADER].vertex,
-        llmr_shaders[FILL_SHADER].fragment
+        shaders[FILL_SHADER].vertex,
+        shaders[FILL_SHADER].fragment
     ) {
     if (!valid) {
         fprintf(stderr, "invalid fill shader\n");
diff --git a/src/renderer/shader-line.cpp b/src/renderer/shader-line.cpp
index c9f409cbb3..f6ea501596 100644
--- a/src/renderer/shader-line.cpp
+++ b/src/renderer/shader-line.cpp
@@ -1,13 +1,13 @@
 #include <llmr/renderer/shader-line.hpp>
-#include <llmr/shader/shaders.h>
+#include <llmr/shader/shaders.hpp>
 #include <llmr/platform/gl.hpp>
 
 using namespace llmr;
 
 LineShader::LineShader()
     : Shader(
-        llmr_shaders[LINE_SHADER].vertex,
-        llmr_shaders[LINE_SHADER].fragment
+        shaders[LINE_SHADER].vertex,
+        shaders[LINE_SHADER].fragment
     ) {
     if (!valid) {
         fprintf(stderr, "invalid line shader\n");
diff --git a/src/renderer/shader-outline.cpp b/src/renderer/shader-outline.cpp
index 0aa86d8beb..ea27b26987 100644
--- a/src/renderer/shader-outline.cpp
+++ b/src/renderer/shader-outline.cpp
@@ -1,13 +1,13 @@
 #include <llmr/renderer/shader-outline.hpp>
-#include <llmr/shader/shaders.h>
+#include <llmr/shader/shaders.hpp>
 #include <llmr/platform/gl.hpp>
 
 using namespace llmr;
 
 OutlineShader::OutlineShader()
     : Shader(
-        llmr_shaders[OUTLINE_SHADER].vertex,
-        llmr_shaders[OUTLINE_SHADER].fragment
+        shaders[OUTLINE_SHADER].vertex,
+        shaders[OUTLINE_SHADER].fragment
     ) {
     if (!valid) {
         fprintf(stderr, "invalid outline shader\n");
diff --git a/src/shader/shaders.c b/src/shader/shaders.cpp
index 650c73a246..38e37ead0b 100644
--- a/src/shader/shaders.c
+++ b/src/shader/shaders.cpp
@@ -1,7 +1,9 @@
 // NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.
-#include <llmr/shader/shaders.h>
+#include <llmr/shader/shaders.hpp>
 
-const llmr_shader_t llmr_shaders[SHADER_COUNT] = {
+using namespace llmr;
+
+const shader_source llmr::shaders[SHADER_COUNT] = {
    [FILL_SHADER] = {
        .vertex = "attribute vec2 a_pos;\n\nuniform mat4 u_matrix;\n\nvoid main() {\n    gl_Position = u_matrix * vec4(a_pos, 0, 1);\n}\n",
        .fragment = "uniform vec4 u_color;\n\nvoid main() {\n    gl_FragColor = u_color;\n}\n",