mhu/opengl-playground
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change normal matrix from 4x4 to 3x3

Browse Source
This commit is contained in:
Mario Hüttel
2020-03-26 23:03:49 +01:00
parent 251adef6b5
commit b9a007dd51
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/opengl-playground/openglgraphics.hpp
View File

@@ -15,12 +15,12 @@ class OpenGlGraphics
virtual void realize() = 0;
virtual void render() = 0;
void setModelMatrix(const glm::mat4 &model_matrix);
glm::mat4 getModelMatrix();
glm::mat4 getNormalMatrix();
const glm::mat4 &getModelMatrix();
const glm::mat3 &getNormalMatrix();
protected:
std::shared_ptr<OpenGlShaderProgram> shaderprog;
glm::mat4 model_matrix;
glm::mat4 normal_matrix;
glm::mat3 normal_matrix;
};
#endif // OPENGLGRAPHICS_H

1
include/opengl-playground/openglshader.hpp
View File

@@ -21,6 +21,7 @@ class OpenGlShaderProgram
void setUniformVec2(const std::string &uniform, float *vector);
void setUniformVec3(const std::string &uniform, const glm::vec3 &vector);
void setUniformMat4(const std::string &uniform, const glm::mat4 &matrix);
void setUniformMat3(const std::string &uniform, const glm::mat3 &matrix);
void setUniformVec4(const std::string &uniform, const glm::vec4 &vector);
void setUniformBool(const std::string &uniform, bool value);
private: