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

diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index 6c49f79f..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);
 
@@ -235,7 +235,7 @@ void ShadowMap::setup_frame(Renderer &renderer)
 		renderer.set_scissor(&light.region);
 		renderer.set_camera(v.camera);
 
-		renderer.render(*light.shadow_caster, (v.face>0 ? "noclear" : ""));
+		light.shadow_caster->render(renderer, (v.face>0 ? "noclear" : ""));
 	}
 }
 
@@ -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(!enabled_methods.count(tag))
-		return renderer.render(renderable, tag);
+	if(!is_enabled_for_method(tag))
+		return content.render(renderer, tag);
 
 	Renderer::Push _push_rend(renderer);
 
 	renderer.set_texture("shadow_map", &depth_buf, &sampler);
 	renderer.add_shader_data(shdata);
-	renderer.render(renderable, tag);
+	content.render(renderer, tag);
 }
 
 void ShadowMap::set_debug_name(const string &name)
@@ -273,5 +273,89 @@ void ShadowMap::set_debug_name(const string &name)
 #endif
 }
 
+
+ShadowMap *ShadowMap::Template::create(const map<string, Renderable *> &renderables) const
+{
+	Renderable *content = get_item(renderables, content_name);
+	if(!content || !lighting)
+		throw invalid_operation("ShadowMap::Template::create");
+
+	RefPtr<ShadowMap> shadow_map = new ShadowMap(width, height, *content, *lighting);
+	shadow_map->set_target(target, radius);
+	shadow_map->set_depth_bias(depth_bias);
+	shadow_map->set_darkness(darkness);
+
+	for(const ShadowedLight &l: lights)
+	{
+		Renderable *shadow_caster = get_item(renderables, l.shadow_caster_name);
+		if(!l.light || !shadow_caster)
+			throw invalid_operation("ShadowMap::Template::create");
+		if(const DirectionalLight *dir_light = dynamic_cast<const DirectionalLight *>(l.light))
+			shadow_map->add_light(*dir_light, l.size, *shadow_caster);
+		else if(const PointLight *point_light = dynamic_cast<const PointLight *>(l.light))
+			shadow_map->add_light(*point_light, l.size, *shadow_caster);
+		else
+			throw invalid_operation("ShadowMap::Template::create");
+	}
+
+	return shadow_map.release();
+}
+
+
+DataFile::Loader::ActionMap ShadowMap::Template::Loader::shared_actions;
+
+ShadowMap::Template::Loader::Loader(Template &t, Collection &c):
+	DerivedObjectLoader<Template, Effect::Template::Loader>(t, c)
+{
+	set_actions(shared_actions);
+}
+
+void ShadowMap::Template::Loader::init_actions()
+{
+	Effect::Template::Loader::init_actions();
+	add("darkness", &Template::darkness);
+	add("depth_bias", &Template::depth_bias);
+	add("light", &Loader::light);
+	add("lighting", &Template::lighting);
+	add("radius", &Template::radius);
+	add("size", &Loader::size_square);
+	add("size", &Template::width, &Template::height);
+	add("target", &Loader::target);
+}
+
+void ShadowMap::Template::Loader::light(const string &name)
+{
+	ShadowedLight light;
+	light.light = &get_collection().get<Light>(name);
+	load_sub(light);
+	obj.lights.push_back(light);
+}
+
+void ShadowMap::Template::Loader::size_square(unsigned s)
+{
+	obj.width = s;
+	obj.height = s;
+}
+
+void ShadowMap::Template::Loader::target(float x, float y, float z)
+{
+	obj.target = Vector3(x, y, z);
+}
+
+
+DataFile::Loader::ActionMap ShadowMap::Template::ShadowedLight::Loader::shared_actions;
+
+ShadowMap::Template::ShadowedLight::Loader::Loader(ShadowedLight &l):
+	ObjectLoader<ShadowedLight>(l)
+{
+	set_actions(shared_actions);
+}
+
+void ShadowMap::Template::ShadowedLight::Loader::init_actions()
+{
+	add("size", &ShadowedLight::size);
+	add("shadow_caster", &ShadowedLight::shadow_caster_name);
+}
+
 } // namespace GL
 } // namespace Msp