lauchmelder/OpenGL-utility
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Model is now transformable

Browse source
This commit is contained in:
Robert 2021-01-30 04:23:10 +01:00
parent 8c62929e3c
commit 9a40f89fe8
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/model/main.cpp
View file

@ -131,7 +131,7 @@ int main(int argc, char** argv)
flashlight.linear = 0.022f; flashlight.linear = 0.022f;
flashlight.quadratic = 0.0019f; flashlight.quadratic = 0.0019f;
flashlight.angle = 18.0f; flashlight.angle = 18.0f;
flashlight.outerAngle = 25.0f; flashlight.outerAngle = 24.9f;
while (!glfwWindowShouldClose(window)) while (!glfwWindowShouldClose(window))
{ {
@ -143,6 +143,8 @@ int main(int argc, char** argv)
shader->Use(); shader->Use();
shader->SetUniformMatrix3fv("normal", 1, GL_FALSE, glm::value_ptr(model.GetNormalMatrix()));
shader->SetUniformMatrix4fv("model", 1, GL_FALSE, glm::value_ptr(model.GetMatrix()));
shader->SetUniformMatrix4fv("view", 1, GL_FALSE, glm::value_ptr(camera.GetMatrix())); shader->SetUniformMatrix4fv("view", 1, GL_FALSE, glm::value_ptr(camera.GetMatrix()));
shader->SetUniformMatrix4fv("projection", 1, GL_FALSE, glm::value_ptr(camera.GetProjection())); shader->SetUniformMatrix4fv("projection", 1, GL_FALSE, glm::value_ptr(camera.GetProjection()));
@ -155,6 +157,8 @@ int main(int argc, char** argv)
shader->SetUniform("flashlight.quadratic", flashlight.quadratic); shader->SetUniform("flashlight.quadratic", flashlight.quadratic);
model.Render(shader); model.Render(shader);
model.Rotate(1.0f, glm::vec3(0.0f, 1.0f, 0.0f));
glfwSwapBuffers(window); glfwSwapBuffers(window);
glfwPollEvents(); glfwPollEvents();

8
examples/model/shaders/vertexShader.vert
View file

@ -8,14 +8,16 @@ out vec3 oNormal;
out vec2 oUV; out vec2 oUV;
out vec3 oFragPos; out vec3 oFragPos;
uniform mat3 normal;
uniform mat4 model;
uniform mat4 view; uniform mat4 view;
uniform mat4 projection; uniform mat4 projection;
void main() void main()
{ {
oNormal = aNormal; oNormal = normal * aNormal;
oUV = aUV; oUV = aUV;
gl_Position = projection * view * vec4(aPos, 1.0); gl_Position = projection * view * model * vec4(aPos, 1.0);
oFragPos = aPos; oFragPos = vec3(model * vec4(aPos, 1.0));
} }

3
include/model/model.hpp
View file

@ -5,13 +5,14 @@
#include <core.hpp> #include <core.hpp>
#include <shader.hpp> #include <shader.hpp>
#include <object.hpp>
#include <model/mesh.hpp> #include <model/mesh.hpp>
#include <assimp/scene.h> #include <assimp/scene.h>
namespace oglu namespace oglu
{ {
class OGLU_API Model class OGLU_API Model : public Transformable
{ {
public: public:
Model(const std::string& path); Model(const std::string& path);