diff --git a/Fltk/Opengl_Window.cpp b/Fltk/Opengl_Window.cpp index c736146fd838ca159e7c23f606580961b2cfd163..3f00be67a0f20218dbf79680a6b928672dff2ca7 100644 --- a/Fltk/Opengl_Window.cpp +++ b/Fltk/Opengl_Window.cpp @@ -1,4 +1,4 @@ -// $Id: Opengl_Window.cpp,v 1.54 2005-12-17 23:13:20 geuzaine Exp $ +// $Id: Opengl_Window.cpp,v 1.55 2005-12-18 18:10:46 geuzaine Exp $ // // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle // @@ -102,8 +102,6 @@ void myZoom(MousePosition &click1, MousePosition &click2) MousePosition tmp(click1); tmp.wnr[0] = 0.5 * (click1.wnr[0] + click2.wnr[0]); tmp.wnr[1] = 0.5 * (click1.wnr[1] + click2.wnr[1]); - tmp.t[0] = CTX.t[0]; - tmp.t[1] = CTX.t[1]; tmp.recenter(); InitPosition(); diff --git a/Graphics/Draw.cpp b/Graphics/Draw.cpp index d8226d81fda9f5832ecb9a2a0f976f7437e930fa..00b5e2c71e3a8ea0da3a4ae45102f11caffbf627 100644 --- a/Graphics/Draw.cpp +++ b/Graphics/Draw.cpp @@ -1,4 +1,4 @@ -// $Id: Draw.cpp,v 1.83 2005-12-17 22:28:16 geuzaine Exp $ +// $Id: Draw.cpp,v 1.84 2005-12-18 18:10:46 geuzaine Exp $ // // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle // @@ -170,6 +170,9 @@ void InitProjection(int x, int y) gluPickMatrix((GLdouble) x, (GLdouble) (CTX.viewport[3] - y), 5.0, 5.0, (GLint *) CTX.viewport); + // we should generalize the following for cases when the object is + // located far from the z=0 plane + double gradient_zdist, gradient_xyfact; if(CTX.ortho) { // setting up the near and far clipping planes so that the box is