X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=8199d3a64dc4056c3e621a3cc46b909c5d1d0f66;hb=4d3d1511616a0ad4a91f8a068b49faf2b450c298;hp=3a44dcd3c0b21bd5afd1fac151405d6e0936f5d1;hpb=31f4e9f522ba3009cfa74467bec380a263eabf73;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 3a44dcd3..8199d3a6 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -23,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);
@@ -50,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();
@@ -97,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;
@@ -112,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());
@@ -157,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
@@ -220,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();