X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=7389298a0ebe3c8db298ab72154a83d4aa949c7a;hb=45de0062950ad822ed0379ed4fe807d333e1b8f1;hp=5d0bf6b8dab2bf78b995ff18584bc0351902fc01;hpb=82282de52e8e8f3bbafefaf92bf76f53f2c2495e;p=libs%2Fgl.git

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 5d0bf6b8..7389298a 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -43,9 +43,6 @@ void Renderer::init()
 	state_stack.push_back(State());
 	shdata_stack.reserve(32);
 	state = &state_stack.back();
-
-	standard_shdata.uniform("clip_eye_matrix", Matrix());
-	standard_shdata.uniform("eye_world_matrix", Matrix());
 }
 
 Renderer::~Renderer()
@@ -56,9 +53,7 @@ Renderer::~Renderer()
 void Renderer::set_camera(const Camera &c)
 {
 	state->camera = &c;
-	standard_shdata.uniform("clip_eye_matrix", state->camera->get_projection_matrix());
-	standard_shdata.uniform("eye_world_matrix", state->camera->get_view_matrix());
-	changed |= STANDARD_SHDATA;
+	changed |= CAMERA_SHDATA;
 	set_matrix(Matrix());
 }
 
@@ -152,28 +147,20 @@ unsigned Renderer::allocate_effect_texunit()
 
 void Renderer::set_material(const Material *m)
 {
-	state->material = m;
-	changed |= MATERIAL_SHDATA;
+	if(m)
+		add_shader_data(m->get_shader_data());
 }
 
 void Renderer::set_lighting(const Lighting *l)
 {
-	state->lighting = l;
 	if(l)
-	{
-		l->update_shader_data(standard_shdata, Matrix());
-		changed |= STANDARD_SHDATA;
-	}
+		add_shader_data(l->get_shader_data());
 }
 
 void Renderer::set_clipping(const Clipping *c)
 {
 	state->clipping = c;
-	if(c)
-	{
-		c->update_shader_data(standard_shdata, Matrix());
-		changed |= STANDARD_SHDATA;
-	}
+	changed |= CLIPPING_SHDATA;
 }
 
 void Renderer::set_shader_program(const Program *p, const ProgramData *d)
@@ -239,42 +226,15 @@ void Renderer::pop_state()
 		throw stack_underflow("Renderer::pop_state");
 
 	const Camera *old_camera = state->camera;
-	const Lighting *old_lighting = state->lighting;
 	const Clipping *old_clipping = state->clipping;
 	state_stack.pop_back();
 	state = &state_stack.back();
 	changed |= MATRIX;
 	bool camera_changed = (state->camera!=old_camera);
 	if(camera_changed)
-	{
-		if(state->camera)
-		{
-			standard_shdata.uniform("clip_eye_matrix", state->camera->get_projection_matrix());
-			standard_shdata.uniform("eye_world_matrix", state->camera->get_view_matrix());
-		}
-		else
-		{
-			standard_shdata.uniform("clip_eye_matrix", Matrix());
-			standard_shdata.uniform("eye_world_matrix", Matrix());
-		}
-		changed |= STANDARD_SHDATA;
-	}
-	if(state->lighting!=old_lighting)
-	{
-		if(state->lighting)
-		{
-			state->lighting->update_shader_data(standard_shdata, Matrix());
-			changed |= STANDARD_SHDATA;
-		}
-	}
+		changed |= CAMERA_SHDATA;
 	if(state->clipping!=old_clipping)
-	{
-		if(state->clipping)
-		{
-			state->clipping->update_shader_data(standard_shdata, Matrix());
-			changed |= STANDARD_SHDATA;
-		}
-	}
+		changed |= CLIPPING_SHDATA;
 }
 
 void Renderer::end()
@@ -285,8 +245,6 @@ void Renderer::end()
 	*state = State();
 	if(default_camera)
 		set_camera(*default_camera);
-	else
-		standard_shdata.uniform("clip_eye_matrix", Matrix());
 	shdata_stack.clear();
 	excluded.clear();
 
@@ -374,10 +332,16 @@ void Renderer::apply_state()
 		changed = (changed&~MATRIX)|STANDARD_SHDATA;
 	}
 
-	if(state->material && ((changed&MATERIAL_SHDATA) || shprog_changed))
+	if(state->camera && ((changed&CAMERA_SHDATA) || shprog_changed))
+	{
+		state->camera->get_shader_data().apply();
+		changed &= ~CAMERA_SHDATA;
+	}
+
+	if(state->clipping && ((changed&CLIPPING_SHDATA) || shprog_changed))
 	{
-		state->material->get_shader_data().apply();
-		changed &= ~MATERIAL_SHDATA;
+		state->clipping->get_shader_data().apply();
+		changed &= ~CLIPPING_SHDATA;
 	}
 
 	if((changed&STANDARD_SHDATA) || shprog_changed)
@@ -438,8 +402,6 @@ Renderer::State::State():
 	camera(0),
 	texture_count(0),
 	lowest_effect_texunit(TexUnit::get_n_units()),
-	material(0),
-	lighting(0),
 	clipping(0),
 	shprog(0),
 	shdata_count(0),