From e4b40b84bb86792b040f95e04e27f079fbf8e26b Mon Sep 17 00:00:00 2001 From: Dmitri K Date: Fri, 25 Nov 2016 19:51:55 -0500 Subject: [PATCH] minor tweaks --- log750-lab.pro | 4 +++- src/shaders/objShader.frag | 0 src/shaders/objShader.vert | 0 src/viewer/simpleViewer.cpp | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 src/shaders/objShader.frag create mode 100644 src/shaders/objShader.vert diff --git a/log750-lab.pro b/log750-lab.pro index 5fe1341..5699035 100644 --- a/log750-lab.pro +++ b/log750-lab.pro @@ -53,7 +53,9 @@ HEADERS += QGLViewer/camera.h \ DISTFILES += src/shaders/basicShader.vert \ src/shaders/basicShader.frag \ - src/data/skybox.jpg + src/data/skybox.jpg \ + src/shaders/objShader.frag \ + src/shaders/objShader.vert FORMS += QGLViewer/ImageInterface.ui mainwindow.ui diff --git a/src/shaders/objShader.frag b/src/shaders/objShader.frag new file mode 100644 index 0000000..e69de29 diff --git a/src/shaders/objShader.vert b/src/shaders/objShader.vert new file mode 100644 index 0000000..e69de29 diff --git a/src/viewer/simpleViewer.cpp b/src/viewer/simpleViewer.cpp index ee1135a..d8fb399 100644 --- a/src/viewer/simpleViewer.cpp +++ b/src/viewer/simpleViewer.cpp @@ -720,7 +720,6 @@ void Viewer::visit(Cube &s) glDrawArrays(GL_TRIANGLES, i*6, 6); } delete faceColor; - //glDrawArrays(GL_TRIANGLES, 0, 36); } void Viewer::visit(Sphere &s) @@ -942,6 +941,7 @@ PickedGeom Viewer::pickGeom(int x, int y){ mapColorToPosition.clear(); m_program->setUniformValue(m_isPickingModeLoc, false); isPickingActivated = false; + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); doneCurrent(); PickedGeom result = PickedGeom();