glm backwards compatibility

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

diff --git a/src/graphics/DirectionalLighting.hpp b/src/graphics/DirectionalLighting.hpp
index df89053cd7e342df9d6bfcfd8ef6197fa3decb92..dd76f5e67ef11702495bfd3db62b1dc5be704dd4 100644 (file)
--- a/src/graphics/DirectionalLighting.hpp
+++ b/src/graphics/DirectionalLighting.hpp
@@ -1,14 +1,16 @@
 #ifndef BLANK_GRAPHICS_DIRECTIONALLIGHTING_HPP_
 #define BLANK_GRAPHICS_DIRECTIONALLIGHTING_HPP_
 
+#include "glm.hpp"
 #include "Program.hpp"
 
 #include <GL/glew.h>
-#include <glm/glm.hpp>
 
 
 namespace blank {
 
+class ArrayTexture;
+
 class DirectionalLighting {
 
 public:
@@ -17,7 +19,10 @@ public:
        void Activate() noexcept;
 
        void SetLightDirection(const glm::vec3 &) noexcept;
+       void SetLightColor(const glm::vec3 &) noexcept;
+       void SetAmbientColor(const glm::vec3 &) noexcept;
 
+       void SetTexture(ArrayTexture &) noexcept;
        void SetFogDensity(float) noexcept;
 
        void SetM(const glm::mat4 &m) noexcept;
@@ -33,11 +38,6 @@ public:
 private:
        Program program;
 
-       glm::vec3 light_direction;
-       glm::vec3 light_color;
-
-       float fog_density;
-
        glm::mat4 projection;
        glm::mat4 view;
        glm::mat4 vp;
@@ -45,8 +45,10 @@ private:
        GLuint m_handle;
        GLuint mv_handle;
        GLuint mvp_handle;
+       GLuint sampler_handle;
        GLuint light_direction_handle;
        GLuint light_color_handle;
+       GLuint ambient_color_handle;
        GLuint fog_density_handle;
 
 };