Conjure/LOG750-LAB2
6
0
Fork 0
mirror of https://github.com/ConjureETS/LOG750-LAB2.git synced 2026-03-24 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor tweaks

Browse Source
This commit is contained in:
Dmitri K 2016-11-25 19:51:55 -05:00
parent 78935a18ae
commit e4b40b84bb
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
log750-lab.pro
View File

@ -53,7 +53,9 @@ HEADERS += QGLViewer/camera.h \
DISTFILES += src/shaders/basicShader.vert \ DISTFILES += src/shaders/basicShader.vert \
src/shaders/basicShader.frag \ 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 FORMS += QGLViewer/ImageInterface.ui mainwindow.ui

0
src/shaders/objShader.frag Normal file
View File

0
src/shaders/objShader.vert Normal file
View File

2
src/viewer/simpleViewer.cpp
View File

@ -720,7 +720,6 @@ void Viewer::visit(Cube &s)
glDrawArrays(GL_TRIANGLES, i*6, 6); glDrawArrays(GL_TRIANGLES, i*6, 6);
} }
delete faceColor; delete faceColor;
//glDrawArrays(GL_TRIANGLES, 0, 36);
} }
void Viewer::visit(Sphere &s) void Viewer::visit(Sphere &s)
@ -942,6 +941,7 @@ PickedGeom Viewer::pickGeom(int x, int y){
mapColorToPosition.clear(); mapColorToPosition.clear();
m_program->setUniformValue(m_isPickingModeLoc, false); m_program->setUniformValue(m_isPickingModeLoc, false);
isPickingActivated = false; isPickingActivated = false;
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
doneCurrent(); doneCurrent();
PickedGeom result = PickedGeom(); PickedGeom result = PickedGeom();