diff --git a/src/ex_9_1.hpp b/src/ex_9_1.hpp index 6689b21..f907fe8 100644 --- a/src/ex_9_1.hpp +++ b/src/ex_9_1.hpp @@ -332,49 +332,49 @@ void renderScene(GLFWwindow* window) 0.2, 0.1 ); - //drawObjectPBR(models::potPlant, glm::mat4() * glm::scale(glm::vec3(0.2f)) * glm::translate(glm::vec3(-5.0f, 55.0f, -6.0f)), - // textures::potPlantTexture, - // 1.0f, - // 0.2f - //); - //drawObjectPBR(models::officeChair, glm::mat4(), - // textures::officeChariTexture, - // 0.2f, - // 0.0f - //); - //drawObjectPBR(models::lamp, glm::mat4() * glm::scale(glm::vec3(0.001f)), - // textures::lampTexture, - // 0.3f, - // 0.0f - //); - //drawObjectPBR(models::door, glm::mat4(), - // textures::doorTexture, - // 0.4f, - // 0.0f - //); - //drawObjectPBR(models::desk, glm::mat4(), - // textures::deskTexture, - // 0.4f, - // 0.0f - //); - //drawObjectPBR(models::ceilingLamp, glm::mat4(), - // textures::ceilingLampTexture, - // 0.2f, - // 0.0f - //); - //drawObjectPBR(models::bed, glm::mat4(), - // textures::bedTexture, - // 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, - // 0.1f); + drawObjectPBR(models::potPlant, glm::mat4() * glm::scale(glm::vec3(0.2f)) * glm::translate(glm::vec3(-5.0f, 55.0f, -6.0f)), + textures::potPlantTexture, + 1.0f, + 0.2f + ); + drawObjectPBR(models::officeChair, glm::mat4(), + textures::officeChariTexture, + 0.2f, + 0.0f + ); + drawObjectPBR(models::lamp, glm::mat4() * glm::scale(glm::vec3(0.001f)), + textures::lampTexture, + 0.3f, + 0.0f + ); + drawObjectPBR(models::door, glm::mat4(), + textures::doorTexture, + 0.4f, + 0.0f + ); + drawObjectPBR(models::desk, glm::mat4(), + textures::deskTexture, + 0.4f, + 0.0f + ); + drawObjectPBR(models::ceilingLamp, glm::mat4(), + textures::ceilingLampTexture, + 0.2f, + 0.0f + ); + drawObjectPBR(models::bed, glm::mat4(), + textures::bedTexture, + 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, + 0.1f); glm::vec3 spaceshipSide = glm::normalize(glm::cross(spaceshipDir, glm::vec3(0.f, 1.f, 0.f))); glm::vec3 spaceshipUp = glm::normalize(glm::cross(spaceshipSide, spaceshipDir));