diff options
Diffstat (limited to 'src/libjin/Graphics/shaders/je_base.shader.h')
| -rw-r--r-- | src/libjin/Graphics/shaders/je_base.shader.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libjin/Graphics/shaders/je_base.shader.h b/src/libjin/Graphics/shaders/je_base.shader.h index 88fa872..34996bc 100644 --- a/src/libjin/Graphics/shaders/je_base.shader.h +++ b/src/libjin/Graphics/shaders/je_base.shader.h @@ -29,7 +29,7 @@ static const char* base_vertex = R"( // Projection matrix uniform mat4 jin_ProjectionMatrix; // Model view matrix -uniform mat4 jin_ModelMatrix; +uniform mat4 jin_ModelViewMatrix; in vec2 jin_VertexCoords; in vec2 jin_TextureCoords; @@ -42,7 +42,7 @@ out vec2 jin_UV; void main() { - vec4 v = jin_ModelMatrix * 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; @@ -81,7 +81,7 @@ static const int BASE_FRAGMENT_SHADER_SIZE = strlen(base_fragment) + BASE_SHARED #define formatFragmentShader(buf, program) sprintf(buf, base_fragment, base_shared, program) static const char* SHADER_PROJECTION_MATRIX = "jin_ProjectionMatrix"; -static const char* SHADER_MODEL_MATRIX = "jin_ModelMatrix"; +static const char* SHADER_MODELVIEW_MATRIX = "jin_ModelViewMatrix"; static const char* SHADER_MAIN_TEXTURE = "jin_MainTexture"; static const char* SHADER_VERTEX_COORDS = "jin_VertexCoords"; static const char* SHADER_TEXTURE_COORDS = "jin_TextureCoords"; |