From d75b41184fb0d240667b11d0b4b88fb1ac9caa97 Mon Sep 17 00:00:00 2001 From: izenynn Date: Thu, 20 Feb 2025 14:56:44 +0100 Subject: [PATCH] feat: practica1 done --- .../Debug/Practica3D.tlog/CL.command.1.tlog | Bin 3786 -> 3786 bytes .../x64/Debug/Practica3D.tlog/CL.read.1.tlog | Bin 151758 -> 158078 bytes .../x64/Debug/Practica3D.tlog/CL.write.1.tlog | Bin 6788 -> 7200 bytes .../Debug/Practica3D.tlog/link.read.1.tlog | Bin 5400 -> 4950 bytes project/x64/Debug/ugine3d.log | 1 - src/buffer.cpp | 3 +- src/main.cpp | 31 ++++++++++-------- src/shader.cpp | 1 + 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/project/x64/Debug/Practica3D.tlog/CL.command.1.tlog b/project/x64/Debug/Practica3D.tlog/CL.command.1.tlog index 249d67ac298ea0f0c0267a372e683095401ce0d2..9b389671f43aa256e147305aa6bd16a304b44015 100644 GIT binary patch delta 26 icmX>ldrEeL4cp`c+!CApI3F=>wqg6lwAp}X783xA&k3Ob delta 26 icmX>ldrEeL4cp`c+!CApI3F=>wqg6lwAp}X783xA&k3Ob diff --git a/project/x64/Debug/Practica3D.tlog/CL.read.1.tlog b/project/x64/Debug/Practica3D.tlog/CL.read.1.tlog index e1f513538f9a7259a104696b06d67edc39985e27..dbae3fbc6ce9f4da254a61ce10bd357a3dc0b9c3 100644 GIT binary patch delta 102 zcmV-s0Ga>Jp$Y!d39wwMmyAyW4wGa+V3&+f0^YYkCjoYolU%AEx6rx)gaMQO0Z5Zh zKnRmust&W*s>FJi;9&sm*BYp8kZop0kF54!T}BgmnP%^$hWql0oW0f1gcoK Iwz>frmN4TjX#fBK delta 49 zcmex&iSyh-&J8iErVBVS@=e#VXB3$1Q06h&&w*n*P~=k8^ka665u0OH9h$N|?J}dp FGyv$o6T<)i diff --git a/project/x64/Debug/Practica3D.tlog/CL.write.1.tlog b/project/x64/Debug/Practica3D.tlog/CL.write.1.tlog index ea6e4838c7fc329a19094dbc81a45625474e22ef..929fd60cb04d1ccfb7d6696de1ce0b64299608c9 100644 GIT binary patch delta 62 zcmZoMU0^Zc*yMFw0-Jr9HwjM`5RTY9z+JQ1gSidN*?fj+kKp76iJr-N0uhrRh%5lpXP5*a ID(Zwq01;OgbpQYW diff --git a/project/x64/Debug/Practica3D.tlog/link.read.1.tlog b/project/x64/Debug/Practica3D.tlog/link.read.1.tlog index c6fb7b363726dccb9755fbd8bb4253634a3be76c..098e912ff9d259929b036b00d0d324e1eefbf1e5 100644 GIT binary patch delta 19 bcmbQCbxm!<6`{#%m^>zL;8vN;Bq{~~Q;P=> delta 145 zcmcbnHbZN}6`{!o*rX C:\Users\rabil\git\utad-programacion3d\project\x64\Debug\Practica3D.exe diff --git a/src/buffer.cpp b/src/buffer.cpp index 7d51f1c..1e53907 100644 --- a/src/buffer.cpp +++ b/src/buffer.cpp @@ -1,6 +1,7 @@ #include "buffer.h" #include +#include #include "../lib/glew/GL/glew.h" #include "../lib/glfw/glfw3.h" @@ -9,7 +10,7 @@ Buffer::Buffer(const std::vector& vertices, const std::vector& indices) { - index_count_ = indices.size(); + index_count_ = static_cast(indices.size()); glGenVertexArrays(1, &vao_); glGenBuffers(1, &vbo_); diff --git a/src/main.cpp b/src/main.cpp index 617f07f..3fe5037 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -56,9 +56,9 @@ int main() { // Logic std::vector vertices = { - {{-0.5f, -0.5f, 0.0f}}, - {{0.5f, -0.5f, 0.0f}}, - {{0.0f, 0.5f, 0.0f}} + {{0.0f, 0.5f, 0.0f}, {0.0f, 1.0f, 0.0f}}, + {{-0.5f, -0.5f, 0.0f}, {0.0f, 0.0f, 1.0f}}, + {{0.5f, -0.5f, 0.0f}, {1.0f, 0.0f, 0.0f}} }; std::vector indices = { 0, 1, 2 }; @@ -69,21 +69,23 @@ int main() { } glm::mat4 projection = glm::perspective(glm::radians(45.0f), static_cast(SCREEN_WIDTH) / SCREEN_HEIGHT, 0.1f, 100.0f); - glm::mat4 view = glm::translate(glm::mat4(1.0f), glm::vec3(0, 0, 6)); + //glm::mat4 view = glm::translate(glm::mat4(1.0f), glm::vec3(0, 0, 6)); + glm::mat4 view = glm::lookAt(glm::vec3(0, 0, 6), glm::vec3(0, 0, 0), glm::vec3(0, 1, 0)); // main loop - double angle = 0; + double angle = 0.0; double lastTime = glfwGetTime(); while (!glfwWindowShouldClose(win) && !glfwGetKey(win, GLFW_KEY_ESCAPE)) { // Delta double delta_time = glfwGetTime() - lastTime; + lastTime = glfwGetTime(); // Reset window int screenWidth, screenHeight; glfwGetWindowSize(win, &screenWidth, &screenHeight); glViewport(0, 0, screenWidth, screenHeight); - glClearColor(0.3f, 0.3f, 0.3f, 1.0f); + glClearColor(0.1f, 0.1f, 0.1f, 1.0f); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); shader.Use(); @@ -91,21 +93,22 @@ int main() { // Logic angle += 32.0 * delta_time; - glm::mat4 model = glm::translate(glm::mat4(1.0), glm::vec3(-3.0f + 0.0f * 3.0f, 0.0f, -0.0f * 3.0f)); - model = glm::rotate(model, glm::radians(static_cast(angle)), glm::vec3(0, 1, 0)); + for (int row = 0; row < 3; ++row) { + for (int col = 0; col < 3; ++col) { + glm::mat4 model = glm::translate(glm::mat4(1.0), glm::vec3(-3.0f + static_cast(col) * 3.0f, 0.0f, static_cast(-row) * 3.0f)); + model = glm::rotate(model, glm::radians(static_cast(angle)), glm::vec3(0, 1, 0)); - glm::mat4 mvp = projection * view * model; + glm::mat4 mvp = projection * view * model; - Shader::setMat4(shader.getLocation("mvp"), mvp); + Shader::setMat4(shader.getLocation("mvp"), mvp); - buffer.Draw(shader); + buffer.Draw(shader); + } + } // Refresh screen glfwSwapBuffers(win); glfwPollEvents(); - - // Delta - lastTime = glfwGetTime(); } // Shutdown diff --git a/src/shader.cpp b/src/shader.cpp index a4b07d6..e9452b4 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -112,6 +112,7 @@ std::string Shader::ReadShaderFile(const std::string& filename) uint32_t Shader::CompileShader(uint32_t type, const std::string& source_path) { std::string source = ReadShaderFile(source_path); + //std::cout << "SHADER FILE: " << source << "\n"; if (source.empty()) return 0;