X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderer.cpp;h=c5fe3c64a8baca0d39b7966d43edc61c3efa9be4;hp=e57967d9c46b227c5a9bad4da50c7af1320b1864;hb=HEAD;hpb=d4c9b1ef7ba7a60874ffa7ab2ac4b427a83910e5

diff --git a/source/renderer.cpp b/source/renderer.cpp
deleted file mode 100644
index e57967d9..00000000
--- a/source/renderer.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-#include "batch.h"
-#include "buffer.h"
-#include "camera.h"
-#include "clipping.h"
-#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 "texture.h"
-#include "texturing.h"
-#include "texunit.h"
-#include "vertexarray.h"
-#include "windingtest.h"
-
-using namespace std;
-
-namespace Msp {
-namespace GL {
-
-Renderer::Renderer(const Camera *c):
-	changed(0),
-	matrices_loaded(false),
-	shdata_applied(0),
-	state_stack(1)
-{
-	state_stack.reserve(16);
-	shdata_stack.reserve(32);
-	state = &state_stack.back();
-
-	if(c)
-		set_camera(*c);
-}
-
-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;
-	state->texturing = 0;
-}
-
-void Renderer::set_texturing(const Texturing *t)
-{
-	state->texturing = t;
-	state->texture = 0;
-}
-
-unsigned Renderer::allocate_effect_texunit()
-{
-	return --state->lowest_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 = state->modelview_matrix;
-	if(l)
-	{
-		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->shprog = p;
-	if(p && d)
-		add_shader_data(*d);
-}
-
-void Renderer::add_shader_data(const ProgramData &d)
-{
-	shdata_stack.push_back(&d);
-	state->shdata_count = shdata_stack.size();
-	changed |= SHADER_DATA;
-}
-
-void Renderer::set_mesh(const Mesh *m)
-{
-	state->mesh = m;
-}
-
-void Renderer::set_winding_test(const WindingTest *w)
-{
-	state->winding_test = w;
-}
-
-void Renderer::set_reverse_winding(bool r)
-{
-	state->reverse_winding = r;
-}
-
-void Renderer::push_state()
-{
-	state_stack.push_back(state_stack.back());
-	state = &state_stack.back();
-}
-
-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());
-		changed |= SHADER_DATA;
-	}
-	shdata_applied = min<unsigned>(shdata_applied, shdata_stack.size());
-	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 |= 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;
-	}
-}
-
-void Renderer::end()
-{
-	if(state_stack.size()>1)
-		throw invalid_operation("Renderer::end");
-
-	*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();
-
-	if(matrices_loaded)
-	{
-		MatrixStack::projection().pop();
-		MatrixStack::modelview().pop();
-		matrices_loaded = false;
-	}
-}
-
-void Renderer::exclude(const Renderable &renderable)
-{
-	excluded.insert(&renderable);
-}
-
-void Renderer::include(const Renderable &renderable)
-{
-	excluded.erase(&renderable);
-}
-
-void Renderer::render(const Renderable &renderable, const Tag &tag)
-{
-	if(!excluded.count(&renderable))
-		renderable.render(*this, tag);
-}
-
-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();
-}
-
-void Renderer::apply_state()
-{
-	/* We (mostly) let the objects themselves figure out if the binding has
-	changed */
-
-	bool legacy_bindings = (!state->shprog || state->shprog->uses_legacy_variables());
-
-	if(state->texturing)
-		state->texturing->bind();
-	else
-	{
-		Texturing::unbind();
-		if(state->texture)
-			state->texture->bind_to(0);
-		else
-			Texture::unbind_from(0);
-	}
-
-	if(legacy_bindings)
-	{
-		if(state->material)
-			state->material->bind();
-		else
-			Material::unbind();
-
-		if(changed&LEGACY_LIGHTING)
-		{
-			if(state->lighting)
-			{
-				MatrixStack::modelview() = state->lighting_matrix;
-				state->lighting->bind();
-				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)
-		{
-			if(changed&MODERN_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&~MODERN_MATRIX)|STANDARD_SHDATA;
-			}
-
-			if(state->material && (changed&MATERIAL_SHDATA))
-			{
-				state->material->get_shader_data().apply();
-				changed &= ~MATERIAL_SHDATA;
-			}
-
-			if(changed&STANDARD_SHDATA)
-			{
-				standard_shdata.apply();
-				changed &= ~STANDARD_SHDATA;
-			}
-		}
-
-		if((changed&SHADER_DATA) || shprog_changed)
-		{
-			vector<const ProgramData *>::const_iterator i = shdata_stack.begin();
-			if(!shprog_changed)
-				i += shdata_applied;
-			for(; i!=shdata_stack.end(); ++i)
-				(*i)->apply();
-			changed &= ~SHADER_DATA;
-			shdata_applied = shdata_stack.size();
-		}
-	}
-	else
-		Program::unbind();
-
-	if(state->mesh)
-	{
-		if(legacy_bindings)
-		{
-			Mesh::unbind();
-			state->mesh->get_vertices().apply();
-		}
-		else
-			state->mesh->bind();
-	}
-	else
-		Mesh::unbind();
-
-	if(state->winding_test)
-	{
-		if(state->reverse_winding)
-			state->winding_test->get_reverse().bind();
-		else
-			state->winding_test->bind();
-	}
-	else
-		WindingTest::unbind();
-
-	if(legacy_bindings)
-	{
-		if(!matrices_loaded)
-		{
-			MatrixStack::modelview().push();
-			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() = 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),
-	winding_test(0),
-	reverse_winding(false)
-{ }
-
-} // namespace GL
-} // namespace Msp