diff options
Diffstat (limited to 'src/GFX/Shading')
| -rw-r--r-- | src/GFX/Shading/Program.cpp | 6 | ||||
| -rw-r--r-- | src/GFX/Shading/Program.hpp | 4 | ||||
| -rw-r--r-- | src/GFX/Shading/Shader.cpp | 6 | ||||
| -rw-r--r-- | src/GFX/Shading/Shader.hpp | 8 | ||||
| -rw-r--r-- | src/GFX/Shading/Uniform.cpp | 4 | ||||
| -rw-r--r-- | src/GFX/Shading/Uniform.hpp | 10 |
6 files changed, 19 insertions, 19 deletions
diff --git a/src/GFX/Shading/Program.cpp b/src/GFX/Shading/Program.cpp index 6efb30b..ff10012 100644 --- a/src/GFX/Shading/Program.cpp +++ b/src/GFX/Shading/Program.cpp @@ -18,7 +18,7 @@ Program::Program(Shader vertex, Shader fragment) { GLint success; glGetProgramiv(m_program, GL_LINK_STATUS, &success); if(!success) { - char message[512] = {}; + Char message[512] = {}; glGetProgramInfoLog(m_program, 512, nullptr, message); throw std::runtime_error(message); @@ -36,10 +36,10 @@ void Program::unbind() const { Uniform Program::uniform(const std::string& name) const { auto index = glGetUniformLocation(m_program, name.c_str()); - return {name, static_cast<uint32_t>(index)}; + return {name, static_cast<U32>(index)}; } -uint32_t Program::get() const { +U32 Program::get() const { return m_program; } diff --git a/src/GFX/Shading/Program.hpp b/src/GFX/Shading/Program.hpp index 8a50617..2f48698 100644 --- a/src/GFX/Shading/Program.hpp +++ b/src/GFX/Shading/Program.hpp @@ -10,7 +10,7 @@ class Program { public: Program(Shader vertex, Shader fragment); - uint32_t get() const; + U32 get() const; Uniform uniform(const std::string& name) const; @@ -18,7 +18,7 @@ public: void unbind() const; private: - uint32_t m_program; + U32 m_program; }; } \ No newline at end of file diff --git a/src/GFX/Shading/Shader.cpp b/src/GFX/Shading/Shader.cpp index 6dfac34..54f8ad1 100644 --- a/src/GFX/Shading/Shader.cpp +++ b/src/GFX/Shading/Shader.cpp @@ -4,8 +4,8 @@ namespace MC::GFX::Shading { -Shader::Shader(Type type, const char* source) { - uint32_t gl_type = 0; +Shader::Shader(Type type, const Char* source) { + U32 gl_type = 0; switch (type) { case Type::Vertex: gl_type = GL_VERTEX_SHADER; @@ -23,7 +23,7 @@ Shader::Shader(Type type, const char* source) { GLint success; glGetShaderiv(m_shader, GL_COMPILE_STATUS, &success); if(!success) { - char message[512] = {}; + Char message[512] = {}; glGetShaderInfoLog(m_shader, 512, nullptr, message); throw std::runtime_error(message); diff --git a/src/GFX/Shading/Shader.hpp b/src/GFX/Shading/Shader.hpp index 15450cb..21fd899 100644 --- a/src/GFX/Shading/Shader.hpp +++ b/src/GFX/Shading/Shader.hpp @@ -1,6 +1,6 @@ #pragma once -#include <cstdint> +#include "../../Common/Sizes.hpp" #include "../../Assets.hpp" namespace MC::GFX::Shading { @@ -13,9 +13,9 @@ public: Fragment, }; - Shader(Type type, const char* source); + Shader(Type type, const Char* source); - uint32_t get() const { + U32 get() const { return m_shader; } @@ -28,7 +28,7 @@ public: } private: - uint32_t m_shader; + U32 m_shader; }; } \ No newline at end of file diff --git a/src/GFX/Shading/Uniform.cpp b/src/GFX/Shading/Uniform.cpp index 71786ef..a9c9854 100644 --- a/src/GFX/Shading/Uniform.cpp +++ b/src/GFX/Shading/Uniform.cpp @@ -3,11 +3,11 @@ namespace MC::GFX::Shading { -void Uniform::set(const Matrix<4, 4>& value) const { +void Uniform::set(const Matrix<4, 4, F32>& value) const { glUniformMatrix4fv(m_index, 1, GL_TRUE, value.elements); } -void Uniform::set(const Vector<3>& value) const { +void Uniform::set(const Vector<3, F32>& value) const { glUniform3f(m_index, value.x(), value.y(), value.z()); } diff --git a/src/GFX/Shading/Uniform.hpp b/src/GFX/Shading/Uniform.hpp index a270e65..c8ab6fe 100644 --- a/src/GFX/Shading/Uniform.hpp +++ b/src/GFX/Shading/Uniform.hpp @@ -1,22 +1,22 @@ #pragma once -#include <cstdint> #include <string> +#include "../../Common/Sizes.hpp" #include "../../Math/Common.hpp" namespace MC::GFX::Shading { class Uniform { public: - Uniform(std::string name, uint32_t index) + Uniform(std::string name, U32 index) : m_name(std::move(name)), m_index(index) {} - void set(const Matrix<4, 4>& value) const; - void set(const Vector<3>& value) const; + void set(const Matrix<4, 4, F32>& value) const; + void set(const Vector<3, F32>& value) const; private: std::string m_name; - uint32_t m_index; + U32 m_index; }; } |
