glm backwards compatibility

[blank.git] / src / graphics / BlockLighting.hpp

diff --git a/src/graphics/BlockLighting.hpp b/src/graphics/BlockLighting.hpp
index 8f7f01dca1e722cd44b8442cf365dbf7b51b3206..d0d4ea4997f12283576eec354862cf9440b8baf3 100644 (file)
--- a/src/graphics/BlockLighting.hpp
+++ b/src/graphics/BlockLighting.hpp
@@ -1,14 +1,16 @@
 #ifndef BLANK_GRAPHICS_BLOCKLIGHTING_HPP_
 #define BLANK_GRAPHICS_BLOCKLIGHTING_HPP_
 
+#include "glm.hpp"
 #include "Program.hpp"
 
 #include <GL/glew.h>
-#include <glm/glm.hpp>
 
 
 namespace blank {
 
+class ArrayTexture;
+
 class BlockLighting {
 
 public:
@@ -16,6 +18,7 @@ public:
 
        void Activate() noexcept;
 
+       void SetTexture(ArrayTexture &) noexcept;
        void SetFogDensity(float) noexcept;
 
        void SetM(const glm::mat4 &m) noexcept;
@@ -31,14 +34,13 @@ public:
 private:
        Program program;
 
-       float fog_density;
-
        glm::mat4 projection;
        glm::mat4 view;
        glm::mat4 vp;
 
        GLuint mv_handle;
        GLuint mvp_handle;
+       GLuint sampler_handle;
        GLuint light_direction_handle;
        GLuint light_color_handle;
        GLuint fog_density_handle;