X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderer.cpp;h=76ac5846f2aad1e9417780e39d87f3c816a81088;hp=06841fa7a9a42442b6265b36f2c04d928fed8845;hb=1efd559eb32adf48200941402ccefc6b5422aa4c;hpb=58e3368ddb21de5c4bc6e208440de369fe4876f1 diff --git a/source/renderer.cpp b/source/renderer.cpp index 06841fa7..76ac5846 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" @@ -21,28 +22,18 @@ namespace Msp { 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) + state_stack(1) { state_stack.reserve(16); shdata_stack.reserve(32); state = &state_stack.back(); - if(camera) - { - mtx_stack.load(camera->get_matrix()); - standard_shdata.uniform("projection_matrix", camera->get_projection_matrix()); - } + if(c) + set_camera(*c); else - { - standard_shdata.uniform("projection_matrix", MatrixStack::projection().top()); - mtx_stack.load(MatrixStack::modelview().top()); - } + standard_shdata.uniform("projection_matrix", Matrix()); } Renderer::~Renderer() @@ -50,6 +41,33 @@ Renderer::~Renderer() end(); } +void Renderer::begin(const Camera *c) +{ + end(); + if(c) + set_camera(*c); +} + +void Renderer::set_camera(const Camera &c) +{ + state->camera = &c; + standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix()); + changed |= STANDARD_SHDATA|LEGACY_PROJECTION; + set_matrix(state->camera->get_view_matrix()); +} + +void Renderer::set_matrix(const Matrix &matrix) +{ + state->modelview_matrix = matrix; + changed |= MATRIX; +} + +void Renderer::transform(const Matrix &matrix) +{ + state->modelview_matrix *= matrix; + changed |= MATRIX; +} + void Renderer::set_texture(const Texture *t) { state->texture = t; @@ -70,15 +88,31 @@ 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) { state->lighting = l; - state->lighting_matrix = mtx_stack.top(); + state->lighting_matrix = state->modelview_matrix; if(l) - l->update_shader_data(standard_shdata, mtx_stack.top()); - lighting_changed = true; + { + l->update_shader_data(standard_shdata, state->lighting_matrix); + changed |= STANDARD_SHDATA; + } + changed |= LEGACY_LIGHTING; +} + +void Renderer::set_clipping(const Clipping *c) +{ + state->clipping = c; + state->clipping_matrix = state->modelview_matrix; + if(c) + { + c->update_shader_data(standard_shdata, state->clipping_matrix); + changed |= STANDARD_SHDATA; + } + changed |= LEGACY_CLIPPING; } void Renderer::set_shader_program(const Program *p, const ProgramData *d) @@ -86,17 +120,20 @@ 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; + if(state->shdata_countshdata_count]==&d) + ++state->shdata_count; + else + { + if(shdata_stack.size()>state->shdata_count) + shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end()); + shdata_stack.push_back(&d); + state->shdata_count = shdata_stack.size(); + changed |= SHADER_DATA; + } } void Renderer::set_mesh(const Mesh *m) @@ -104,11 +141,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; @@ -123,7 +155,6 @@ void Renderer::push_state() { state_stack.push_back(state_stack.back()); state = &state_stack.back(); - mtx_stack.push(); } void Renderer::pop_state() @@ -131,20 +162,42 @@ void Renderer::pop_state() if(state_stack.size()==1) throw stack_underflow("Renderer::pop_state"); + const Camera *old_camera = state->camera; + 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()); - mtx_stack.pop(); - mtx_changed = true; - shdata_changed = true; -} - -void Renderer::escape() -{ - apply_state(); - Buffer::unbind_from(ELEMENT_ARRAY_BUFFER); - matrices_loaded = false; + changed |= MATRIX; + bool camera_changed = (state->camera!=old_camera); + if(camera_changed) + { + if(state->camera) + standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix()); + else + standard_shdata.uniform("projection_matrix", Matrix()); + changed |= STANDARD_SHDATA|LEGACY_PROJECTION; + } + /* This actually should compare the relevant matrices rather than check for + camera, but in practice lighting and clipping is set right after the camera + and a boolean check is much faster than matrix comparison. */ + if(state->lighting!=old_lighting || camera_changed) + { + if(state->lighting) + { + state->lighting->update_shader_data(standard_shdata, state->lighting_matrix); + changed |= STANDARD_SHDATA; + } + changed |= LEGACY_LIGHTING; + } + if(state->clipping!=old_clipping || camera_changed) + { + if(state->clipping) + { + state->clipping->update_shader_data(standard_shdata, state->clipping_matrix); + changed |= STANDARD_SHDATA; + } + changed |= LEGACY_CLIPPING; + } } void Renderer::end() @@ -152,23 +205,26 @@ void Renderer::end() if(state_stack.size()>1) throw invalid_operation("Renderer::end"); - if(matrices_loaded) - { - if(camera) - MatrixStack::projection().pop(); - MatrixStack::modelview().pop(); - } + *state = State(); + shdata_stack.clear(); + excluded.clear(); 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(); + if(matrices_loaded) + { + MatrixStack::projection().pop(); + MatrixStack::modelview().pop(); + matrices_loaded = false; + } } void Renderer::exclude(const Renderable &renderable) @@ -192,10 +248,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 +284,74 @@ 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) + { + standard_shdata.uniform("eye_obj_matrix", state->modelview_matrix); + LinAl::SquareMatrix nm = state->modelview_matrix.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) || shprog_changed)) + { state->material->get_shader_data().apply(); - standard_shdata.apply(); + changed &= ~MATERIAL_SHDATA; + } + + if((changed&STANDARD_SHDATA) || shprog_changed) + { + standard_shdata.apply(); + changed &= ~STANDARD_SHDATA; + } } - if(shdata_changed) + bool extra_shdata = (shdata_stack.size()>state->shdata_count); + + if((changed&SHADER_DATA) || shprog_changed || extra_shdata) { + if(extra_shdata) + shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end()); for(vector::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i) (*i)->apply(); - shdata_changed = false; + changed &= ~SHADER_DATA; } } else @@ -299,29 +385,33 @@ void Renderer::apply_state() if(!matrices_loaded) { MatrixStack::modelview().push(); - if(camera) - { - MatrixStack::projection().push(); - camera->apply(); - } + MatrixStack::projection().push(); matrices_loaded = true; } - if(mtx_changed) + if(changed&LEGACY_PROJECTION) + { + MatrixStack::projection() = state->camera->get_projection_matrix(); + changed &= ~LEGACY_PROJECTION; + } + + if(changed&LEGACY_MATRIX) { - MatrixStack::modelview() = mtx_stack.top(); - mtx_changed = false; + MatrixStack::modelview() = state->modelview_matrix; + changed &= ~LEGACY_MATRIX; } } } Renderer::State::State(): + camera(0), texture(0), texturing(0), lowest_effect_texunit(TexUnit::get_n_units()), material(0), lighting(0), + clipping(0), shprog(0), shdata_count(0), mesh(0), @@ -329,15 +419,5 @@ Renderer::State::State(): reverse_winding(false) { } - -Renderer::MtxStack::MtxStack(Renderer &r): - renderer(r) -{ } - -void Renderer::MtxStack::update() -{ - renderer.mtx_changed = true; -} - } // namespace GL } // namespace Msp