summaryrefslogtreecommitdiff
path: root/src/glview.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2010-11-08 03:54:08 (GMT)
committerMarius Kintel <marius@kintel.net>2010-11-08 03:54:08 (GMT)
commit10b411f2a1eb0eeb241f5064555ed2018a6cfb47 (patch)
treea85ca0d34750fef2273a1bd0b83d5ac7167f1d96 /src/glview.cc
parent4dbae0e7f2fde2403ca5cd634ccf0fe2355b249c (diff)
Cosmetics, temporarily disabled preferences in GLView
Diffstat (limited to 'src/glview.cc')
-rw-r--r--src/glview.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/glview.cc b/src/glview.cc
index d51714b..e51f31f 100644
--- a/src/glview.cc
+++ b/src/glview.cc
@@ -24,7 +24,8 @@
*/
#include "GLView.h"
-#include "Preferences.h"
+// FIXME: Reenable/rewrite - don't be dependant on GUI
+//#include "Preferences.h"
#include <QApplication>
#include <QWheelEvent>
@@ -215,7 +216,9 @@ void GLView::resizeGL(int w, int h)
void GLView::paintGL()
{
- const QColor &bgcol = Preferences::inst()->color(Preferences::BACKGROUND_COLOR);
+// FIXME: Reenable/rewrite - don't be dependant on GUI
+// const QColor &bgcol = Preferences::inst()->color(Preferences::BACKGROUND_COLOR);
+ const QColor &bgcol = QColor(0xff, 0xff, 0xe5);
glClearColor(bgcol.redF(), bgcol.greenF(), bgcol.blueF(), 0.0);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
@@ -258,7 +261,8 @@ void GLView::paintGL()
if (showcrosshairs)
{
glLineWidth(3);
- const QColor &col = Preferences::inst()->color(Preferences::CROSSHAIR_COLOR);
+// const QColor &col = Preferences::inst()->color(Preferences::CROSSHAIR_COLOR);
+ const QColor &col = QColor(0x80, 0x00, 0x00);
glColor3f(col.redF(), col.greenF(), col.blueF());
glBegin(GL_LINES);
for (double xf = -1; xf <= +1; xf += 2)
contact: Jan Huwald // Impressum