diff --git a/widgets/glWidget/QtBaseViewer.cc b/widgets/glWidget/QtBaseViewer.cc index 6a54c93e3182a4194229df92825bb0f27c422852..b57c759888d6e70bbbbfe8d9aed6cff34abb9ce6 100644 --- a/widgets/glWidget/QtBaseViewer.cc +++ b/widgets/glWidget/QtBaseViewer.cc @@ -537,9 +537,10 @@ void glViewer::drawScene() if (stereo_) drawScene_stereo(); else drawScene_mono(); - glFinish(); frame_time_ = timer.elapsed(); + + } @@ -576,6 +577,8 @@ void glViewer::drawScene_mono() glEnable(GL_LIGHTING); } } + + draw_lights(); } @@ -862,6 +865,42 @@ void glViewer::initializeGL() //----------------------------------------------------------------------------- +/** + * + */ +void glViewer::draw_lights() { +// makeCurrent(); +// // +// glMatrixMode(GL_MODELVIEW); +// glPushMatrix(); +// glLoadIdentity(); +// glMultMatrixd(light_matrix_.data()); +// +// std::cerr << "light_matrix_\n" << light_matrix_ << std::endl; +// // +// glPointSize(3); +// // +// glColor3f(1.0,1.0,1.0); +// // glDisable(GL_LIGHTING); +// // glDisable(GL_BLEND); +// glBegin(GL_LINES); +// glVertex3f(0.0, 0.0, -1000.0); +// glVertex3f(0.0, 0.0, 10000.0); +// glVertex3f(0.0, -1000.0,0.0); +// glVertex3f(0.0, 1000.0,0.0); +// glVertex3f(1000.0,0.0,0.0); +// glVertex3f(-1000.0,0.0,0.0); +// // glVertex3d(0.0, 0.0, 1.1); +// // glVertex3d(-1.0, 1.0, 0.8); +// // glVertex3d( 1.0, 1.0, 0.8); +// +// glEnd(); +// // glEnable(GL_LIGHTING); +// // glEnable(GL_BLEND); +// // +// glPopMatrix(); + +} void glViewer::update_lights() { @@ -2006,7 +2045,6 @@ void glViewer::applyProperties() { } void glViewer::slotPropertiesUpdated() { - std::cerr << "Properties updated" << std::endl; makeCurrent(); applyProperties(); updateGL(); diff --git a/widgets/glWidget/QtBaseViewer.hh b/widgets/glWidget/QtBaseViewer.hh index 2ea02cab92d57167467182c36358793d749d7c1f..2c3e6d240a1ae32346c92631d426ca2ed8e93f0c 100644 --- a/widgets/glWidget/QtBaseViewer.hh +++ b/widgets/glWidget/QtBaseViewer.hh @@ -231,6 +231,8 @@ public: /// update light position void update_lights(); + void draw_lights(); + /// copy current framebuffer to an QImage void copyToImage( QImage& _image, GLenum _buffer=GL_BACK) {