Skip to content
Snippets Groups Projects
Commit 0d2f16c0 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix bg color

parent a6a935f1
No related branches found
No related tags found
No related merge requests found
...@@ -35,7 +35,6 @@ static void lassoZoom(drawContext *ctx, mousePosition &click1, mousePosition &cl ...@@ -35,7 +35,6 @@ static void lassoZoom(drawContext *ctx, mousePosition &click1, mousePosition &cl
ctx->initPosition(); ctx->initPosition();
drawContext::global()->draw(); drawContext::global()->draw();
FlGui::instance()->manip->update(); FlGui::instance()->manip->update();
} }
openglWindow::openglWindow(int x, int y, int w, int h, const char *l) openglWindow::openglWindow(int x, int y, int w, int h, const char *l)
...@@ -190,17 +189,15 @@ void openglWindow::draw() ...@@ -190,17 +189,15 @@ void openglWindow::draw()
} }
else{ else{
// draw the whole scene // draw the whole scene
/*
glClearColor glClearColor
((GLclampf)(CTX::instance()->unpackRed(CTX::instance()->color.bg) / 255.), ((GLclampf)(CTX::instance()->unpackRed(CTX::instance()->color.bg) / 255.),
(GLclampf)(CTX::instance()->unpackGreen(CTX::instance()->color.bg) / 255.), (GLclampf)(CTX::instance()->unpackGreen(CTX::instance()->color.bg) / 255.),
(GLclampf)(CTX::instance()->unpackBlue(CTX::instance()->color.bg) / 255.), (GLclampf)(CTX::instance()->unpackBlue(CTX::instance()->color.bg) / 255.),
0.0F); 0.0F);
*/
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT); glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
Camera * cam= &(_ctx->camera);
if(CTX::instance()->camera && !CTX::instance()->stereo){ if(CTX::instance()->camera && !CTX::instance()->stereo){
Camera *cam = &(_ctx->camera);
if (!cam->on) cam->init(); if (!cam->on) cam->init();
cam->giveViewportDimension(_ctx->viewport[2],_ctx->viewport[3]); cam->giveViewportDimension(_ctx->viewport[2],_ctx->viewport[3]);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
...@@ -220,11 +217,8 @@ void openglWindow::draw() ...@@ -220,11 +217,8 @@ void openglWindow::draw()
_drawBorder(); _drawBorder();
// glPushMatrix(); // glPushMatrix();
} }
else if(CTX::instance()->stereo){ else if(CTX::instance()->stereo){
Camera *cam = &(_ctx->camera);
if (!cam->on) cam->init(); if (!cam->on) cam->init();
cam->giveViewportDimension(_ctx->viewport[2],_ctx->viewport[3]); cam->giveViewportDimension(_ctx->viewport[2],_ctx->viewport[3]);
...@@ -271,7 +265,6 @@ void openglWindow::draw() ...@@ -271,7 +265,6 @@ void openglWindow::draw()
glAccum(GL_RETURN,1.0); glAccum(GL_RETURN,1.0);
*/ */
//right eye //right eye
XYZ eye = cam->eyesep / 2.0* cam->right; XYZ eye = cam->eyesep / 2.0* cam->right;
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
...@@ -313,7 +306,6 @@ void openglWindow::draw() ...@@ -313,7 +306,6 @@ void openglWindow::draw()
_ctx->draw2d(); _ctx->draw2d();
_drawScreenMessage(); _drawScreenMessage();
_drawBorder(); _drawBorder();
} }
else{ else{
_ctx->draw3d(); _ctx->draw3d();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment