From 45c21133bac3ba9d585c153c7abce1ad9d113b7a Mon Sep 17 00:00:00 2001 From: Aleksander Burkowski Date: Tue, 31 Jan 2023 17:06:03 +0100 Subject: [PATCH] Chair in place --- src/ex_9_1.hpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/ex_9_1.hpp b/src/ex_9_1.hpp index d41a58d..0c5a321 100644 --- a/src/ex_9_1.hpp +++ b/src/ex_9_1.hpp @@ -380,11 +380,14 @@ void renderScene(GLFWwindow* window) // 1.0f, // 0.2f //); - //drawObjectPBR(models::officeChair, glm::mat4(), - // textures::officeChariTexture, - // 0.2f, - // 0.0f - //); + model = glm::mat4(1.0f); + model = glm::scale(glm::vec3(0.5f)) * glm::translate(glm::vec3(-2.65f, 0.0f, -1.65f)); + model = glm::rotate(model, glm::radians(180.0f), glm::vec3(0, 1, 0)); + drawObjectPBR(models::officeChair, model, + textures::officeChariTexture, + 0.2f, + 0.0f + ); //drawObjectPBR(models::lamp, glm::mat4() * glm::scale(glm::vec3(0.001f)), // textures::lampTexture, // 0.3f, @@ -415,10 +418,6 @@ void renderScene(GLFWwindow* window) 0.3f, 0.0f ); - //drawObjectPBR(models::windowFrame, glm::mat4(), - // textures::windowFrameTexture, - // 0.2f, - // 0.0f); //drawObjectPBR(models::bookShelf, glm::mat4() * glm::scale(glm::vec3(0.01)), // textures::bookShelfTexture, // 0.4f,