X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=bc49b0f802941f3ae2a7509ae86351dc51a67ca8;hb=c46c75f8e3863dc3c6f91a2d5dc7f58333ec9260;hp=6734edc4bd20458be56563bdddfd57a2589ab203;hpb=2e6a73a93eac0a18063ec675a24a8e6eeeb80a0c;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 6734edc4..bc49b0f8 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -2,13 +2,16 @@
 #include "buffer.h"
 #include "camera.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"
 
@@ -19,40 +22,43 @@ namespace GL {
 
 Renderer::Renderer(const Camera *c):
 	mtx_stack(*this),
-	mtx_changed(false),
-	camera(c),
-	state_stack(1),
-	vertex_array(0),
-	vertex_array_changed(false),
-	element_buffer(0)
+	changed(0),
+	matrices_loaded(false),
+	shdata_applied(0),
+	camera(0),
+	state_stack(1)
 {
 	state_stack.reserve(16);
 	shdata_stack.reserve(32);
 	state = &state_stack.back();
 
-	MatrixStack::modelview().push();
+	begin(c);
+}
+
+Renderer::~Renderer()
+{
+	end();
+}
+
+void Renderer::begin(const Camera *c)
+{
+	if(state_stack.size()>1)
+		throw invalid_operation("Renderer::begin");
+
+	reset_state();
+	excluded.clear();
+	camera = c;
+
 	if(camera)
 	{
-		MatrixStack::projection().push();
-		camera->apply();
 		mtx_stack.load(camera->get_matrix());
+		standard_shdata.uniform("projection_matrix", camera->get_projection_matrix());
 	}
 	else
+	{
 		mtx_stack.load(MatrixStack::modelview().top());
-}
-
-Renderer::~Renderer()
-{
-	if(camera)
-		MatrixStack::projection().pop();
-	MatrixStack::modelview().pop();
-
-	Texturing::unbind();
-	Texture::unbind_from(0);
-	Material::unbind();
-	Program::unbind();
-	Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
-	WindingTest::unbind();
+		standard_shdata.uniform("projection_matrix", MatrixStack::projection().top());
+	}
 }
 
 void Renderer::set_texture(const Texture *t)
@@ -67,43 +73,52 @@ void Renderer::set_texturing(const 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;
 }
 
+void Renderer::set_lighting(const Lighting *l)
+{
+	state->lighting = l;
+	state->lighting_matrix = mtx_stack.top();
+	if(l)
+		l->update_shader_data(standard_shdata, mtx_stack.top());
+	changed |= LIGHTING;
+}
+
 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;
+	changed |= SHADER_DATA;
 }
 
-void Renderer::set_vertex_array(const VertexArray *a)
+void Renderer::set_mesh(const Mesh *m)
 {
-	vertex_array_changed = (a!=vertex_array);
-	vertex_array = a;
+	state->mesh = m;
 }
 
-void Renderer::set_element_buffer(const Buffer *b)
+void Renderer::set_winding_test(const WindingTest *w)
 {
-	element_buffer = b;
+	state->winding_test = w;
 }
 
-void Renderer::set_winding_test(const WindingTest *w)
+void Renderer::set_reverse_winding(bool r)
 {
-	state->winding_test = w;
+	state->reverse_winding = r;
 }
 
 void Renderer::push_state()
@@ -118,19 +133,47 @@ void Renderer::pop_state()
 	if(state_stack.size()==1)
 		throw stack_underflow("Renderer::pop_state");
 
+	const Lighting *old_lighting = state->lighting;
 	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());
 	mtx_stack.pop();
-	mtx_changed = true;
-	shdata_changed = true;
+	changed |= MATRIX;
+	if(state->lighting!=old_lighting)
+	{
+		if(state->lighting)
+			state->lighting->update_shader_data(standard_shdata, state->lighting_matrix);
+		changed |= LIGHTING;
+	}
 }
 
 void Renderer::escape()
 {
 	apply_state();
 	Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
+	matrices_loaded = false;
+}
+
+void Renderer::end()
+{
+	if(state_stack.size()>1)
+		throw invalid_operation("Renderer::end");
+
+	reset_state();
+
+	Mesh::unbind();
+	Texturing::unbind();
+	Texture::unbind_from(0);
+	Material::unbind();
+	Lighting::unbind();
+	Program::unbind();
+	Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
+	WindingTest::unbind();
 }
 
 void Renderer::exclude(const Renderable &renderable)
@@ -151,29 +194,26 @@ void Renderer::render(const Renderable &renderable, const Tag &tag)
 
 void Renderer::draw(const Batch &batch)
 {
-	if(!vertex_array)
-		throw invalid_operation("Renderer::draw");
-
 	apply_state();
 
-	// Until VertexArray acquires VAO support and becomes Bindable
-	if(vertex_array_changed)
+	bool legacy_bindings = (!state->shprog || state->shprog->uses_legacy_variables());
+	if(state->mesh && legacy_bindings)
 	{
-		vertex_array->apply();
-		vertex_array_changed = false;
+		if(const Buffer *ibuf = state->mesh->get_index_buffer())
+			ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
+		else
+			Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
 	}
 
-	if(element_buffer)
-		element_buffer->bind_to(ELEMENT_ARRAY_BUFFER);
-	else
-		Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
-
 	batch.draw();
 }
 
 void Renderer::apply_state()
 {
-	// We let the objects themselves figure out if the binding has changed
+	/* 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();
@@ -186,44 +226,135 @@ void Renderer::apply_state()
 			Texture::unbind_from(0);
 	}
 
-	if(state->material)
-		state->material->bind();
-	else
-		Material::unbind();
+	if(legacy_bindings)
+	{
+		if(state->material)
+			state->material->bind();
+		else
+			Material::unbind();
+
+		if(changed&LIGHTING)
+		{
+			if(state->lighting)
+			{
+				MatrixStack::modelview() = state->lighting_matrix;
+				state->lighting->bind();
+				changed = (changed&~LIGHTING)|LEGACY_MATRIX;
+			}
+			else
+				Lighting::unbind();
+		}
+	}
 
 	if(state->shprog)
 	{
+		bool shprog_changed = (state->shprog!=Program::current());
 		state->shprog->bind();
-		if(shdata_changed)
+
+		if(!legacy_bindings)
 		{
-			for(vector<const ProgramData *>::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i)
+			if(changed&MODERN_MATRIX)
+			{
+				const Matrix &m = mtx_stack.top();
+				standard_shdata.uniform("eye_obj_matrix", mtx_stack.top());
+				LinAl::SquareMatrix<float, 3> 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));
+				changed &= ~MODERN_MATRIX;
+			}
+
+			if(state->material)
+				state->material->get_shader_data().apply();
+			standard_shdata.apply();
+		}
+
+		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();
-			shdata_changed = false;
+			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)
-		state->winding_test->bind();
+	{
+		if(state->reverse_winding)
+			state->winding_test->get_reverse().bind();
+		else
+			state->winding_test->bind();
+	}
 	else
 		WindingTest::unbind();
 
-	if(mtx_changed)
+	if(legacy_bindings)
 	{
-		MatrixStack::modelview() = mtx_stack.top();
-		mtx_changed = false;
+		if(!matrices_loaded)
+		{
+			MatrixStack::modelview().push();
+			if(camera)
+			{
+				MatrixStack::projection().push();
+				camera->apply();
+			}
+			matrices_loaded = true;
+		}
+
+		if(changed&LEGACY_MATRIX)
+		{
+			MatrixStack::modelview() = mtx_stack.top();
+			changed &= ~LEGACY_MATRIX;
+		}
 	}
 }
 
+void Renderer::reset_state()
+{
+	if(!matrices_loaded)
+		return;
+
+	if(camera)
+		MatrixStack::projection().pop();
+	MatrixStack::modelview().pop();
+	matrices_loaded = false;
+	changed |= MATRIX;
+
+	*state = State();
+}
+
 
 Renderer::State::State():
 	texture(0),
 	texturing(0),
+	lowest_effect_texunit(TexUnit::get_n_units()),
 	material(0),
+	lighting(0),
 	shprog(0),
 	shdata_count(0),
-	winding_test(0)
+	mesh(0),
+	winding_test(0),
+	reverse_winding(false)
 { }
 
 
@@ -233,7 +364,7 @@ Renderer::MtxStack::MtxStack(Renderer &r):
 
 void Renderer::MtxStack::update()
 {
-	renderer.mtx_changed = true;
+	renderer.changed |= MATRIX;
 }
 
 } // namespace GL