ada/csce441pine64backup
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Completed Lab 12.

Browse source
This commit is contained in:
Alex 2017-04-12 01:27:59 -05:00
parent c11fbbb5b0
commit 389c47b8b8
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
L12/src/main.cpp
View file

@ -213,21 +213,31 @@ void render()
// left: use p0 for position and q0 for orientation
// right: use p1 for position and q1 for orientation
glm::mat4 R1 = glm::toMat4(q0);
glm::mat4 R2 = glm::toMat4(q1);
glm::mat4 R3 = glm::toMat4(glm::normalize((1.0f - alpha)*q0 + alpha*q1));
// LEFT
MV->pushMatrix();
glUniformMatrix4fv(progNormal->getUniform("MV"), 1, GL_FALSE, glm::value_ptr(MV->topMatrix()));
MV->popMatrix();
MV->translate(p0 - center);
MV->multMatrix(R1);
glUniformMatrix4fv(progNormal->getUniform("MV"), 1, GL_FALSE, glm::value_ptr(MV->topMatrix()));
MV->popMatrix();
bunny->draw(progNormal);
// RIGHT
MV->pushMatrix();
glUniformMatrix4fv(progNormal->getUniform("MV"), 1, GL_FALSE, glm::value_ptr(MV->topMatrix()));
MV->translate(p1 - center);
MV->multMatrix(R2);
glUniformMatrix4fv(progNormal->getUniform("MV"), 1, GL_FALSE, glm::value_ptr(MV->topMatrix()));
MV->popMatrix();
bunny->draw(progNormal);
bunny->draw(progNormal);
// INTERPOLATED
MV->pushMatrix();
glUniformMatrix4fv(progNormal->getUniform("MV"), 1, GL_FALSE, glm::value_ptr(MV->topMatrix()));
MV->translate(((1 - alpha)*p0 + alpha*p1) - center);
MV->multMatrix(R3);
glUniformMatrix4fv(progNormal->getUniform("MV"), 1, GL_FALSE, glm::value_ptr(MV->topMatrix()));
MV->popMatrix();
bunny->draw(progNormal);