X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fenvironmentmap.cpp;h=3902eb8c95b240434036bdd0915e9433cd373149;hp=f4000c768cd2f3c77e8462e37655d4f10b3ed066;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=9087cc0a372b9c739f15398c7a22c0a6eb5041bb

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index f4000c76..3902eb8c 100644
--- a/source/environmentmap.cpp
+++ b/source/environmentmap.cpp
@@ -13,14 +13,12 @@ EnvironmentMap::EnvironmentMap(unsigned s, Renderable &r, Renderable &e):
 	Effect(r),
 	size(s),
 	environment(e),
+	sampler(get_linear_sampler()),
 	rendered(false),
 	update_interval(1),
 	update_delay(0)
 {
 	env_tex.storage(RGB8, size, 1);
-	Sampler &env_samp = env_tex.get_default_sampler();
-	env_samp.set_wrap(CLAMP_TO_EDGE);
-	env_samp.set_min_filter(LINEAR);
 	depth_buf.storage(DEPTH_COMPONENT32F, size, size);
 	for(unsigned i=0; i<6; ++i)
 	{
@@ -109,6 +107,7 @@ void EnvironmentMap::render(Renderer &renderer, const Tag &tag) const
 
 	unsigned unit = renderer.allocate_effect_texunit();
 	shdata.uniform("environment", static_cast<int>(unit));
+	Bind _bind_sampler(*sampler, unit);
 	Bind _bind_env(env_tex, unit);
 
 	const Matrix &camera_matrix = renderer.get_camera()->get_object_matrix();