X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fobjectrenderer.cpp;h=cbceb3aa94f48d3f65ad8ac019962fc8960be1e3;hp=9327c977681dd2ae5186baa8e36404e96860985b;hb=748d002a813bbe6309dd22259bdce3278c02b0c8;hpb=ea748154f1bc7dbc81cb52611a52865e63109439 diff --git a/src/objectrenderer.cpp b/src/objectrenderer.cpp index 9327c97..cbceb3a 100644 --- a/src/objectrenderer.cpp +++ b/src/objectrenderer.cpp @@ -24,9 +24,12 @@ ObjectRenderer::ObjectRenderer(const ObjectType & type, const char * vert_glsl_file, const char * frag_glsl_file, const char * geom_glsl_file) : m_type(type), m_shader_program(), m_indexes(), m_buffer_builder(NULL) { - m_shader_program.InitialiseShaders(vert_glsl_file, frag_glsl_file, geom_glsl_file); - m_shader_program.Use(); - glUniform4f(m_shader_program.GetUniformLocation("colour"), 0,0,0,1); //TODO: Allow different colours + if (vert_glsl_file != NULL && frag_glsl_file != NULL && geom_glsl_file != NULL) + { + m_shader_program.InitialiseShaders(vert_glsl_file, frag_glsl_file, geom_glsl_file); + m_shader_program.Use(); + glUniform4f(m_shader_program.GetUniformLocation("colour"), 0,0,0,1); //TODO: Allow different colours + } } /**