X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fshadowmap.cpp;fp=source%2Feffects%2Fshadowmap.cpp;h=ddb78aeb6ff5a3c07aa59cb07548604089b48e8d;hp=6b926dd897355b68b461299bb6f070207c552d86;hb=bdcae47bf2f4e49d2d9e4ba15e6f17171ce5fa0c;hpb=f853ca0a365ae8b43ba8b2f4d6f21cd1c2bd4bd5

diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index 6b926dd8..ddb78aeb 100644
--- a/source/effects/shadowmap.cpp
+++ b/source/effects/shadowmap.cpp
@@ -12,8 +12,8 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-ShadowMap::ShadowMap(unsigned w, unsigned h, Renderable &r, const Lighting *l):
-	Effect(r),
+ShadowMap::ShadowMap(unsigned w, unsigned h, Renderable &c, const Lighting *l):
+	Effect(c),
 	width(w),
 	height(h),
 	lighting(l),
@@ -38,10 +38,10 @@ ShadowMap::ShadowMap(unsigned w, unsigned h, Renderable &r, const Lighting *l):
 	shdata.uniform_array("shd_world_matrix", 1, &dummy_matrix);
 }
 
-ShadowMap::ShadowMap(unsigned s, Renderable &r, const DirectionalLight &l, Renderable &c):
-	ShadowMap(s, s, r, 0)
+ShadowMap::ShadowMap(unsigned s, Renderable &c, const DirectionalLight &l, Renderable &sc):
+	ShadowMap(s, s, c, 0)
 {
-	add_light(l, s, c);
+	add_light(l, s, sc);
 }
 
 ShadowMap::ShadowMap(unsigned w, unsigned h, Renderable &r, const Lighting &l):
@@ -183,7 +183,7 @@ void ShadowMap::setup_frame(Renderer &renderer)
 		return;
 
 	rendered = true;
-	renderable.setup_frame(renderer);
+	content.setup_frame(renderer);
 	for(const ShadowedLight &l: lights)
 		l.shadow_caster->setup_frame(renderer);
 
@@ -244,20 +244,20 @@ void ShadowMap::finish_frame()
 	if(rendered)
 	{
 		rendered = false;
-		renderable.finish_frame();
+		content.finish_frame();
 	}
 }
 
 void ShadowMap::render(Renderer &renderer, Tag tag) const
 {
 	if(!is_enabled_for_method(tag))
-		return renderable.render(renderer, tag);
+		return content.render(renderer, tag);
 
 	Renderer::Push _push_rend(renderer);
 
 	renderer.set_texture("shadow_map", &depth_buf, &sampler);
 	renderer.add_shader_data(shdata);
-	renderable.render(renderer, tag);
+	content.render(renderer, tag);
 }
 
 void ShadowMap::set_debug_name(const string &name)