From c3a3379b56c3d590f405aa4d04b1e11ff9c8e0aa Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Sat, 7 Dec 2013 22:44:19 -0500 Subject: [PATCH] DefaultShader: make SHADER_SRC a class-wide constant --- src/default_shader.d | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/src/default_shader.d b/src/default_shader.d index 6d55388..ee2cbbc 100644 --- a/src/default_shader.d +++ b/src/default_shader.d @@ -8,24 +8,25 @@ class DefaultShader public GLint color_idx; protected Shader m_program; + immutable string SHADER_SRC = ` +vertex: + uniform mat4 view; + in vec2 position; + void main(void) + { + gl_Position = view * vec4(position, 0.0, 1.0); + } +fragment: + uniform vec3 color; + void main(void) + { + gl_FragColor = vec4(color, 1.0); + } +`; + this() { - immutable string shader_src = ` - vertex: - uniform mat4 view; - in vec2 position; - void main(void) - { - gl_Position = view * vec4(position, 0.0, 1.0); - } - fragment: - uniform vec3 color; - void main(void) - { - gl_FragColor = vec4(color, 1.0); - } - `; - m_program = new Shader("program", shader_src); + m_program = new Shader("program", SHADER_SRC); view_idx = m_program.get_uniform_location("view"); position_idx = m_program.get_attrib_location("position"); color_idx = m_program.get_uniform_location("color");