Remove the deprecated ProgramBuilder class

[libs/gl.git] / source / environmentmap.cpp

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index f4000c768cd2f3c77e8462e37655d4f10b3ed066..3902eb8c95b240434036bdd0915e9433cd373149 100644 (file)
--- 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();