X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.h;h=bf6fbaf0f2b77081ffea4638400554837b91775c;hb=f19366d32cc29287a2730cfba90893e407754081;hp=e02687b71184c37b3b11c0a30c8f1b75862e3774;hpb=cd5f37b066352119cf92d53d0001af7ff99be437;p=libs%2Fgl.git

diff --git a/source/effects/environmentmap.h b/source/effects/environmentmap.h
index e02687b7..bf6fbaf0 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 "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
@@ -55,13 +55,9 @@ private:
 	unsigned update_delay;
 
 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_depth_clip(float, float);
 
 	/** Sets the interval in frames between environment map updates.  A value of