X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=044ab55db7d3404d0f7ac9db3181d1e3eb3e5281;hp=b935ce14c3e88bf94636135cc5ae0fe084574cbf;hb=42c44db6aa2961cffea6263f337adbd9d161c59c;hpb=ed8271348445905c43388740effaa5d75d11fe00 diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp index b935ce14..044ab55d 100644 --- a/source/render/renderer.cpp +++ b/source/render/renderer.cpp @@ -110,18 +110,6 @@ void Renderer::flush_textures() texture_stack.erase(texture_stack.begin()+state->texture_count, texture_stack.end()); } -void Renderer::set_material(const Material *m) -{ - if(m) - add_shader_data(m->get_shader_data()); -} - -void Renderer::set_lighting(const Lighting *l) -{ - if(l) - add_shader_data(l->get_shader_data()); -} - void Renderer::set_shader_program(const Program *p, const ProgramData *d) { state->shprog = p; @@ -141,13 +129,13 @@ void Renderer::add_shader_data(const ProgramData &d) } } - flush_shader_data_(); + flush_shader_data(); shdata_stack.push_back(&d); state->shdata_count = shdata_stack.size(); changed |= SHADER_DATA; } -void Renderer::flush_shader_data_() +void Renderer::flush_shader_data() { if(shdata_stack.size()>state->shdata_count) shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());