From 7790ba2cda53f9fd0215595a5b650f75a2dc80da Mon Sep 17 00:00:00 2001 From: cinnaboot Date: Sat, 18 Dec 2021 11:09:25 -0500 Subject: [PATCH] reorganize shader header --- src/shader.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/shader.h b/src/shader.h index f9de3cb..1ca2a91 100644 --- a/src/shader.h +++ b/src/shader.h @@ -8,14 +8,6 @@ #include "types.h" -// FIXME: won't need this enum when dynamic shader parsing is working -enum glsl_layout -{ - POSITION, - NORMAL, - UV -}; - struct gl_buffer { GLuint id; @@ -85,13 +77,6 @@ struct GLContext shader_program* shaders; }; -struct transforms -{ - glm::mat4 view_xform; - glm::mat4 proj_xform; - glm::mat4 normal_xform; -}; - struct GLmesh { u32 num_indices; @@ -121,6 +106,21 @@ struct node; struct entity; struct animation; +struct transforms +{ + glm::mat4 view_xform; + glm::mat4 proj_xform; + glm::mat4 normal_xform; +}; + +// FIXME: won't need this enum when dynamic shader parsing is working +enum glsl_layout +{ + POSITION, + NORMAL, + UV +}; + const float DEFAULT_FOV = 60.f; const float NEAR_CLIP_PLANE = 5.f;