X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=614b1252b26ba7b2177bf40c3cb9803e4b052a9f;hb=bdcae47bf2f4e49d2d9e4ba15e6f17171ce5fa0c;hp=6fb0e5c3b314656dca8361dc9b54544969c98c68;hpb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;p=libs%2Fgl.git

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 6fb0e5c3..614b1252 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"
@@ -11,12 +13,12 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, Renderable &r, Renderable &e):
-	EnvironmentMap(s, f, 1, r, e)
+EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, Renderable &c, Renderable &e):
+	EnvironmentMap(s, f, 1, c, e)
 { }
 
-EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable &r, Renderable &e):
-	Effect(r),
+EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable &c, Renderable &e):
+	Effect(c),
 	size(s),
 	environment(e),
 	irradiance_shprog(Resources::get_global().get<Program>("_envmap_irradiance.glsl.shader")),
@@ -104,7 +106,7 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 		return;
 
 	rendered = true;
-	renderable.setup_frame(renderer);
+	content.setup_frame(renderer);
 
 	if(update_delay)
 	{
@@ -115,12 +117,14 @@ 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;
 	else
 	{
-		const Matrix *matrix = renderable.get_matrix();
+		const Matrix *matrix = content.get_matrix();
 		if(!matrix)
 			return;
 
@@ -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);
@@ -158,28 +160,30 @@ void EnvironmentMap::finish_frame()
 	if(rendered)
 	{
 		rendered = false;
-		renderable.finish_frame();
+		content.finish_frame();
 		environment.finish_frame();
 	}
 }
 
 void EnvironmentMap::render(Renderer &renderer, Tag tag) const
 {
-	if(!enabled_passes.count(tag))
-		return renderer.render(renderable, tag);
+	if(in_setup_frame)
+		return;
+	if(!is_enabled_for_method(tag))
+		return content.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);
+	content.render(renderer, tag);
 }
 
 void EnvironmentMap::set_debug_name(const string &name)
 {
 #ifdef DEBUG
-	env_tex.set_debug_name(name+"/environment.texcb");
+	env_tex.set_debug_name(name+"/environment.tex");
 	depth_buf.set_debug_name(name+"/environment_depth.rbuf");
 	static const char *const face_names[] = { "X+", "X-", "Y+", "Y-", "Z+", "Z-" };
 	for(unsigned i=0; i<6; ++i)
@@ -188,7 +192,7 @@ void EnvironmentMap::set_debug_name(const string &name)
 		faces[i].camera.set_debug_name(format("%s/%s.camera", name, face_names[i]));
 	}
 
-	irradiance.set_debug_name(name+"/irradiance.texcb");
+	irradiance.set_debug_name(name+"/irradiance.tex");
 	irradiance_fbo.set_debug_name(name+" [FBO:irradiance]");
 	for(unsigned i=0; i<specular_fbos.size(); ++i)
 		specular_fbos[i].set_debug_name(format("%s [FBO:specular_mip%d]", name, i+1));
@@ -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