diff options
Diffstat (limited to 'src/libjin/graphics/shaders/je_base.shader.h')
| -rw-r--r-- | src/libjin/graphics/shaders/je_base.shader.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/libjin/graphics/shaders/je_base.shader.h b/src/libjin/graphics/shaders/je_base.shader.h index 34996bc..1cecddf 100644 --- a/src/libjin/graphics/shaders/je_base.shader.h +++ b/src/libjin/graphics/shaders/je_base.shader.h @@ -2,13 +2,13 @@ #define __JE_BASE_SHADER_H__ static const char* base_shared = R"( -#define Number float +#define Number float #define Texture sampler2D #define Canvas sampler2D #define Color vec4 -#define Vec2 vec2 -#define Vec3 vec3 -#define Vec4 vec4 +#define Vec2 vec2 +#define Vec3 vec3 +#define Vec4 vec4 #define texel texture2D @@ -26,9 +26,8 @@ static const char* base_vertex = R"( #version 130 core %s -// Projection matrix + uniform mat4 jin_ProjectionMatrix; -// Model view matrix uniform mat4 jin_ModelViewMatrix; in vec2 jin_VertexCoords; @@ -42,10 +41,10 @@ out vec2 jin_UV; void main() { - vec4 v = jin_ModelViewMatrix * vec4(jin_VertexCoords, 0, 1.0); + vec4 v = jin_ModelViewMatrix * vec4(jin_VertexCoords, 0, 1.0); Vertex _v = vert(Vertex(v.xy, jin_TextureCoords)); - gl_Position = jin_ProjectionMatrix * vec4(_v.xy, 0, 1.0f); - jin_Color = gl_Color; + gl_Position = jin_ProjectionMatrix * vec4(_v.xy, 0, 1.0f); + jin_Color = gl_Color; jin_XY = _v.xy; jin_UV = _v.uv; } @@ -86,4 +85,4 @@ static const char* SHADER_MAIN_TEXTURE = "jin_MainTexture"; static const char* SHADER_VERTEX_COORDS = "jin_VertexCoords"; static const char* SHADER_TEXTURE_COORDS = "jin_TextureCoords"; -#endif // __JE_BASE_SHADER_H__ +#endif // __JE_BASE_SHADER_H__
\ No newline at end of file |