Remove the deprecated ProgramBuilder class

[libs/gl.git] / source / renderer.cpp

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 302d943727a2812e66bd6b85f748f398117bd4d9..416a0fc89ced4827147982f234ca009fb94576c0 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -5,11 +5,11 @@
 #include "error.h"
 #include "lighting.h"
 #include "material.h"
-#include "mesh.h"
 #include "program.h"
 #include "programdata.h"
 #include "renderable.h"
 #include "renderer.h"
+#include "sampler.h"
 #include "texture.h"
 #include "texturing.h"
 #include "texunit.h"
@@ -22,34 +22,35 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+Renderer::Renderer():
+       default_camera(0)
+{
+       init();
+}
+
 Renderer::Renderer(const Camera *c):
-       default_camera(c),
-       changed(0),
-       state_stack(1)
+       default_camera(c)
 {
-       state_stack.reserve(16);
-       shdata_stack.reserve(32);
-       state = &state_stack.back();
+       init();
 
        if(c)
                set_camera(*c);
-       else
-       {
-               standard_shdata.uniform("projection_matrix", Matrix());
-               standard_shdata.uniform("eye_world_matrix", Matrix());
-       }
 }
 
-Renderer::~Renderer()
+void Renderer::init()
 {
-       end();
+       state_stack.reserve(16);
+       state_stack.push_back(State());
+       shdata_stack.reserve(32);
+       state = &state_stack.back();
+
+       standard_shdata.uniform("projection_matrix", Matrix());
+       standard_shdata.uniform("eye_world_matrix", Matrix());
 }
 
-void Renderer::begin(const Camera *c)
+Renderer::~Renderer()
 {
        end();
-       if(c)
-               set_camera(*c);
 }
 
 void Renderer::set_camera(const Camera &c)
@@ -73,9 +74,10 @@ void Renderer::transform(const Matrix &matrix)
        changed |= MATRIX;
 }
 
-void Renderer::set_texture(const Texture *t)
+void Renderer::set_texture(const Texture *t, const Sampler *s)
 {
        state->texture = t;
+       state->sampler = s;
        state->texturing = 0;
 }
 
@@ -83,6 +85,7 @@ void Renderer::set_texturing(const Texturing *t)
 {
        state->texturing = t;
        state->texture = 0;
+       state->sampler = 0;
 }
 
 unsigned Renderer::allocate_effect_texunit()
@@ -144,11 +147,6 @@ void Renderer::flush_shader_data()
                shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
 }
 
-void Renderer::set_mesh(const Mesh *m)
-{
-       state->mesh = m;
-}
-
 void Renderer::set_vertex_setup(const VertexSetup *vs)
 {
        state->vertex_setup = vs;
@@ -235,7 +233,6 @@ void Renderer::end()
        shdata_stack.clear();
        excluded.clear();
 
-       Mesh::unbind();
        Texturing::unbind();
        Texture::unbind_from(0);
        Clipping::unbind();
@@ -277,6 +274,9 @@ void Renderer::draw_instanced(const Batch &batch, unsigned count)
 
 void Renderer::apply_state()
 {
+       if(!state->shprog)
+               throw invalid_operation("Renderer::apply_state");
+
        /* We (mostly) let the objects themselves figure out if the binding has
        changed */
 
@@ -286,7 +286,13 @@ void Renderer::apply_state()
        {
                Texturing::unbind();
                if(state->texture)
+               {
+                       if(state->sampler)
+                               state->sampler->bind_to(0);
+                       else
+                               Sampler::unbind_from(0);
                        state->texture->bind_to(0);
+               }
                else
                        Texture::unbind_from(0);
        }
@@ -296,57 +302,45 @@ void Renderer::apply_state()
        else
                Clipping::unbind();
 
-       if(state->shprog)
-       {
-               bool shprog_changed = (state->shprog!=Program::current());
-               state->shprog->bind();
+       bool shprog_changed = (state->shprog!=Program::current());
+       state->shprog->bind();
 
-               if(changed&MATRIX)
-               {
-                       standard_shdata.uniform("eye_obj_matrix", state->modelview_matrix);
-                       LinAl::SquareMatrix<float, 3> 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&~MATRIX)|STANDARD_SHDATA;
-               }
+       if(changed&MATRIX)
+       {
+               standard_shdata.uniform("eye_obj_matrix", state->modelview_matrix);
+               LinAl::SquareMatrix<float, 3> 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&~MATRIX)|STANDARD_SHDATA;
+       }
 
-               if(state->material && ((changed&MATERIAL_SHDATA) || shprog_changed))
-               {
-                       state->material->get_shader_data().apply();
-                       changed &= ~MATERIAL_SHDATA;
-               }
+       if(state->material && ((changed&MATERIAL_SHDATA) || shprog_changed))
+       {
+               state->material->get_shader_data().apply();
+               changed &= ~MATERIAL_SHDATA;
+       }
 
-               if((changed&STANDARD_SHDATA) || shprog_changed)
-               {
-                       standard_shdata.apply();
-                       changed &= ~STANDARD_SHDATA;
-               }
+       if((changed&STANDARD_SHDATA) || shprog_changed)
+       {
+               standard_shdata.apply();
+               changed &= ~STANDARD_SHDATA;
+       }
 
-               bool extra_shdata = (shdata_stack.size()>state->shdata_count);
+       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 ProgramData *>::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i)
-                               (*i)->apply();
-                       changed &= ~SHADER_DATA;
-               }
+       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 ProgramData *>::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i)
+                       (*i)->apply();
+               changed &= ~SHADER_DATA;
        }
-       else
-               Program::unbind();
 
-       if(state->mesh)
-               state->mesh->bind();
+       if(state->vertex_setup)
+               state->vertex_setup->bind();
        else
-       {
-               Mesh::unbind();
-
-               if(state->vertex_setup)
-                       state->vertex_setup->bind();
-               else
-                       VertexSetup::unbind();
-       }
+               VertexSetup::unbind();
 
        if(state->winding_test)
        {
@@ -370,7 +364,6 @@ Renderer::State::State():
        clipping(0),
        shprog(0),
        shdata_count(0),
-       mesh(0),
        vertex_setup(0),
        winding_test(0),
        reverse_winding(false),