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

2
src/mesh.cpp
View File

@@ -47,7 +47,7 @@ void Mesh::render(const glm::mat4 &model_matrix, const glm::mat4 &normal_matrix)
{
this->shaderprog->use();
this->shaderprog->setUniformMat4("model_matrix", model_matrix);
this->shaderprog->setUniformMat4("normal_matrix", normal_matrix);
this->shaderprog->setUniformMat3("normal_matrix", normal_matrix);
this->shaderprog->setUniformMat4("projection_view_matrix", GlobalCanvasSettings::getPVMatrix());
this->shaderprog->setUniformVec3("camera_position", GlobalCanvasSettings::getCameraPosition());

8
src/openglgraphics.cpp
View File

@@ -1,7 +1,5 @@
#include <opengl-playground/openglgraphics.hpp>
OpenGlGraphics::OpenGlGraphics(std::shared_ptr<OpenGlShaderProgram>shader_prog)
{
this->shaderprog = shader_prog;
@@ -16,15 +14,15 @@ OpenGlGraphics::~OpenGlGraphics()
void OpenGlGraphics::setModelMatrix(const glm::mat4 &model_matrix)
{
this->model_matrix = model_matrix;
this->normal_matrix = glm::transpose(glm::inverse(model_matrix));
this->normal_matrix = glm::mat3(glm::transpose(glm::inverse(model_matrix)));
}
glm::mat4 OpenGlGraphics::getModelMatrix()
const glm::mat4 &OpenGlGraphics::getModelMatrix()
{
return this->model_matrix;
}
glm::mat4 OpenGlGraphics::getNormalMatrix()
const glm::mat3 &OpenGlGraphics::getNormalMatrix()
{
return this->normal_matrix;
}

8
src/openglshader.cpp
View File

@@ -200,6 +200,14 @@ void OpenGlShaderProgram::setUniformMat4(const std::string &uniform, const glm::
}
}
void OpenGlShaderProgram::setUniformMat3(const std::string &uniform, const glm::mat3 &matrix)
{
int loc = this->getUniformLoc(uniform);
if (loc >= 0) {
glUniformMatrix3fv(loc, 1, GL_FALSE, &matrix[0][0]);
}
}
void OpenGlShaderProgram::setUniformVec4(const std::string &uniform, const glm::vec4 &vector)
{
int loc = this->getUniformLoc(uniform);