X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=d01a1f0c4156ba319ee8c6fadd0fc4ae3d58352d;hb=df20a7e137542a4156cc5ffa8118d59de6b68547;hp=302d943727a2812e66bd6b85f748f398117bd4d9;hpb=a40fc85277dba5c34402a0e703d038efd30cc57b;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 302d9437..d01a1f0c 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -5,7 +5,6 @@
 #include "error.h"
 #include "lighting.h"
 #include "material.h"
-#include "mesh.h"
 #include "program.h"
 #include "programdata.h"
 #include "renderable.h"
@@ -45,13 +44,6 @@ 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;
@@ -144,11 +136,6 @@ void Renderer::flush_shader_data()
 		shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
 }
 
-void Renderer::set_mesh(const Mesh *m)
-{
-	state->mesh = m;
-}
-
 void Renderer::set_vertex_setup(const VertexSetup *vs)
 {
 	state->vertex_setup = vs;
@@ -235,7 +222,6 @@ void Renderer::end()
 	shdata_stack.clear();
 	excluded.clear();
 
-	Mesh::unbind();
 	Texturing::unbind();
 	Texture::unbind_from(0);
 	Clipping::unbind();
@@ -336,17 +322,10 @@ void Renderer::apply_state()
 	else
 		Program::unbind();
 
-	if(state->mesh)
-		state->mesh->bind();
+	if(state->vertex_setup)
+		state->vertex_setup->bind();
 	else
-	{
-		Mesh::unbind();
-
-		if(state->vertex_setup)
-			state->vertex_setup->bind();
-		else
-			VertexSetup::unbind();
-	}
+		VertexSetup::unbind();
 
 	if(state->winding_test)
 	{
@@ -370,7 +349,6 @@ Renderer::State::State():
 	clipping(0),
 	shprog(0),
 	shdata_count(0),
-	mesh(0),
 	vertex_setup(0),
 	winding_test(0),
 	reverse_winding(false),