X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=b9a7124ccd93f786b7e03d816184d483f7de18ec;hb=0fa506250545acb83bc86f1734826544d6f1eda6;hp=782a3d2ab0845b4815520852de8436b8b86c0fb5;hpb=5542f100cd82561aae4605dfca5a58b0eec8e2ae;p=libs%2Fgl.git

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 782a3d2a..b9a7124c 100644
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -1,7 +1,9 @@
 #include <algorithm>
 #include <cmath>
+#include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include "environmentmap.h"
+#include "error.h"
 #include "mesh.h"
 #include "renderer.h"
 #include "resources.h"
@@ -115,6 +117,8 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 	update_delay = update_interval-1;
 	environment.setup_frame(renderer);
 
+	SetFlag set_in(in_setup_frame);
+
 	Vector3 center;
 	if(use_fixed_pos)
 		center = fixed_position;
@@ -128,15 +132,13 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 	}
 
 	Renderer::Push push(renderer);
-	Renderer::Exclude exclude1(renderer, renderable);
-	Renderer::Exclude exclude2(renderer, *this);
 
 	for(unsigned i=0; i<6; ++i)
 	{
 		faces[i].camera.set_position(center);
 		renderer.set_framebuffer(&faces[i].fbo);
 		renderer.set_camera(faces[i].camera);
-		renderer.render(environment);
+		environment.render(renderer);
 	}
 
 	renderer.set_framebuffer(&irradiance_fbo);
@@ -165,15 +167,17 @@ void EnvironmentMap::finish_frame()
 
 void EnvironmentMap::render(Renderer &renderer, Tag tag) const
 {
+	if(in_setup_frame)
+		return;
 	if(!enabled_methods.count(tag))
-		return renderer.render(renderable, tag);
+		return renderable.render(renderer, tag);
 
 	Renderer::Push _push_rend(renderer);
 
 	renderer.set_texture("environment_map", &env_tex, &mip_sampler);
 	renderer.set_texture("irradiance_map", &irradiance, &sampler);
 	renderer.add_shader_data(shdata);
-	renderer.render(renderable, tag);
+	renderable.render(renderer, tag);
 }
 
 void EnvironmentMap::set_debug_name(const string &name)
@@ -199,5 +203,47 @@ void EnvironmentMap::set_debug_name(const string &name)
 #endif
 }
 
+
+EnvironmentMap *EnvironmentMap::Template::create(const map<string, Renderable *> &renderables) const
+{
+	Renderable *content = get_item(renderables, content_name);
+	Renderable *environment = get_item(renderables, environment_name);
+	if(!content || !environment)
+		throw invalid_operation("EnvironmentMap::Template::create");
+
+	RefPtr<EnvironmentMap> env_map = new EnvironmentMap(size, format, roughness_levels, *content, *environment);
+	if(use_fixed_position)
+		env_map->set_fixed_position(fixed_position);
+	env_map->set_depth_clip(near_clip, far_clip);
+
+	return env_map.release();
+}
+
+
+DataFile::Loader::ActionMap EnvironmentMap::Template::Loader::shared_actions;
+
+EnvironmentMap::Template::Loader::Loader(Template &t, Collection &c):
+	DerivedObjectLoader<Template, Effect::Template::Loader>(t, c)
+{
+	set_actions(shared_actions);
+}
+
+void EnvironmentMap::Template::Loader::init_actions()
+{
+	Effect::Template::Loader::init_actions();
+	add("depth_clip", &Template::near_clip, &Template::far_clip);
+	add("environment", &Template::environment_name);
+	add("fixed_position", &Loader::fixed_position);
+	add("format", &Template::format);
+	add("roughness_levels", &Template::roughness_levels);
+	add("size", &Template::size);
+}
+
+void EnvironmentMap::Template::Loader::fixed_position(float x, float y, float z)
+{
+	obj.fixed_position = Vector3(x, y, z);
+	obj.use_fixed_position = true;
+}
+
 } // namespace GL
 } // namespace Msp