Change various generated texture names to use the unified extension

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

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 0cd1d4b99e3821f0c28b0b06c72328c93a28cbac..bf09085ba862db8b06aac7606dd05a0f41ec0454 100644 (file)
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <cmath>
+#include <msp/strings/format.h>
 #include "environmentmap.h"
 #include "mesh.h"
 #include "renderer.h"
@@ -11,39 +12,22 @@ namespace Msp {
 namespace GL {
 
 EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, Renderable &r, Renderable &e):
-       Effect(r),
-       environment(e),
-       irradiance_shprog(Resources::get_global().get<Program>("_envmap_irradiance.glsl.shader")),
-       specular_shprog(Resources::get_global().get<Program>("_envmap_specular.glsl.shader")),
-       fullscreen_mesh(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
-       sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp")),
-       mip_sampler(Resources::get_global().get<Sampler>("_mip_clamp.samp"))
-{
-       init(s, f, 1);
-}
+       EnvironmentMap(s, f, 1, r, e)
+{ }
 
 EnvironmentMap::EnvironmentMap(unsigned s, PixelFormat f, unsigned l, Renderable &r, Renderable &e):
        Effect(r),
+       size(s),
        environment(e),
        irradiance_shprog(Resources::get_global().get<Program>("_envmap_irradiance.glsl.shader")),
        specular_shprog(Resources::get_global().get<Program>("_envmap_specular.glsl.shader")),
        fullscreen_mesh(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
        sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp")),
        mip_sampler(Resources::get_global().get<Sampler>("_mip_clamp.samp"))
-{
-       init(s, f, l);
-}
-
-void EnvironmentMap::init(unsigned s, PixelFormat f, unsigned l)
 {
        if(!l || (1U<<(l-1))>=s)
                throw invalid_argument("EnvironmentMap::EnvironmentMap");
 
-       size = s;
-       rendered = false;
-       update_interval = 1;
-       update_delay = 0;
-
        env_tex.storage(f, size, l);
        depth_buf.storage(DEPTH_COMPONENT32F, size, size, 1);
        for(unsigned i=0; i<6; ++i)
@@ -91,6 +75,12 @@ void EnvironmentMap::init(unsigned s, PixelFormat f, unsigned l)
        shdata.uniform("env_world_matrix", LinAl::SquareMatrix<float, 3>::identity());
 }
 
+void EnvironmentMap::set_fixed_position(const Vector3 &p)
+{
+       fixed_position = p;
+       use_fixed_pos = true;
+}
+
 void EnvironmentMap::set_depth_clip(float n, float f)
 {
        for(unsigned i=0; i<6; ++i)
@@ -125,16 +115,22 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
        update_delay = update_interval-1;
        environment.setup_frame(renderer);
 
-       const Matrix *matrix = renderable.get_matrix();
-       if(!matrix)
-               return;
+       Vector3 center;
+       if(use_fixed_pos)
+               center = fixed_position;
+       else
+       {
+               const Matrix *matrix = renderable.get_matrix();
+               if(!matrix)
+                       return;
+
+               center = matrix->column(3).slice<3>(0);
+       }
 
        Renderer::Push push(renderer);
        Renderer::Exclude exclude1(renderer, renderable);
        Renderer::Exclude exclude2(renderer, *this);
 
-       Vector3 center = matrix->column(3).slice<3>(0);
-
        for(unsigned i=0; i<6; ++i)
        {
                faces[i].camera.set_position(center);
@@ -183,7 +179,7 @@ void EnvironmentMap::render(Renderer &renderer, Tag tag) const
 void EnvironmentMap::set_debug_name(const string &name)
 {
 #ifdef DEBUG
-       env_tex.set_debug_name(name+"/environment.texcb");
+       env_tex.set_debug_name(name+"/environment.tex");
        depth_buf.set_debug_name(name+"/environment_depth.rbuf");
        static const char *const face_names[] = { "X+", "X-", "Y+", "Y-", "Z+", "Z-" };
        for(unsigned i=0; i<6; ++i)
@@ -192,7 +188,7 @@ void EnvironmentMap::set_debug_name(const string &name)
                faces[i].camera.set_debug_name(format("%s/%s.camera", name, face_names[i]));
        }
 
-       irradiance.set_debug_name(name+"/irradiance.texcb");
+       irradiance.set_debug_name(name+"/irradiance.tex");
        irradiance_fbo.set_debug_name(name+" [FBO:irradiance]");
        for(unsigned i=0; i<specular_fbos.size(); ++i)
                specular_fbos[i].set_debug_name(format("%s [FBO:specular_mip%d]", name, i+1));