kotovalexarian
/
matabstrix
Archived
1
0
Fork 0
Code

Fix object translation

This commit is contained in:
Meoweg 2015-11-07 12:03:52 +00:00
parent d68cdc0e0e
commit 4f80eefda3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main.cpp
View File

@ -148,14 +148,15 @@ int main()
cube1->position.y = -4.0;
suzanne1 = new Object(*suzanne);
suzanne1->position.z = -1;
suzanne1->position.y = 2;
suzanne1->position.z = 2;
teapot1 = new Object(*teapot);
teapot1->position.x = -3.0;
teapot1->rotation.z = -45;
teapot1->position.x = -2.0;
teapot1->rotation.z = 45;
bunny1 = new Object(*bunny);
bunny1->position.x = 3.0;
bunny1->position.x = 2.0;
suzanne_tex = new Texture("/data/textures/suzanne.png");
bunny_tex = new Texture("/data/textures/bunny.png");
@ -336,7 +337,7 @@ void Model::draw() const
void Object::draw(const glm::mat4 &mvp) const
{
const glm::mat4 transform = glm::translate(mvp, -position)
const glm::mat4 transform = glm::translate(mvp, position)
* glm::rotate(glm::mat4(1.0f), glm::radians(rotation.x), glm::vec3(1.0f, 0.0f, 0.0f))
* glm::rotate(glm::mat4(1.0f), glm::radians(rotation.y), glm::vec3(0.0f, 1.0f, 0.0f))
* glm::rotate(glm::mat4(1.0f), glm::radians(rotation.z), glm::vec3(0.0f, 0.0f, 1.0f));