X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=01c17a26ef8cc3ce5019bea833a3224e7c54e19c;hb=bd994b9a1376a021022e5145f30b7566e7923e4d;hp=06841fa7a9a42442b6265b36f2c04d928fed8845;hpb=58e3368ddb21de5c4bc6e208440de369fe4876f1;p=libs%2Fgl.git diff --git a/source/renderer.cpp b/source/renderer.cpp index 06841fa7..01c17a26 100644 --- a/source/renderer.cpp +++ b/source/renderer.cpp @@ -1,6 +1,7 @@ #include "batch.h" #include "buffer.h" #include "camera.h" +#include "clipping.h" #include "error.h" #include "lighting.h" #include "material.h" @@ -22,17 +23,33 @@ namespace GL { Renderer::Renderer(const Camera *c): mtx_stack(*this), - mtx_changed(true), + changed(0), matrices_loaded(false), - camera(c), - state_stack(1), - lighting_changed(false), - element_buffer(0) + shdata_applied(0), + camera(0), + state_stack(1) { state_stack.reserve(16); shdata_stack.reserve(32); state = &state_stack.back(); + begin(c); +} + +Renderer::~Renderer() +{ + end(); +} + +void Renderer::begin(const Camera *c) +{ + if(state_stack.size()>1) + throw invalid_operation("Renderer::begin"); + + reset_state(); + excluded.clear(); + camera = c; + if(camera) { mtx_stack.load(camera->get_matrix()); @@ -40,14 +57,19 @@ Renderer::Renderer(const Camera *c): } else { - standard_shdata.uniform("projection_matrix", MatrixStack::projection().top()); mtx_stack.load(MatrixStack::modelview().top()); + standard_shdata.uniform("projection_matrix", MatrixStack::projection().top()); } } -Renderer::~Renderer() +void Renderer::set_matrix(const Matrix &matrix) { - end(); + mtx_stack.load(matrix); +} + +void Renderer::transform(const Matrix &matrix) +{ + mtx_stack *= matrix; } void Renderer::set_texture(const Texture *t) @@ -70,6 +92,7 @@ unsigned Renderer::allocate_effect_texunit() void Renderer::set_material(const Material *m) { state->material = m; + changed |= MATERIAL_SHDATA; } void Renderer::set_lighting(const Lighting *l) @@ -77,8 +100,20 @@ void Renderer::set_lighting(const Lighting *l) state->lighting = l; state->lighting_matrix = mtx_stack.top(); if(l) + { l->update_shader_data(standard_shdata, mtx_stack.top()); - lighting_changed = true; + changed |= STANDARD_SHDATA; + } + changed |= LEGACY_LIGHTING; +} + +void Renderer::set_clipping(const Clipping *c) +{ + state->clipping = c; + state->clipping_matrix = mtx_stack.top(); + if(c) + c->update_shader_data(standard_shdata, mtx_stack.top()); + changed |= LEGACY_CLIPPING; } void Renderer::set_shader_program(const Program *p, const ProgramData *d) @@ -86,17 +121,13 @@ void Renderer::set_shader_program(const Program *p, const ProgramData *d) state->shprog = p; if(p && d) add_shader_data(*d); - - /* Even if we have no new shdata, the existing ones need to be re-applied - to the new program */ - shdata_changed = true; } void Renderer::add_shader_data(const ProgramData &d) { shdata_stack.push_back(&d); state->shdata_count = shdata_stack.size(); - shdata_changed = true; + changed |= SHADER_DATA; } void Renderer::set_mesh(const Mesh *m) @@ -104,11 +135,6 @@ void Renderer::set_mesh(const Mesh *m) state->mesh = m; } -void Renderer::set_element_buffer(const Buffer *b) -{ - element_buffer = b; -} - void Renderer::set_winding_test(const WindingTest *w) { state->winding_test = w; @@ -131,13 +157,30 @@ void Renderer::pop_state() if(state_stack.size()==1) throw stack_underflow("Renderer::pop_state"); + const Lighting *old_lighting = state->lighting; + const Clipping *old_clipping = state->clipping; state_stack.pop_back(); state = &state_stack.back(); if(shdata_stack.size()>state->shdata_count) + { shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end()); + changed |= SHADER_DATA; + } + shdata_applied = min(shdata_applied, shdata_stack.size()); mtx_stack.pop(); - mtx_changed = true; - shdata_changed = true; + changed |= MATRIX; + if(state->lighting!=old_lighting) + { + if(state->lighting) + state->lighting->update_shader_data(standard_shdata, state->lighting_matrix); + changed |= LEGACY_LIGHTING; + } + if(state->clipping!=old_clipping) + { + if(state->clipping) + state->clipping->update_shader_data(standard_shdata, state->clipping_matrix); + changed |= LEGACY_CLIPPING; + } } void Renderer::escape() @@ -152,23 +195,17 @@ void Renderer::end() if(state_stack.size()>1) throw invalid_operation("Renderer::end"); - if(matrices_loaded) - { - if(camera) - MatrixStack::projection().pop(); - MatrixStack::modelview().pop(); - } + reset_state(); Mesh::unbind(); Texturing::unbind(); Texture::unbind_from(0); Material::unbind(); Lighting::unbind(); + Clipping::unbind(); Program::unbind(); Buffer::unbind_from(ELEMENT_ARRAY_BUFFER); WindingTest::unbind(); - - *state = State(); } void Renderer::exclude(const Renderable &renderable) @@ -192,10 +229,10 @@ void Renderer::draw(const Batch &batch) apply_state(); bool legacy_bindings = (!state->shprog || state->shprog->uses_legacy_variables()); - if(legacy_bindings) + if(state->mesh && legacy_bindings) { - if(element_buffer) - element_buffer->bind_to(ELEMENT_ARRAY_BUFFER); + if(const Buffer *ibuf = state->mesh->get_index_buffer()) + ibuf->bind_to(ELEMENT_ARRAY_BUFFER); else Buffer::unbind_from(ELEMENT_ARRAY_BUFFER); } @@ -228,44 +265,75 @@ void Renderer::apply_state() else Material::unbind(); - if(lighting_changed) + if(changed&LEGACY_LIGHTING) { if(state->lighting) { MatrixStack::modelview() = state->lighting_matrix; state->lighting->bind(); - mtx_changed = true; - lighting_changed = false; + changed = (changed&~LEGACY_LIGHTING)|LEGACY_MATRIX; } else Lighting::unbind(); } } + if(state->clipping) + { + if(legacy_bindings) + { + if(changed&LEGACY_CLIPPING) + { + MatrixStack::modelview() = state->clipping_matrix; + state->clipping->bind(true); + changed = (changed&~LEGACY_CLIPPING)|LEGACY_MATRIX; + } + } + else + state->clipping->bind(false); + } + else + Clipping::unbind(); + if(state->shprog) { + bool shprog_changed = (state->shprog!=Program::current()); state->shprog->bind(); if(!legacy_bindings) { - const Matrix &m = mtx_stack.top(); - standard_shdata.uniform("eye_obj_matrix", mtx_stack.top()); - LinAl::SquareMatrix nm; - for(unsigned i=0; i<3; ++i) - for(unsigned j=0; j<3; ++j) - nm(i, j) = m(i, j); - nm = transpose(invert(nm)); - standard_shdata.uniform_matrix3("eye_obj_normal_matrix", &nm(0, 0)); - if(state->material) + if(changed&MODERN_MATRIX) + { + const Matrix &m = mtx_stack.top(); + standard_shdata.uniform("eye_obj_matrix", mtx_stack.top()); + LinAl::SquareMatrix nm = m.block<3, 3>(0, 0); + nm = transpose(invert(nm)); + standard_shdata.uniform_matrix3("eye_obj_normal_matrix", &nm(0, 0)); + changed = (changed&~MODERN_MATRIX)|STANDARD_SHDATA; + } + + if(state->material && (changed&MATERIAL_SHDATA)) + { state->material->get_shader_data().apply(); - standard_shdata.apply(); + changed &= ~MATERIAL_SHDATA; + } + + if(changed&STANDARD_SHDATA) + { + standard_shdata.apply(); + changed &= ~STANDARD_SHDATA; + } } - if(shdata_changed) + if((changed&SHADER_DATA) || shprog_changed) { - for(vector::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i) + vector::const_iterator i = shdata_stack.begin(); + if(!shprog_changed) + i += shdata_applied; + for(; i!=shdata_stack.end(); ++i) (*i)->apply(); - shdata_changed = false; + changed &= ~SHADER_DATA; + shdata_applied = shdata_stack.size(); } } else @@ -307,14 +375,28 @@ void Renderer::apply_state() matrices_loaded = true; } - if(mtx_changed) + if(changed&LEGACY_MATRIX) { MatrixStack::modelview() = mtx_stack.top(); - mtx_changed = false; + changed &= ~LEGACY_MATRIX; } } } +void Renderer::reset_state() +{ + if(!matrices_loaded) + return; + + if(camera) + MatrixStack::projection().pop(); + MatrixStack::modelview().pop(); + matrices_loaded = false; + changed |= MATRIX; + + *state = State(); +} + Renderer::State::State(): texture(0), @@ -322,6 +404,7 @@ Renderer::State::State(): lowest_effect_texunit(TexUnit::get_n_units()), material(0), lighting(0), + clipping(0), shprog(0), shdata_count(0), mesh(0), @@ -336,7 +419,7 @@ Renderer::MtxStack::MtxStack(Renderer &r): void Renderer::MtxStack::update() { - renderer.mtx_changed = true; + renderer.changed |= MATRIX; } } // namespace GL