X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.h;h=a13bea3faeeea6eaea41e1d594700c48437a16b1;hb=dff7004fa078d55911664c0f513b5dc6c9449420;hp=c54968de35d5cfc7bf11be0ee14559c34cf766fc;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/effects/environmentmap.h b/source/effects/environmentmap.h
index c54968de..a13bea3f 100644
--- a/source/effects/environmentmap.h
+++ b/source/effects/environmentmap.h
@@ -13,15 +13,15 @@
 namespace Msp {
 namespace GL {
 
-class Renderable;
+class Resources;
 
 /**
 Creates a cube map texture of the surroundings of the renderable.  This texture
 can then be used to implement effects such as reflections or refractions.
 
-If the EnvironmentMap is used in a Pipeline, it's worth noting that the cube
+If the EnvironmentMap is used in a Sequence, it's worth noting that the cube
 map will be prepared outside of any rendering pass.  It's recommended to use
-another Pipeline to define which passes should be used to render the
+another Sequence to define which passes should be used to render the
 environment.
 */
 class EnvironmentMap: public Effect
@@ -32,7 +32,7 @@ private:
 	TextureCube env_tex;
 	Renderbuffer depth_buf;
 	Framebuffer fbo[6];
-	RefPtr<Sampler> sampler;
+	const Sampler &sampler;
 	Camera camera;
 	mutable ProgramData shdata;
 	bool rendered;
@@ -40,7 +40,7 @@ private:
 	unsigned update_delay;
 
 public:
-	EnvironmentMap(unsigned size, Renderable &rend, Renderable &env);
+	EnvironmentMap(Resources &, unsigned size, Renderable &rend, Renderable &env);
 
 	void set_depth_clip(float, float);
 	void set_update_interval(unsigned);
@@ -49,7 +49,7 @@ public:
 	virtual void setup_frame(Renderer &);
 	virtual void finish_frame();
 
-	virtual void render(Renderer &, const Tag & = Tag()) const;
+	virtual void render(Renderer &, Tag = Tag()) const;
 };
 
 } // namespace GL