From 88c8c7105fd9f35716d2d53610ad8280f2465f13 Mon Sep 17 00:00:00 2001 From: Aleksander Burkowski Date: Tue, 31 Jan 2023 18:08:12 +0100 Subject: [PATCH] Lamp in place --- src/ex_9_1.hpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ex_9_1.hpp b/src/ex_9_1.hpp index 0c5a321..75a22ed 100644 --- a/src/ex_9_1.hpp +++ b/src/ex_9_1.hpp @@ -388,11 +388,13 @@ void renderScene(GLFWwindow* window) 0.2f, 0.0f ); - //drawObjectPBR(models::lamp, glm::mat4() * glm::scale(glm::vec3(0.001f)), - // textures::lampTexture, - // 0.3f, - // 0.0f - //); + model = glm::mat4(); + model = glm::translate(glm::vec3(-0.7f, 0.75f, -1.7f)) * glm::scale(glm::vec3(0.001f)); + drawObjectPBR(models::lamp, model, + textures::lampTexture, + 0.3f, + 0.0f + ); model = glm::mat4(1.0f) * glm::translate(glm::vec3(1.7f, 1.15f, 2.0f)); model = glm::rotate(model, glm::radians(90.0f), glm::vec3(0.0, 1.0, 0.0)) * glm::scale(glm::vec3(1.0f, 1.1f, 1.3f)); drawObjectPBR(models::door, model,