Skip to content
Snippets Groups Projects
Commit ebeb96d4 authored by Gilles Marckmann's avatar Gilles Marckmann
Browse files

Completion of implementation of camera and stereo in FLTK. Stereo does 

not work yet. Commented lines have been commit for CYAN/RED stereo but
this kind of stereo mode is not convincing.
parent eb889f79
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Fltk/extraDialogs.cpp
+ 3
− 1
View file @ ebeb96d4
...@@ -178,7 +178,9 @@ int meshSizeEditor() ...@@ -178,7 +178,9 @@ int meshSizeEditor()
if(editor->window->non_modal() && !editor->window->shown()) if(editor->window->non_modal() && !editor->window->shown())
editor->window->show(); // fix ordering editor->window->show(); // fix ordering
editor->window->show(); editor->window->show();
return 0; return 0;
return CTX::instance()->mesh.lcFactor;
} }
// Model chooser // Model chooser
......
Fltk/extraDialogs.h
+ 1
− 0
View file @ ebeb96d4
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
int arrowEditor(const char *title, double &a, double &b, double &c); int arrowEditor(const char *title, double &a, double &b, double &c);
int perspectiveEditor(); int perspectiveEditor();
int meshSizeEditor(); int meshSizeEditor();
int modelChooser(); int modelChooser();
std::string connectionChooser(); std::string connectionChooser();
std::string patternChooser(); std::string patternChooser();
......
Fltk/openglWindow.cpp
+ 182
− 29
View file @ ebeb96d4
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
static void lassoZoom(drawContext *ctx, mousePosition &click1, mousePosition &click2) static void lassoZoom(drawContext *ctx, mousePosition &click1, mousePosition &click2)
{ {
if(click1.win[0] == click2.win[0] || click1.win[1] == click2.win[1]) if(click1.win[0] == click2.win[0] || click1.win[1] == click2.win[1]) return;
return;
ctx->s[0] *= (double)ctx->viewport[2] / (click2.win[0] - click1.win[0]); ctx->s[0] *= (double)ctx->viewport[2] / (click2.win[0] - click1.win[0]);
ctx->s[1] *= (double)ctx->viewport[3] / (click2.win[1] - click1.win[1]); ctx->s[1] *= (double)ctx->viewport[3] / (click2.win[1] - click1.win[1]);
...@@ -36,6 +35,7 @@ static void lassoZoom(drawContext *ctx, mousePosition &click1, mousePosition &cl ...@@ -36,6 +35,7 @@ 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)
...@@ -198,9 +198,9 @@ void openglWindow::draw() ...@@ -198,9 +198,9 @@ void openglWindow::draw()
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){
Camera * cam= &(_ctx->camera); if(CTX::instance()->camera && !CTX::instance()->stereo ){
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);
...@@ -214,11 +214,112 @@ void openglWindow::draw() ...@@ -214,11 +214,112 @@ void openglWindow::draw()
gluLookAt(cam->position.x,cam->position.y,cam->position.z, gluLookAt(cam->position.x,cam->position.y,cam->position.z,
cam->target.x,cam->target.y,cam->target.z, cam->target.x,cam->target.y,cam->target.z,
cam->up.x,cam->up.y,cam->up.z); cam->up.x,cam->up.y,cam->up.z);
_ctx->draw3d();
_ctx->draw2d();
_drawScreenMessage();
_drawBorder();
// glPushMatrix();
} }
else if(CTX::instance()->stereo ){
if (!cam->on) cam->init();
cam->giveViewportDimension(_ctx->viewport[2],_ctx->viewport[3]);
// for RED/CYAN stereo pairs but not convincing
/*
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glClear(GL_ACCUM_BUFFER_BIT);
glColorMask(GL_FALSE,GL_TRUE,GL_TRUE,GL_TRUE);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
XYZ eye =cam->eyesep / 2.0* cam->right;
double left = - cam->screenratio * cam->wd2 - 0.5 * cam->eyesep * cam->ndfl;
double right = cam->screenratio * cam->wd2 - 0.5 * cam->eyesep * cam->ndfl;
double top = cam->wd2;
double bottom = - cam->wd2;
glFrustum(left,right,bottom,top,cam->near,cam->far);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
gluLookAt(cam->position.x+eye.x, cam->position.y+eye.y, cam->position.z+eye.z,
cam->target.x+eye.x, cam->target.y+eye.y, cam->target.z+eye.z,
cam->up.x, cam->up.y, cam->up.z);
_ctx->draw3d();
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE);
glAccum(GL_LOAD,1.0);
//left eye
glDrawBuffer(GL_BACK);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
left = - cam->screenratio * cam->wd2 + 0.5 * cam->eyesep * cam->ndfl;
right = cam->screenratio * cam->wd2 + 0.5 * cam->eyesep * cam->ndfl;
top = cam->wd2;
bottom = - cam->wd2;
glFrustum(left,right,bottom,top,cam->near,cam->far);
glColorMask(GL_TRUE,GL_FALSE,GL_FALSE,GL_TRUE);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
gluLookAt(cam->position.x-eye.x, cam->position.y-eye.y, cam->position.z-eye.z,
cam->target.x-eye.x, cam->target.y-eye.y, cam->target.z-eye.z,
cam->up.x, cam->up.y, cam->up.z);
_ctx->draw3d();
glColorMask(GL_TRUE,GL_TRUE,GL_TRUE,GL_TRUE);
glAccum(GL_ACCUM,1.0);
glAccum(GL_RETURN,1.0);
*/
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
//right eye
XYZ eye =cam->eyesep / 2.0* cam->right;
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
double left = - cam->screenratio * cam->wd2 - 0.5 * cam->eyesep * cam->ndfl;
double right = cam->screenratio * cam->wd2 - 0.5 * cam->eyesep * cam->ndfl;
double top = cam->wd2;
double bottom = - cam->wd2;
glFrustum(left,right,bottom,top,cam->near,cam->far);
glMatrixMode(GL_MODELVIEW);
glDrawBuffer(GL_BACK_RIGHT);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glLoadIdentity();
gluLookAt(cam->position.x+eye.x, cam->position.y+eye.y, cam->position.z+eye.z,
cam->target.x+eye.x, cam->target.y+eye.y, cam->target.z+eye.z,
cam->up.x, cam->up.y, cam->up.z);
_ctx->draw3d();
_ctx->draw2d();
//left eye
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
left = - cam->screenratio * cam->wd2 + 0.5 * cam->eyesep * cam->ndfl;
right = cam->screenratio * cam->wd2 + 0.5 * cam->eyesep * cam->ndfl;
top = cam->wd2;
bottom = - cam->wd2;
glFrustum(left,right,bottom,top,cam->near,cam->far);
glMatrixMode(GL_MODELVIEW);
glDrawBuffer(GL_BACK_LEFT);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glLoadIdentity();
gluLookAt(cam->position.x-eye.x, cam->position.y-eye.y, cam->position.z-eye.z,
cam->target.x-eye.x, cam->target.y-eye.y, cam->target.z-eye.z,
cam->up.x, cam->up.y, cam->up.z);
_ctx->draw3d();
_ctx->draw2d();
glPushMatrix();
}
else{
_ctx->draw3d(); _ctx->draw3d();
_ctx->draw2d(); _ctx->draw2d();
_drawScreenMessage(); _drawScreenMessage();
_drawBorder(); _drawBorder();
}
} }
_lock = false; _lock = false;
} }
...@@ -268,7 +369,29 @@ int openglWindow::handle(int event) ...@@ -268,7 +369,29 @@ int openglWindow::handle(int event)
_trySelectionXYWH[3] = (int)fabs(_click.win[1] - _curr.win[1]); _trySelectionXYWH[3] = (int)fabs(_click.win[1] - _curr.win[1]);
} }
else{ else{
lassoZoom(_ctx, _click, _curr);
if (CTX::instance()->camera){
Camera * cam= &(_ctx->camera);
double dy=fabs( -_click.win[1] + _curr.win[1] );
double dx=fabs( -_click.win[0] + _curr.win[0] ) ;
double factx = w()/ fabs(dx);
double facty = h()/ fabs(dy);
double fact=.8* std::min(factx, facty);
double x_med=( _click.win[0] + _curr.win[0])/2.;
double y_med=( _click.win[1] + _curr.win[1])/2.;
double theta_x =.96* cam->radians*( w()/2 - x_med )*2. /h() ;
double theta_y =.96* cam->radians*( h()/2 - y_med )*2. /h() ;
cam->moveRight(theta_x);
cam->moveUp(theta_y);
_ctx->camera.zoom(fact);
_ctx->camera.update();
redraw();
}
else{
lassoZoom(_ctx, _click, _curr);
}
} }
} }
else if(CTX::instance()->mouseSelection){ else if(CTX::instance()->mouseSelection){
...@@ -284,9 +407,10 @@ int openglWindow::handle(int event) ...@@ -284,9 +407,10 @@ int openglWindow::handle(int event)
(Fl::event_button() == 1 && Fl::event_state(FL_SHIFT))) { (Fl::event_button() == 1 && Fl::event_state(FL_SHIFT))) {
if(!lassoMode && Fl::event_state(FL_CTRL)) { if(!lassoMode && Fl::event_state(FL_CTRL)) {
// make zoom isotropic // make zoom isotropic
_ctx->s[1] = _ctx->s[0]; _ctx->s[1] = _ctx->s[0];
_ctx->s[2] = _ctx->s[0]; _ctx->s[2] = _ctx->s[0];
redraw(); redraw();
} }
else if(lassoMode) { else if(lassoMode) {
lassoMode = false; lassoMode = false;
...@@ -309,6 +433,7 @@ int openglWindow::handle(int event) ...@@ -309,6 +433,7 @@ int openglWindow::handle(int event)
_trySelectionXYWH[1] = (int)_curr.win[1]; _trySelectionXYWH[1] = (int)_curr.win[1];
_trySelectionXYWH[2] = 5; _trySelectionXYWH[2] = 5;
_trySelectionXYWH[3] = 5; _trySelectionXYWH[3] = 5;
} }
} }
else { else {
...@@ -327,7 +452,7 @@ int openglWindow::handle(int event) ...@@ -327,7 +452,7 @@ int openglWindow::handle(int event)
} }
_click.set(_ctx, Fl::event_x(), Fl::event_y()); _click.set(_ctx, Fl::event_x(), Fl::event_y());
_prev.set(_ctx, Fl::event_x(), Fl::event_y()); _prev.set(_ctx, Fl::event_x(), Fl::event_y());
FlGui::instance()->manip->update(); FlGui::instance()->manip->update();
return 1; return 1;
case FL_RELEASE: case FL_RELEASE:
...@@ -345,12 +470,19 @@ int openglWindow::handle(int event) ...@@ -345,12 +470,19 @@ int openglWindow::handle(int event)
{ {
double dy = Fl::event_dy(); double dy = Fl::event_dy();
double fact = (5. * CTX::instance()->zoomFactor * fabs(dy) + h()) / (double)h(); double fact = (5. * CTX::instance()->zoomFactor * fabs(dy) + h()) / (double)h();
_ctx->s[0] *= ((dy > 0) ? fact : 1./fact); if (CTX::instance()->camera){
_ctx->s[1] = _ctx->s[0]; fact= ((dy > 0) ? fact : 1./fact);
_ctx->s[2] = _ctx->s[0]; _ctx->camera.zoom(fact);
_prev.recenter(_ctx); _ctx->camera.update();
redraw(); redraw();
} }else{
_ctx->s[0] *= ((dy > 0) ? fact : 1./fact);
_ctx->s[1] = _ctx->s[0];
_ctx->s[2] = _ctx->s[0];
_prev.recenter(_ctx);
redraw();
}
}
FlGui::instance()->manip->update(); FlGui::instance()->manip->update();
return 1; return 1;
...@@ -390,23 +522,44 @@ int openglWindow::handle(int event) ...@@ -390,23 +522,44 @@ int openglWindow::handle(int event)
// but start point is the center of the homothety // but start point is the center of the homothety
else if(Fl::event_button() == 2 || else if(Fl::event_button() == 2 ||
(Fl::event_button() == 1 && Fl::event_state(FL_SHIFT))) { (Fl::event_button() == 1 && Fl::event_state(FL_SHIFT))) {
// zoom isotrop in camera mode
if (CTX::instance()->camera){
double dy= (int)_curr.win[1] - (int)_prev.win[1] ;
double fact =( CTX::instance()->zoomFactor * fabs(dy) +(double) h()) / (double)h();
fact= ((dy > 0) ? fact : 1./fact);
_ctx->camera.zoom(fact);
_ctx->camera.update();
redraw();
}
else{
// move in y greater than move in x // move in y greater than move in x
if(fabs(dy) > fabs(dx)) { if(fabs(dy) > fabs(dx)) {
double fact = (CTX::instance()->zoomFactor * fabs(dy) + h()) / (double)h(); double fact = (CTX::instance()->zoomFactor * fabs(dy) + h()) / (double)h();
_ctx->s[0] *= ((dy > 0) ? fact : 1./fact); _ctx->s[0] *= ((dy > 0) ? fact : 1./fact);
_ctx->s[1] = _ctx->s[0]; _ctx->s[1] = _ctx->s[0];
_ctx->s[2] = _ctx->s[0]; _ctx->s[2] = _ctx->s[0];
_click.recenter(_ctx); _click.recenter(_ctx);
} }
// trackball // trackball
else if(!CTX::instance()->useTrackball) else if(!CTX::instance()->useTrackball)
_ctx->r[2] += -180. * dx / (double)w(); _ctx->r[2] += -180. * dx / (double)w();
}
} }
// other case => translation // other case => translation
else { else {
_ctx->t[0] += (_curr.wnr[0] - _click.wnr[0]); if (CTX::instance()->camera){
_ctx->t[1] += (_curr.wnr[1] - _click.wnr[1]); Camera * cam= &(_ctx->camera);
_ctx->t[2] = 0.; double theta_x=cam->radians*( -(double)_prev.win[0]+ (double)_curr.win[0] )*2. /h() ;
double theta_y=cam->radians*( -(double)_prev.win[1]+ (double)_curr.win[1] )*2. /h() ;
cam->moveRight(theta_x);
cam->moveUp(theta_y);
}
else{
_ctx->t[0] += (_curr.wnr[0] - _click.wnr[0]);
_ctx->t[1] += (_curr.wnr[1] - _click.wnr[1]);
_ctx->t[2] = 0.;
}
} }
CTX::instance()->drawRotationCenter = 1; CTX::instance()->drawRotationCenter = 1;
if(CTX::instance()->fastRedraw) { if(CTX::instance()->fastRedraw) {
......
Graphics/Camera.cpp
+ 13
− 6
View file @ ebeb96d4
...@@ -26,7 +26,8 @@ void Camera::init(){ ...@@ -26,7 +26,8 @@ void Camera::init(){
near=0.1 ; near=0.1 ;
far=10000; far=10000;
eye_sep_ratio=.015; eye_sep_ratio=.015;
aperture = 40; // apparent angle of the screen height
aperture = 25;
focallength = 100.; focallength = 100.;
alongZ(); alongZ();
this->lookAtCg(); this->lookAtCg();
...@@ -73,8 +74,8 @@ void Camera::lookAtCg(){ ...@@ -73,8 +74,8 @@ void Camera::lookAtCg(){
double H=CTX::instance()->max[1]-CTX::instance()->min[1]; double H=CTX::instance()->max[1]-CTX::instance()->min[1];
double P=CTX::instance()->max[2]-CTX::instance()->min[2]; double P=CTX::instance()->max[2]-CTX::instance()->min[2];
Lc=sqrt(1.*W*W+1.*H*H+1.*P*P); Lc=sqrt(1.*W*W+1.*H*H+1.*P*P);
//distance=fabs(.5*Lc*4./3./tan(aperture*.01745329/2.)); distance=.8*fabs(.5*Lc*4./3./tan(aperture*.01745329/2.));
distance=Lc*1.45; //distance=Lc*1.45;
position=target-distance*view; position=target-distance*view;
this->update(); this->update();
focallength=distance; focallength=distance;
...@@ -100,7 +101,7 @@ void Camera::update() { ...@@ -100,7 +101,7 @@ void Camera::update() {
normalize(up); normalize(up);
normalize(right); normalize(right);
normalize(view); normalize(view);
radians = 0.0174532925 * aperture / 2; radians = 0.0174532925 * aperture / 2.;
wd2 = near * tan(radians); wd2 = near * tan(radians);
ndfl = near / focallength; ndfl = near / focallength;
} }
...@@ -135,7 +136,7 @@ void Camera::affiche() { ...@@ -135,7 +136,7 @@ void Camera::affiche() {
void Camera::moveRight(double theta) { void Camera::moveRight(double& theta) {
this->update(); this->update();
position=position-distance*tan(theta)*right; position=position-distance*tan(theta)*right;
target=position+distance*view; target=position+distance*view;
...@@ -143,7 +144,7 @@ void Camera::moveRight(double theta) { ...@@ -143,7 +144,7 @@ void Camera::moveRight(double theta) {
} }
void Camera::moveUp(double theta) { void Camera::moveUp(double& theta) {
this->update(); this->update();
position=position+distance*tan(theta)*up; position=position+distance*tan(theta)*up;
target=position+distance*view; target=position+distance*view;
...@@ -151,6 +152,12 @@ void Camera::moveUp(double theta) { ...@@ -151,6 +152,12 @@ void Camera::moveUp(double theta) {
} }
void Camera::zoom(double& factor) {
distance=fabs(1./factor*ref_distance);
position=target-distance*view;
}
void Camera::rotate(double* q) { void Camera::rotate(double* q) {
this->update(); this->update();
// rotation projection in global coordinates // rotation projection in global coordinates
......
Graphics/Camera.h
+ 3
− 2
View file @ ebeb96d4
...@@ -81,8 +81,9 @@ public: ...@@ -81,8 +81,9 @@ public:
void lookAtCg(); void lookAtCg();
void init(); void init();
void rotate(double* q); void rotate(double* q);
void moveRight(double theta); void moveRight(double& theta);
void moveUp(double theta); void moveUp(double& theta);
void zoom(double& factor);
void update(); void update();
void affiche(); void affiche();
void alongX(); void alongX();
......
Graphics/drawAxes.cpp
+ 6
− 0
View file @ ebeb96d4
...@@ -344,6 +344,12 @@ void drawContext::drawSmallAxes() ...@@ -344,6 +344,12 @@ void drawContext::drawSmallAxes()
double xx, xy, yx, yy , zx, zy; double xx, xy, yx, yy , zx, zy;
if (CTX::instance()->camera) { if (CTX::instance()->camera) {
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
gluLookAt(camera.position.x,camera.position.y,camera.position.z,
camera.target.x,camera.target.y,camera.target.z,
camera.up.x,camera.up.y,camera.up.z);
glPushMatrix();
glPopMatrix(); glPopMatrix();
float fvViewMatrix[16]; float fvViewMatrix[16];
glGetFloatv(GL_MODELVIEW_MATRIX, fvViewMatrix); glGetFloatv(GL_MODELVIEW_MATRIX, fvViewMatrix);
......
Graphics/drawContext.cpp
+ 7
− 12
View file @ ebeb96d4
...@@ -276,16 +276,11 @@ void drawContext::draw3d() ...@@ -276,16 +276,11 @@ void drawContext::draw3d()
initProjection(); initProjection();
initRenderModel(); initRenderModel();
if(CTX::instance()->camera) { if(!CTX::instance()->camera) initPosition();
drawAxes();
} drawGeom();
else{ drawMesh();
initPosition(); drawPost();
}
drawAxes();
drawGeom();
drawMesh();
drawPost();
} }
...@@ -460,7 +455,7 @@ void drawContext::initProjection(int xpick, int ypick, int wpick, int hpick) ...@@ -460,7 +455,7 @@ void drawContext::initProjection(int xpick, int ypick, int wpick, int hpick)
fabs(CTX::instance()->max[2])); fabs(CTX::instance()->max[2]));
if(zmax < CTX::instance()->lc) zmax = CTX::instance()->lc; if(zmax < CTX::instance()->lc) zmax = CTX::instance()->lc;
if (CTX::instance()->camera) { // if we use the new camera mode if (CTX::instance()->camera ) { // if we use the new camera mode
double clip_near, clip_far; double clip_near, clip_far;
clip_near = 0.75 * CTX::instance()->clipFactor * zmax; clip_near = 0.75 * CTX::instance()->clipFactor * zmax;
...@@ -488,7 +483,7 @@ void drawContext::initProjection(int xpick, int ypick, int wpick, int hpick) ...@@ -488,7 +483,7 @@ void drawContext::initProjection(int xpick, int ypick, int wpick, int hpick)
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
} }
else{ // if not in camera mode else if(!CTX::instance()->camera){ // if not in camera mode
double clip_near, clip_far; double clip_near, clip_far;
if(CTX::instance()->ortho) { if(CTX::instance()->ortho) {
......
demos/cube.geo
+ 1
− 0
View file @ ebeb96d4
...@@ -12,3 +12,4 @@ Plane Surface(6) = {5}; ...@@ -12,3 +12,4 @@ Plane Surface(6) = {5};
Extrude {0,0.0,1} { Extrude {0,0.0,1} {
Surface{6}; Surface{6};
} }
Show "*";
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment