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

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 36685b47..8199d3a6 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -24,7 +24,6 @@ Renderer::Renderer(const Camera *c):
 	camera(c),
 	state_stack(1),
 	lighting_changed(false),
-	vertex_array(0),
 	element_buffer(0)
 {
 	state_stack.reserve(16);
@@ -51,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();
@@ -98,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;
@@ -163,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