X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.h;h=0c80012501baab724ae5845aab1b786363c32996;hp=4936d162781aac4087fcfdf26eb318abdac69ec5;hb=083a8227715fa32c841fc2b8126e4ab8d2840ba0;hpb=1863f17c5c5563be8492d7f01e5c613a740ea1e9

diff --git a/source/effects/environmentmap.h b/source/effects/environmentmap.h
index 4936d162..0c800125 100644
--- a/source/effects/environmentmap.h
+++ b/source/effects/environmentmap.h
@@ -1,19 +1,19 @@
 #ifndef MSP_GL_ENVIRONMENTMAP_H_
 #define MSP_GL_ENVIRONMENTMAP_H_
 
+#include <vector>
 #include "camera.h"
 #include "effect.h"
 #include "framebuffer.h"
-#include "matrix.h"
 #include "programdata.h"
-#include "renderbuffer.h"
+#include "texture2d.h"
 #include "texturecube.h"
-#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
 class Mesh;
+class Sampler;
 
 /**
 Creates a cube map texture of the surroundings of the renderable.  This texture
@@ -26,7 +26,35 @@ environment.
 */
 class EnvironmentMap: public Effect
 {
-private:
+public:
+	struct Template: Effect::Template
+	{
+		class Loader: public DataFile::DerivedObjectLoader<Template, Effect::Template::Loader>
+		{
+		private:
+			static ActionMap shared_actions;
+
+		public:
+			Loader(Template &, Collection &);
+		private:
+			virtual void init_actions();
+
+			void fixed_position(float, float, float);
+		};
+
+		unsigned size = 512;
+		PixelFormat format = RGB16F;
+		std::string environment_name;
+		unsigned roughness_levels = 5;
+		Vector3 fixed_position;
+		bool use_fixed_position = false;
+		float near_clip = 0.1f;
+		float far_clip = 100.0f;
+
+		virtual EnvironmentMap *create(const std::map<std::string, Renderable *> &) const;
+	};
+
+protected:
 	struct Face
 	{
 		Framebuffer fbo;
@@ -36,8 +64,10 @@ private:
 	unsigned size;
 	Renderable &environment;
 	TextureCube env_tex;
-	Renderbuffer depth_buf;
+	Texture2D depth_buf;
 	Face faces[6];
+	Vector3 fixed_position;
+	bool use_fixed_pos = false;
 
 	TextureCube irradiance;
 	const Program &irradiance_shprog;
@@ -50,18 +80,16 @@ private:
 	const Sampler &sampler;
 	const Sampler &mip_sampler;
 	ProgramData shdata;
-	bool rendered;
-	unsigned update_interval;
-	unsigned update_delay;
+	bool rendered = false;
+	unsigned update_interval = 1;
+	unsigned update_delay = 0;
 
 public:
-	EnvironmentMap(unsigned size, Renderable &rend, Renderable &env);
 	EnvironmentMap(unsigned size, PixelFormat, Renderable &rend, Renderable &env);
 	EnvironmentMap(unsigned size, PixelFormat, unsigned, Renderable &rend, Renderable &env);
-private:
-	void init(unsigned, PixelFormat, unsigned);
 
-public:
+	void set_fixed_position(const Vector3 &);
+
 	void set_depth_clip(float, float);
 
 	/** Sets the interval in frames between environment map updates.  A value of