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

Lamp in place

Browse Source
This commit is contained in:
Aleksander Burkowski 2023-01-31 18:08:12 +01:00
parent 45c21133ba
commit 88c8c7105f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ex_9_1.hpp
View File

@ -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,