Use default member initializers for simple types

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

diff --git a/source/effects/environmentmap.h b/source/effects/environmentmap.h
index 5d1e7c91a7207b02666b736bf8320c4cad99c41f..f9f4cf5306e3af142be170b3714ad84c91800e8e 100644 (file)
--- a/source/effects/environmentmap.h
+++ b/source/effects/environmentmap.h
@@ -1,19 +1,19 @@
 #ifndef MSP_GL_ENVIRONMENTMAP_H_
 #define MSP_GL_ENVIRONMENTMAP_H_
 
+#include <vector>
 #include "camera.h"
 #include "effect.h"
 #include "framebuffer.h"
-#include "matrix.h"
 #include "programdata.h"
-#include "renderbuffer.h"
+#include "texture2d.h"
 #include "texturecube.h"
-#include "vector.h"
 
 namespace Msp {
 namespace GL {
 
-class Resources;
+class Mesh;
+class Sampler;
 
 /**
 Creates a cube map texture of the surroundings of the renderable.  This texture
@@ -36,21 +36,32 @@ private:
        unsigned size;
        Renderable &environment;
        TextureCube env_tex;
-       Renderbuffer depth_buf;
+       Texture2D depth_buf;
        Face faces[6];
+       Vector3 fixed_position;
+       bool use_fixed_pos = false;
+
+       TextureCube irradiance;
+       const Program &irradiance_shprog;
+       Framebuffer irradiance_fbo;
+       const Program &specular_shprog;
+       std::vector<Framebuffer> specular_fbos;
+       ProgramData prefilter_shdata;
+       const Mesh &fullscreen_mesh;
+
        const Sampler &sampler;
+       const Sampler &mip_sampler;
        ProgramData shdata;
-       bool rendered;
-       unsigned update_interval;
-       unsigned update_delay;
+       bool rendered = false;
+       unsigned update_interval = 1;
+       unsigned update_delay = 0;
 
 public:
-       EnvironmentMap(Resources &, unsigned size, Renderable &rend, Renderable &env);
-       EnvironmentMap(Resources &, unsigned size, PixelFormat, Renderable &rend, Renderable &env);
-private:
-       void init(unsigned, PixelFormat, unsigned);
+       EnvironmentMap(unsigned size, PixelFormat, Renderable &rend, Renderable &env);
+       EnvironmentMap(unsigned size, PixelFormat, unsigned, Renderable &rend, Renderable &env);
+
+       void set_fixed_position(const Vector3 &);
 
-public:
        void set_depth_clip(float, float);
 
        /** Sets the interval in frames between environment map updates.  A value of
@@ -64,6 +75,8 @@ public:
        virtual void finish_frame();
 
        virtual void render(Renderer &, Tag = Tag()) const;
+
+       virtual void set_debug_name(const std::string &);
 };
 
 } // namespace GL