From bc0d1a5f2bc8c4a7c94cbc677edde51444d7d511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Fri, 30 Jan 2009 14:52:39 +0000
Subject: [PATCH] Removed debug output
git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@4547 383ad7c9-94d9-4d36-a494-682f7c89f535
---
widgets/glWidget/QtBaseViewer.cc | 42 ++++++++++++++++++++++++++++++--
widgets/glWidget/QtBaseViewer.hh | 2 ++
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/widgets/glWidget/QtBaseViewer.cc b/widgets/glWidget/QtBaseViewer.cc
index 6a54c93e..b57c7598 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 2ea02cab..2c3e6d24 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) {
--
GitLab