Access builtin resources through a global instance

[libs/gl.git] / source / effects / sky.cpp

diff --git a/source/effects/sky.cpp b/source/effects/sky.cpp
index 8fa00cfbd4d44e884cdfadfd6268226705e039d2..baf4864ad02256b1b83a332541369241c5e8f019 100644 (file)
--- a/source/effects/sky.cpp
+++ b/source/effects/sky.cpp
@@ -9,24 +9,20 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Sky::Sky(Resources &resources, Renderable &r, const Light &s):
+Sky::Sky(Renderable &r, const Light &s):
        Effect(r),
        sun(s),
-       transmittance_shprog(resources.get<Program>("_sky_transmittance.glsl.shader")),
+       transmittance_lookup(128, 64, (RENDER_COLOR, RGB16F)),
+       transmittance_shprog(Resources::get_global().get<Program>("_sky_transmittance.glsl.shader")),
        transmittance_lookup_dirty(true),
-       distant_shprog(resources.get<Program>("_sky_distant.glsl.shader")),
-       fullscreen_mesh(resources.get<Mesh>("_fullscreen_quad.mesh")),
-       backdrop_shprog(resources.get<Program>("_sky_backdrop.glsl.shader")),
-       sampler(resources.get<Sampler>("_linear_clamp.samp")),
-       wrap_sampler(resources.get<Sampler>("_linear_clamp_v.samp")),
+       distant(256, 128, (RENDER_COLOR, RGB16F)),
+       distant_shprog(Resources::get_global().get<Program>("_sky_distant.glsl.shader")),
+       fullscreen_mesh(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
+       backdrop_shprog(Resources::get_global().get<Program>("_sky_backdrop.glsl.shader")),
+       sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp")),
+       wrap_sampler(Resources::get_global().get<Sampler>("_linear_clamp_v.samp")),
        rendered(false)
 {
-       transmittance_lookup.storage(RGB16F, 128, 64, 1);
-       transmittance_fbo.attach(COLOR_ATTACHMENT0, transmittance_lookup);
-
-       distant.storage(RGB16F, 256, 128, 1);
-       distant_fbo.attach(COLOR_ATTACHMENT0, distant);
-
        shdata.uniform("n_steps", 50);
 
        set_planet(Planet::earth());
@@ -68,14 +64,14 @@ void Sky::setup_frame(Renderer &renderer)
        if(transmittance_lookup_dirty)
        {
                transmittance_lookup_dirty = false;
-               Bind bind_fbo(transmittance_fbo);
+               Bind bind_fbo(transmittance_lookup.get_framebuffer());
                renderer.set_shader_program(&transmittance_shprog, &shdata);
                fullscreen_mesh.draw(renderer);
        }
 
-       Bind bind_fbo(distant_fbo);
+       Bind bind_fbo(distant.get_framebuffer());
        renderer.set_shader_program(&distant_shprog, &shdata);
-       renderer.set_texture("transmittance_lookup", &transmittance_lookup, &sampler);
+       renderer.set_texture("transmittance_lookup", &transmittance_lookup.get_target_texture(0), &sampler);
        fullscreen_mesh.draw(renderer);
 
        renderable.setup_frame(renderer);
@@ -97,7 +93,7 @@ void Sky::render(Renderer &renderer, Tag tag) const
        Renderer::Push push(renderer);
 
        renderer.set_shader_program(&backdrop_shprog, &shdata);
-       renderer.set_texture("distant", &distant, &wrap_sampler);
+       renderer.set_texture("distant", &distant.get_target_texture(0), &wrap_sampler);
        fullscreen_mesh.draw(renderer);
 }