X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderer.cpp;h=53a3f45237463e5fffed3e084805326453e5fd3a;hp=c8972934cb304d34b22ed3a2f68147c7b7d74c48;hb=f50822b9e73a6ecdacbc4af4c4d9aba435a72386;hpb=6a045019fbd68738b77849629e6dfd3dfd9a4d93 diff --git a/source/renderer.cpp b/source/renderer.cpp index c8972934..53a3f452 100644 --- a/source/renderer.cpp +++ b/source/renderer.cpp @@ -14,6 +14,7 @@ #include "texturing.h" #include "texunit.h" #include "vertexarray.h" +#include "vertexsetup.h" #include "windingtest.h" using namespace std; @@ -22,9 +23,9 @@ namespace Msp { namespace GL { Renderer::Renderer(const Camera *c): + default_camera(c), changed(0), matrices_loaded(false), - shdata_applied(0), state_stack(1) { state_stack.reserve(16); @@ -33,6 +34,11 @@ Renderer::Renderer(const Camera *c): if(c) set_camera(*c); + else + { + standard_shdata.uniform("projection_matrix", Matrix()); + standard_shdata.uniform("eye_world_matrix", Matrix()); + } } Renderer::~Renderer() @@ -51,6 +57,7 @@ void Renderer::set_camera(const Camera &c) { state->camera = &c; standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix()); + standard_shdata.uniform("eye_world_matrix", state->camera->get_view_matrix()); changed |= STANDARD_SHDATA|LEGACY_PROJECTION; set_matrix(state->camera->get_view_matrix()); } @@ -123,9 +130,16 @@ void Renderer::set_shader_program(const Program *p, const ProgramData *d) void Renderer::add_shader_data(const ProgramData &d) { - shdata_stack.push_back(&d); - state->shdata_count = shdata_stack.size(); - changed |= SHADER_DATA; + 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) @@ -133,6 +147,11 @@ void Renderer::set_mesh(const Mesh *m) state->mesh = m; } +void Renderer::set_vertex_setup(const VertexSetup *vs) +{ + state->vertex_setup = vs; +} + void Renderer::set_winding_test(const WindingTest *w) { state->winding_test = w; @@ -159,17 +178,20 @@ void Renderer::pop_state() 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()); changed |= MATRIX; bool camera_changed = (state->camera!=old_camera); if(camera_changed) { - standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix()); + if(state->camera) + { + standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix()); + standard_shdata.uniform("eye_world_matrix", state->camera->get_view_matrix()); + } + else + { + standard_shdata.uniform("projection_matrix", Matrix()); + standard_shdata.uniform("eye_world_matrix", Matrix()); + } changed |= STANDARD_SHDATA|LEGACY_PROJECTION; } /* This actually should compare the relevant matrices rather than check for @@ -201,6 +223,10 @@ void Renderer::end() throw invalid_operation("Renderer::end"); *state = State(); + if(default_camera) + set_camera(*default_camera); + else + standard_shdata.uniform("projection_matrix", Matrix()); shdata_stack.clear(); excluded.clear(); @@ -211,6 +237,7 @@ void Renderer::end() Lighting::unbind(); Clipping::unbind(); Program::unbind(); + VertexSetup::unbind(); Buffer::unbind_from(ELEMENT_ARRAY_BUFFER); WindingTest::unbind(); @@ -242,15 +269,6 @@ void Renderer::draw(const Batch &batch) { apply_state(); - bool legacy_bindings = (!state->shprog || state->shprog->uses_legacy_variables()); - if(state->mesh && legacy_bindings) - { - if(const Buffer *ibuf = state->mesh->get_index_buffer()) - ibuf->bind_to(ELEMENT_ARRAY_BUFFER); - else - Buffer::unbind_from(ELEMENT_ARRAY_BUFFER); - } - batch.draw(); } @@ -260,14 +278,15 @@ void Renderer::apply_state() changed */ bool legacy_bindings = (!state->shprog || state->shprog->uses_legacy_variables()); + bool legacy_textures = !state->shprog; if(state->texturing) - state->texturing->bind(); + state->texturing->bind(legacy_textures); else { Texturing::unbind(); if(state->texture) - state->texture->bind_to(0); + state->texture->bind_to(0, legacy_textures); else Texture::unbind_from(0); } @@ -325,28 +344,28 @@ void Renderer::apply_state() changed = (changed&~MODERN_MATRIX)|STANDARD_SHDATA; } - if(state->material && (changed&MATERIAL_SHDATA)) + if(state->material && ((changed&MATERIAL_SHDATA) || shprog_changed)) { state->material->get_shader_data().apply(); changed &= ~MATERIAL_SHDATA; } - if(changed&STANDARD_SHDATA) + if((changed&STANDARD_SHDATA) || shprog_changed) { standard_shdata.apply(); changed &= ~STANDARD_SHDATA; } } - if((changed&SHADER_DATA) || shprog_changed) + bool extra_shdata = (shdata_stack.size()>state->shdata_count); + + if((changed&SHADER_DATA) || shprog_changed || extra_shdata) { - vector::const_iterator i = shdata_stack.begin(); - if(!shprog_changed) - i += shdata_applied; - for(; i!=shdata_stack.end(); ++i) + 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(); changed &= ~SHADER_DATA; - shdata_applied = shdata_stack.size(); } } else @@ -358,13 +377,24 @@ void Renderer::apply_state() { Mesh::unbind(); state->mesh->get_vertices().apply(); + if(const Buffer *ibuf = state->mesh->get_index_buffer()) + ibuf->bind_to(ELEMENT_ARRAY_BUFFER); + else + Buffer::unbind_from(ELEMENT_ARRAY_BUFFER); } else state->mesh->bind(); } else + { Mesh::unbind(); + if(state->vertex_setup) + state->vertex_setup->bind(); + else + VertexSetup::unbind(); + } + if(state->winding_test) { if(state->reverse_winding) @@ -410,6 +440,7 @@ Renderer::State::State(): shprog(0), shdata_count(0), mesh(0), + vertex_setup(0), winding_test(0), reverse_winding(false) { }