From 4ba3c3c6c70744987ee2ab901f5f3943e0deb725 Mon Sep 17 00:00:00 2001 From: Aleksander Burkowski Date: Tue, 31 Jan 2023 18:17:35 +0100 Subject: [PATCH] ceiling 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 75a22ed..7db39df 100644 --- a/src/ex_9_1.hpp +++ b/src/ex_9_1.hpp @@ -408,11 +408,13 @@ void renderScene(GLFWwindow* window) 0.4f, 0.0f ); - //drawObjectPBR(models::ceilingLamp, glm::mat4(), - // textures::ceilingLampTexture, - // 0.2f, - // 0.0f - //); + model = glm::mat4(1.0f); + model = glm::scale(glm::vec3(0.4f)) * glm::translate(glm::vec3(0.0f, 3.6f, 0.0f)); + drawObjectPBR(models::ceilingLamp, model, + textures::ceilingLampTexture, + 0.2f, + 0.0f + ); model = glm::mat4(1.0f) * glm::translate(glm::vec3(1.6f, 0.0f, -0.86f)) * glm::scale(glm::vec3(0.8f)); model = glm::rotate(model, glm::radians(270.0f), glm::vec3(0.0f, 1.0f, 0.0f)); drawObjectPBR(models::bed, model,