s459315/GRK-2023
3
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes to models

Browse Source
This commit is contained in:
Aleksander Burkowski 2023-01-31 14:38:47 +01:00
parent 83da99812f
commit fe931a4e56
1 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/ex_9_1.hpp
View File

@ -332,49 +332,49 @@ void renderScene(GLFWwindow* window)
0.2, 0.2,
0.1 0.1
); );
//drawObjectPBR(models::potPlant, glm::mat4() * glm::scale(glm::vec3(0.2f)) * glm::translate(glm::vec3(-5.0f, 55.0f, -6.0f)), drawObjectPBR(models::potPlant, glm::mat4() * glm::scale(glm::vec3(0.2f)) * glm::translate(glm::vec3(-5.0f, 55.0f, -6.0f)),
// textures::potPlantTexture, textures::potPlantTexture,
// 1.0f, 1.0f,
// 0.2f 0.2f
//); );
//drawObjectPBR(models::officeChair, glm::mat4(), drawObjectPBR(models::officeChair, glm::mat4(),
// textures::officeChariTexture, textures::officeChariTexture,
// 0.2f, 0.2f,
// 0.0f 0.0f
//); );
//drawObjectPBR(models::lamp, glm::mat4() * glm::scale(glm::vec3(0.001f)), drawObjectPBR(models::lamp, glm::mat4() * glm::scale(glm::vec3(0.001f)),
// textures::lampTexture, textures::lampTexture,
// 0.3f, 0.3f,
// 0.0f 0.0f
//); );
//drawObjectPBR(models::door, glm::mat4(), drawObjectPBR(models::door, glm::mat4(),
// textures::doorTexture, textures::doorTexture,
// 0.4f, 0.4f,
// 0.0f 0.0f
//); );
//drawObjectPBR(models::desk, glm::mat4(), drawObjectPBR(models::desk, glm::mat4(),
// textures::deskTexture, textures::deskTexture,
// 0.4f, 0.4f,
// 0.0f 0.0f
//); );
//drawObjectPBR(models::ceilingLamp, glm::mat4(), drawObjectPBR(models::ceilingLamp, glm::mat4(),
// textures::ceilingLampTexture, textures::ceilingLampTexture,
// 0.2f, 0.2f,
// 0.0f 0.0f
//); );
//drawObjectPBR(models::bed, glm::mat4(), drawObjectPBR(models::bed, glm::mat4(),
// textures::bedTexture, textures::bedTexture,
// 0.3f, 0.3f,
// 0.0f 0.0f
//); );
//drawObjectPBR(models::windowFrame, glm::mat4(), drawObjectPBR(models::windowFrame, glm::mat4(),
// textures::windowFrameTexture, textures::windowFrameTexture,
// 0.2f, 0.2f,
// 0.0f); 0.0f);
//drawObjectPBR(models::bookShelf, glm::mat4() * glm::scale(glm::vec3(0.01)), drawObjectPBR(models::bookShelf, glm::mat4() * glm::scale(glm::vec3(0.01)),
// textures::bookShelfTexture, textures::bookShelfTexture,
// 0.4f, 0.4f,
// 0.1f); 0.1f);
glm::vec3 spaceshipSide = glm::normalize(glm::cross(spaceshipDir, glm::vec3(0.f, 1.f, 0.f))); 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)); glm::vec3 spaceshipUp = glm::normalize(glm::cross(spaceshipSide, spaceshipDir));