X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=8199d3a64dc4056c3e621a3cc46b909c5d1d0f66;hb=8aea0f65f9ab7d603e47cf4479388af246cc8400;hp=442728135274576129ff0da16c82531ae9837b07;hpb=d108cd5fc13aca16e38b54c1946c65797a869073;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 44272813..8199d3a6 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -2,6 +2,7 @@
 #include "buffer.h"
 #include "camera.h"
 #include "error.h"
+#include "lighting.h"
 #include "material.h"
 #include "program.h"
 #include "programdata.h"
@@ -22,7 +23,7 @@ Renderer::Renderer(const Camera *c):
 	mtx_changed(false),
 	camera(c),
 	state_stack(1),
-	vertex_array(0),
+	lighting_changed(false),
 	element_buffer(0)
 {
 	state_stack.reserve(16);
@@ -49,6 +50,7 @@ Renderer::~Renderer()
 	Texturing::unbind();
 	Texture::unbind_from(0);
 	Material::unbind();
+	Lighting::unbind();
 	Program::unbind();
 	Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
 	WindingTest::unbind();
@@ -71,6 +73,13 @@ 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();
+	lighting_changed = true;
+}
+
 void Renderer::set_shader_program(const Program *p, const ProgramData *d)
 {
 	state->shprog = p;
@@ -89,11 +98,6 @@ void Renderer::add_shader_data(const ProgramData &d)
 	shdata_changed = true;
 }
 
-void Renderer::set_vertex_array(const VertexArray *a)
-{
-	vertex_array = a;
-}
-
 void Renderer::set_element_buffer(const Buffer *b)
 {
 	element_buffer = b;
@@ -104,6 +108,11 @@ 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());
@@ -149,13 +158,8 @@ 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();
 
-	vertex_array->apply();
-
 	if(element_buffer)
 		element_buffer->bind_to(ELEMENT_ARRAY_BUFFER);
 	else
@@ -166,7 +170,8 @@ void Renderer::draw(const Batch &batch)
 
 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 */
 
 	if(state->texturing)
 		state->texturing->bind();
@@ -184,6 +189,19 @@ void Renderer::apply_state()
 	else
 		Material::unbind();
 
+	if(lighting_changed)
+	{
+		if(state->lighting)
+		{
+			MatrixStack::modelview() = state->lighting_matrix;
+			state->lighting->bind();
+			mtx_changed = true;
+			lighting_changed = false;
+		}
+		else
+			Lighting::unbind();
+	}
+
 	if(state->shprog)
 	{
 		state->shprog->bind();
@@ -198,7 +216,12 @@ void Renderer::apply_state()
 		Program::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();
 
@@ -214,6 +237,7 @@ Renderer::State::State():
 	texture(0),
 	texturing(0),
 	material(0),
+	lighting(0),
 	shprog(0),
 	shdata_count(0),
 	winding_test(0)