-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/display.c b/src/controller/callbacks/display.c index b9a76a6..bee3286 100644 --- a/src/controller/callbacks/display.c +++ b/src/controller/callbacks/display.c | |||
@@ -1,10 +1,16 @@ | |||
1 | #include "display.h" | 1 | #include "display.h" |
2 | #include "../../view/geometry.h" | 2 | #include "../../view/geometry.h" |
3 | #include "../actions/set_ortho.h" | ||
3 | #include <GL/glut.h> | 4 | #include <GL/glut.h> |
4 | 5 | ||
5 | void | 6 | void |
6 | display (void) | 7 | display (void) |
7 | { | 8 | { |
9 | glMatrixMode (GL_PROJECTION); | ||
10 | glLoadIdentity (); | ||
11 | set_ortho (); | ||
12 | |||
13 | glMatrixMode (GL_MODELVIEW); | ||
8 | glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); | 14 | glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); |
9 | geometry (GL_RENDER); | 15 | geometry (GL_RENDER); |
10 | glutSwapBuffers (); | 16 | glutSwapBuffers (); |