diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-04 22:07:32 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-04 22:07:32 (GMT) |
| commit | fdce8d15fc4a927d1a6a257783dde5054d9f3e7b (patch) | |
| tree | 6a779b50ef65474af9c539ad7d42268f7e760ae8 /src/glview.cc | |
| parent | cbabbaed700536b3a1f513fd5a07d25382cb137f (diff) | |
| parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
src/lexer.l
tests/CMakeLists.txt
Diffstat (limited to 'src/glview.cc')
| -rw-r--r-- | src/glview.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/glview.cc b/src/glview.cc index f25cac6..63573e3 100644 --- a/src/glview.cc +++ b/src/glview.cc @@ -154,9 +154,9 @@ void GLView::initializeGL() "Extensions:\n" "%s\n", glewGetString(GLEW_VERSION), + glGetString(GL_VERSION), glGetString(GL_RENDERER), glGetString(GL_VENDOR), - glGetString(GL_VERSION), rbits, gbits, bbits, abits, dbits, sbits, glGetString(GL_EXTENSIONS)); // FIXME: glGetString(GL_EXTENSIONS) is deprecated in OpenGL 3.0. @@ -500,10 +500,11 @@ void GLView::paintGL() // FIXME: This was an attempt to keep contrast with background, but is suboptimal // (e.g. nearly invisible against a gray background). - int r,g,b; - r=g=b=0; +// int r,g,b; +// r=g=b=0; // bgcol.getRgb(&r, &g, &b); - glColor3d((255.0-r)/255.0, (255.0-g)/255.0, (255.0-b)/255.0); +// glColor3f((255.0f-r)/255.0f, (255.0f-g)/255.0f, (255.0f-b)/255.0f); + glColor3f(0.0f, 0.0f, 0.0f); glBegin(GL_LINES); // X Label glVertex3d(xlabel_x-3, xlabel_y-3, 0); glVertex3d(xlabel_x+3, xlabel_y+3, 0); |