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

Reworked transformable

Browse source
This commit is contained in:
Robert 2021-01-23 16:23:49 +01:00
parent 3e6884356f
commit a17c73d3c9
7 changed files with 177 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/debug/CMakeLists.txt
View file

@ -1,4 +1,4 @@
add_executable(debug "main.cpp")
add_executable(debug "main.cpp" "shaders/fragmentShader.frag" "shaders/vertexShader.vert")
find_package(glfw3 REQUIRED)

17
examples/debug/main.cpp
View file

@ -86,13 +86,11 @@ int main(int argc, char** argv)
oglu::Texture crate = oglu::MakeTexture("assets/crate.jpg");
oglu::Texture opengl = oglu::MakeTexture("assets/opengl.png");
glm::mat4 view = glm::mat4(1.0f);
view = glm::translate(view, glm::vec3(0.0f, 0.0f, -5.0f));
glm::mat4 projection;
projection = glm::perspective(glm::radians(45.f), 1.0f, 0.1f, 100.0f);
oglu::Camera camera;
camera.Move(0.0f, 0.0f, -5.0f);
// Window loop
float t = 0.0f;
while (!glfwWindowShouldClose(window))
{
processInput(window);
@ -101,15 +99,14 @@ int main(int argc, char** argv)
square.Rotate(6.0f, 0.0f, 0.0f);
square2.Rotate(-6.0f, 0.0f, 0.0f);
view = glm::rotate(view, glm::radians(1.0f), glm::vec3(0.0f, 1.0f, 0.0f));
camera.Rotate(0.0f, 1.0f, 0.0f);
shader->Use();
shader->SetUniform("texture1", crate, 0);
shader->SetUniform("texture2", opengl, 1);
shader->SetUniform("model", square);
shader->SetUniformMatrix4fv("view", 1, GL_FALSE, glm::value_ptr(view));
shader->SetUniformMatrix4fv("projection", 1, GL_FALSE, glm::value_ptr(projection));
shader->SetUniform("view", camera);
shader->SetUniformMatrix4fv("projection", 1, GL_FALSE, camera.GetProjectionMatrix());
square.Render();
@ -118,6 +115,8 @@ int main(int argc, char** argv)
glfwSwapBuffers(window);
glfwPollEvents();
t += 0.1f;
}
glfwTerminate();