| -rw-r--r-- | src/controller/actions/set_ortho.c | 13 | ||||
| -rw-r--r-- | src/controller/actions/zoom.c | 70 | ||||
| -rw-r--r-- | src/controller/actions/zoom.h | 4 | ||||
| -rw-r--r-- | src/controller/callbacks/display.c | 6 | ||||
| -rw-r--r-- | src/controller/callbacks/keyboard.c | 7 | ||||
| -rw-r--r-- | src/controller/callbacks/mouse.c | 49 | ||||
| -rw-r--r-- | src/controller/callbacks/mouse_wheel.c | 66 | ||||
| -rw-r--r-- | src/controller/callbacks/reshape.c | 68 | ||||
| -rw-r--r-- | src/model/geometry/density_legend_geometry.c | 18 | ||||
| -rw-r--r-- | src/model/state/zoom_info.h | 1 | ||||
| -rw-r--r-- | src/model/state/zoom_info_init.c | 6 |
11 files changed, 197 insertions, 111 deletions
diff --git a/src/controller/callbacks/keyboard.c b/src/controller/callbacks/keyboard.c index 9967ad3..9e667d8 100644 --- a/src/controller/callbacks/keyboard.c +++ b/src/controller/callbacks/keyboard.c @@ -4,6 +4,7 @@ #include "reshape.h" #include "../../view/state0.h" #include "../../model/state/pan_info_init.h" +#include "../../model/state/zoom_info_init.h" #include <GL/glut.h> #define S state0 @@ -41,11 +42,11 @@ keyboard (unsigned char key, int x, int y) case 'r': /* - * Reset the view (unzoom). + * Reset the view (unzoom, recenter). */ pan_info_init (&S.pan); - S.zoom.active = false; - + zoom_info_init (&S.zoom); + GLint viewport[4]; glGetIntegerv (GL_VIEWPORT, viewport); reshape (viewport[2], viewport[3]); |
