X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fshader.hpp;h=df625c6d3a018ae71caa9302b36043b5f748c364;hb=e53a0e2e711a7d8bd9b0ddacd1360aa14370643f;hp=c97e073111b9cf45a4dacf7f63dd620012d98d5c;hpb=982b69ce8c393ae18beed5239191b8bc2ee1d5d1;p=blank.git

diff --git a/src/shader.hpp b/src/shader.hpp
index c97e073..df625c6 100644
--- a/src/shader.hpp
+++ b/src/shader.hpp
@@ -15,18 +15,18 @@ public:
 	explicit Shader(GLenum type);
 	~Shader();
 
-	Shader(Shader &&);
-	Shader &operator =(Shader &&);
+	Shader(Shader &&) noexcept;
+	Shader &operator =(Shader &&) noexcept;
 
 	Shader(const Shader &) = delete;
 	Shader &operator =(const Shader &) = delete;
 
-	void Source(const GLchar *src);
-	void Compile();
-	bool Compiled() const;
+	void Source(const GLchar *src) noexcept;
+	void Compile() noexcept;
+	bool Compiled() const noexcept;
 	void Log(std::ostream &) const;
 
-	void AttachToProgram(GLuint id) const;
+	void AttachToProgram(GLuint id) const noexcept;
 
 private:
 	GLuint handle;
@@ -44,14 +44,15 @@ public:
 	Program &operator =(const Program &) = delete;
 
 	const Shader &LoadShader(GLenum type, const GLchar *src);
-	void Attach(Shader &);
-	void Link();
-	bool Linked() const;
+	void Attach(Shader &) noexcept;
+	void Link() noexcept;
+	bool Linked() const noexcept;
 	void Log(std::ostream &) const;
 
-	GLint UniformLocation(const GLchar *name) const;
+	GLint AttributeLocation(const GLchar *name) const noexcept;
+	GLint UniformLocation(const GLchar *name) const noexcept;
 
-	void Use() const { glUseProgram(handle); }
+	void Use() const noexcept { glUseProgram(handle); }
 
 private:
 	GLuint handle;
@@ -65,11 +66,21 @@ class DirectionalLighting {
 public:
 	DirectionalLighting();
 
-	void Activate();
+	void Activate() noexcept;
 
-	void SetM(const glm::mat4 &m);
-	void SetVP(const glm::mat4 &v, const glm::mat4 &p);
-	void SetMVP(const glm::mat4 &m, const glm::mat4 &v, const glm::mat4 &p);
+	void SetLightDirection(const glm::vec3 &) noexcept;
+
+	void SetFogDensity(float) noexcept;
+
+	void SetM(const glm::mat4 &m) noexcept;
+	void SetProjection(const glm::mat4 &p) noexcept;
+	void SetView(const glm::mat4 &v) noexcept;
+	void SetVP(const glm::mat4 &v, const glm::mat4 &p) noexcept;
+	void SetMVP(const glm::mat4 &m, const glm::mat4 &v, const glm::mat4 &p) noexcept;
+
+	const glm::mat4 &Projection() const noexcept { return projection; }
+	const glm::mat4 &View() const noexcept { return view; }
+	const glm::mat4 &GetVP() const noexcept { return vp; }
 
 private:
 	Program program;
@@ -77,12 +88,54 @@ private:
 	glm::vec3 light_direction;
 	glm::vec3 light_color;
 
+	float fog_density;
+
+	glm::mat4 projection;
+	glm::mat4 view;
 	glm::mat4 vp;
 
 	GLuint m_handle;
+	GLuint mv_handle;
+	GLuint mvp_handle;
+	GLuint light_direction_handle;
+	GLuint light_color_handle;
+	GLuint fog_density_handle;
+
+};
+
+class BlockLighting {
+
+public:
+	BlockLighting();
+
+	void Activate() noexcept;
+
+	void SetFogDensity(float) noexcept;
+
+	void SetM(const glm::mat4 &m) noexcept;
+	void SetProjection(const glm::mat4 &p) noexcept;
+	void SetView(const glm::mat4 &v) noexcept;
+	void SetVP(const glm::mat4 &v, const glm::mat4 &p) noexcept;
+	void SetMVP(const glm::mat4 &m, const glm::mat4 &v, const glm::mat4 &p) noexcept;
+
+	const glm::mat4 &Projection() const noexcept { return projection; }
+	const glm::mat4 &View() const noexcept { return view; }
+	const glm::mat4 &GetVP() const noexcept { return vp; }
+
+private:
+	Program program;
+
+	float fog_density;
+
+	glm::mat4 projection;
+	glm::mat4 view;
+	glm::mat4 vp;
+
+	GLuint mv_handle;
 	GLuint mvp_handle;
 	GLuint light_direction_handle;
 	GLuint light_color_handle;
+	GLuint fog_density_handle;
 
 };