X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderer.cpp;h=53a3f45237463e5fffed3e084805326453e5fd3a;hp=76ac5846f2aad1e9417780e39d87f3c816a81088;hb=f50822b9e73a6ecdacbc4af4c4d9aba435a72386;hpb=5b71f1bf0d152486c0f6fe03c853992c57530369

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 76ac5846..53a3f452 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -14,6 +14,7 @@
 #include "texturing.h"
 #include "texunit.h"
 #include "vertexarray.h"
+#include "vertexsetup.h"
 #include "windingtest.h"
 
 using namespace std;
@@ -22,6 +23,7 @@ namespace Msp {
 namespace GL {
 
 Renderer::Renderer(const Camera *c):
+	default_camera(c),
 	changed(0),
 	matrices_loaded(false),
 	state_stack(1)
@@ -33,7 +35,10 @@ Renderer::Renderer(const Camera *c):
 	if(c)
 		set_camera(*c);
 	else
+	{
 		standard_shdata.uniform("projection_matrix", Matrix());
+		standard_shdata.uniform("eye_world_matrix", Matrix());
+	}
 }
 
 Renderer::~Renderer()
@@ -52,6 +57,7 @@ void Renderer::set_camera(const Camera &c)
 {
 	state->camera = &c;
 	standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
+	standard_shdata.uniform("eye_world_matrix", state->camera->get_view_matrix());
 	changed |= STANDARD_SHDATA|LEGACY_PROJECTION;
 	set_matrix(state->camera->get_view_matrix());
 }
@@ -141,6 +147,11 @@ void Renderer::set_mesh(const Mesh *m)
 	state->mesh = m;
 }
 
+void Renderer::set_vertex_setup(const VertexSetup *vs)
+{
+	state->vertex_setup = vs;
+}
+
 void Renderer::set_winding_test(const WindingTest *w)
 {
 	state->winding_test = w;
@@ -172,9 +183,15 @@ void Renderer::pop_state()
 	if(camera_changed)
 	{
 		if(state->camera)
+		{
 			standard_shdata.uniform("projection_matrix", state->camera->get_projection_matrix());
+			standard_shdata.uniform("eye_world_matrix", state->camera->get_view_matrix());
+		}
 		else
+		{
 			standard_shdata.uniform("projection_matrix", Matrix());
+			standard_shdata.uniform("eye_world_matrix", Matrix());
+		}
 		changed |= STANDARD_SHDATA|LEGACY_PROJECTION;
 	}
 	/* This actually should compare the relevant matrices rather than check for
@@ -206,6 +223,10 @@ void Renderer::end()
 		throw invalid_operation("Renderer::end");
 
 	*state = State();
+	if(default_camera)
+		set_camera(*default_camera);
+	else
+		standard_shdata.uniform("projection_matrix", Matrix());
 	shdata_stack.clear();
 	excluded.clear();
 
@@ -216,6 +237,7 @@ void Renderer::end()
 	Lighting::unbind();
 	Clipping::unbind();
 	Program::unbind();
+	VertexSetup::unbind();
 	Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
 	WindingTest::unbind();
 
@@ -247,15 +269,6 @@ void Renderer::draw(const Batch &batch)
 {
 	apply_state();
 
-	bool legacy_bindings = (!state->shprog || state->shprog->uses_legacy_variables());
-	if(state->mesh && legacy_bindings)
-	{
-		if(const Buffer *ibuf = state->mesh->get_index_buffer())
-			ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
-		else
-			Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
-	}
-
 	batch.draw();
 }
 
@@ -265,14 +278,15 @@ void Renderer::apply_state()
 	changed */
 
 	bool legacy_bindings = (!state->shprog || state->shprog->uses_legacy_variables());
+	bool legacy_textures = !state->shprog;
 
 	if(state->texturing)
-		state->texturing->bind();
+		state->texturing->bind(legacy_textures);
 	else
 	{
 		Texturing::unbind();
 		if(state->texture)
-			state->texture->bind_to(0);
+			state->texture->bind_to(0, legacy_textures);
 		else
 			Texture::unbind_from(0);
 	}
@@ -363,13 +377,24 @@ void Renderer::apply_state()
 		{
 			Mesh::unbind();
 			state->mesh->get_vertices().apply();
+			if(const Buffer *ibuf = state->mesh->get_index_buffer())
+				ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
+			else
+				Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
 		}
 		else
 			state->mesh->bind();
 	}
 	else
+	{
 		Mesh::unbind();
 
+		if(state->vertex_setup)
+			state->vertex_setup->bind();
+		else
+			VertexSetup::unbind();
+	}
+
 	if(state->winding_test)
 	{
 		if(state->reverse_winding)
@@ -415,6 +440,7 @@ Renderer::State::State():
 	shprog(0),
 	shdata_count(0),
 	mesh(0),
+	vertex_setup(0),
 	winding_test(0),
 	reverse_winding(false)
 { }