From 608172b640539338f525cf951a9222a3a77dce9e Mon Sep 17 00:00:00 2001 From: Dmitri K Date: Thu, 10 Nov 2016 23:46:10 -0500 Subject: [PATCH] i give up --- src/viewer/simpleViewer.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/viewer/simpleViewer.cpp b/src/viewer/simpleViewer.cpp index f89297f..819d1b7 100644 --- a/src/viewer/simpleViewer.cpp +++ b/src/viewer/simpleViewer.cpp @@ -200,8 +200,6 @@ void Viewer::deselect(){ } void Viewer::mouseReleaseEvent(QMouseEvent* e) { - m_program->bind(); - m_program->setUniformValue(m_isPickingModeLoc, false); //cout << "Viewer::mouseReleaseEvent(QMouseEvent* e)" << endl; //m_program->setUniformValue(m_isPickingModeLoc, false); QGLViewer::mouseReleaseEvent(e); @@ -603,13 +601,13 @@ void Viewer::visit(Cube &s) m_program->setUniformValue(m_isSkyLoc, false); m_program->setUniformValue(m_mvMatrixLocation, modelViewMatrix); m_program->setUniformValue(m_normalMatrixLoc, modelViewMatrix.normalMatrix()); - m_program->setUniformValue(m_colorLocation, *(new QColor(255, 255, 0))); + m_program->setUniformValue(m_colorLocation, *(new QColor(s.getColor().rgb()+i))); m_program->setUniformValue(m_drawTextLoc, true); m_program->setUniformValue(m_isLightLoc, false); - //glDrawArrays(GL_TRIANGLES, i*6, 6); + glDrawArrays(GL_TRIANGLES, i*6, 6); } - glDrawArrays(GL_TRIANGLES, 0, 36); + //glDrawArrays(GL_TRIANGLES, 0, 36); } @@ -723,9 +721,6 @@ Shape* Viewer::pickGeom(int x, int y){ } } - glFlush(); - drawSkybox(); - modelStack.pop(); draw(); glFinish(); @@ -750,8 +745,8 @@ Shape* Viewer::pickGeom(int x, int y){ std::cout << "Picked Color: " << pickedColor->red() << " " << pickedColor->green() << " " << pickedColor->blue() << " " << pickedColor->alpha() << endl; std::cout << "Picked Shape: " << pickedShape << endl; - //m_program->setUniformValue(m_isPickingModeLoc, false); - //isPickingActivated = false; - + m_program->setUniformValue(m_isPickingModeLoc, false); + isPickingActivated = false; + update(); return pickedShape; }