#include "batch.h"
#include "buffer.h"
#include "camera.h"
+#include "clipping.h"
#include "error.h"
#include "lighting.h"
#include "material.h"
namespace GL {
Renderer::Renderer(const Camera *c):
- mtx_stack(*this),
changed(0),
matrices_loaded(false),
shdata_applied(0),
- camera(0),
state_stack(1)
{
state_stack.reserve(16);
reset_state();
excluded.clear();
- camera = c;
- if(camera)
- {
- mtx_stack.load(camera->get_matrix());
- standard_shdata.uniform("projection_matrix", camera->get_projection_matrix());
- }
- else
- {
- mtx_stack.load(MatrixStack::modelview().top());
- standard_shdata.uniform("projection_matrix", MatrixStack::projection().top());
- }
+ 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)
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());
- changed |= LIGHTING;
+ {
+ 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)
{
state_stack.push_back(state_stack.back());
state = &state_stack.back();
- mtx_stack.push();
}
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)
changed |= SHADER_DATA;
}
shdata_applied = min<unsigned>(shdata_applied, shdata_stack.size());
- mtx_stack.pop();
changed |= MATRIX;
+ if(state->camera!=old_camera)
+ {
+ standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
+ changed |= STANDARD_SHDATA|LEGACY_PROJECTION;
+ }
if(state->lighting!=old_lighting)
{
if(state->lighting)
+ {
state->lighting->update_shader_data(standard_shdata, state->lighting_matrix);
- changed |= LIGHTING;
+ changed |= STANDARD_SHDATA;
+ }
+ changed |= LEGACY_LIGHTING;
+ }
+ if(state->clipping!=old_clipping)
+ {
+ if(state->clipping)
+ {
+ state->clipping->update_shader_data(standard_shdata, state->clipping_matrix);
+ changed |= STANDARD_SHDATA;
+ }
+ changed |= LEGACY_CLIPPING;
}
}
Texture::unbind_from(0);
Material::unbind();
Lighting::unbind();
+ Clipping::unbind();
Program::unbind();
Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
WindingTest::unbind();
else
Material::unbind();
- if(changed&LIGHTING)
+ if(changed&LEGACY_LIGHTING)
{
if(state->lighting)
{
MatrixStack::modelview() = state->lighting_matrix;
state->lighting->bind();
- changed = (changed&~LIGHTING)|LEGACY_MATRIX;
+ 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());
{
if(changed&MODERN_MATRIX)
{
- const Matrix &m = mtx_stack.top();
- standard_shdata.uniform("eye_obj_matrix", mtx_stack.top());
- LinAl::SquareMatrix<float, 3> nm = m.block<3, 3>(0, 0);
+ 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 &= ~MODERN_MATRIX;
+ changed = (changed&~MODERN_MATRIX)|STANDARD_SHDATA;
}
- if(state->material)
+ 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((changed&SHADER_DATA) || shprog_changed)
if(!matrices_loaded)
{
MatrixStack::modelview().push();
- if(camera)
- {
- MatrixStack::projection().push();
- camera->apply();
- }
+ MatrixStack::projection().push();
matrices_loaded = true;
}
+ if(changed&LEGACY_PROJECTION)
+ {
+ MatrixStack::projection() = state->camera->get_projection_matrix();
+ changed &= ~LEGACY_PROJECTION;
+ }
+
if(changed&LEGACY_MATRIX)
{
- MatrixStack::modelview() = mtx_stack.top();
+ 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),
reverse_winding(false)
{ }
-
-Renderer::MtxStack::MtxStack(Renderer &r):
- renderer(r)
-{ }
-
-void Renderer::MtxStack::update()
-{
- renderer.changed |= MATRIX;
-}
-
} // namespace GL
} // namespace Msp