-rw-r--r-- | Makefile.am | 17 | ||||
-rw-r--r-- | src/controller/actions/pan.c | 23 | ||||
-rw-r--r-- | src/controller/actions/set_ortho.c | 5 | ||||
-rw-r--r-- | src/controller/actions/zoom.c | 8 | ||||
-rw-r--r-- | src/controller/callbacks/keyboard.c | 2 | ||||
-rw-r--r-- | src/controller/callbacks/mouse.c | 30 | ||||
-rw-r--r-- | src/controller/callbacks/mouse_motion.c | 2 | ||||
-rw-r--r-- | src/controller/callbacks/mouse_wheel.c | 8 | ||||
-rw-r--r-- | src/controller/callbacks/reshape.c | 26 | ||||
-rw-r--r-- | src/model/geometry/map_geometry.c | 10 | ||||
-rw-r--r-- | src/model/state/pan_info_init.h | 2 | ||||
-rw-r--r-- | src/model/state/zoom_info_init.c | 2 |
12 files changed, 70 insertions, 65 deletions
diff --git a/src/controller/callbacks/keyboard.c b/src/controller/callbacks/keyboard.c index 9e667d8..a74ac7b 100644 --- a/src/controller/callbacks/keyboard.c +++ b/src/controller/callbacks/keyboard.c | |||
@@ -45,7 +45,7 @@ keyboard (unsigned char key, int x, int y) | |||
45 | * Reset the view (unzoom, recenter). | 45 | * Reset the view (unzoom, recenter). |
46 | */ | 46 | */ |
47 | pan_info_init (&S.pan); | 47 | pan_info_init (&S.pan); |
48 | zoom_info_init (&S.zoom); | 48 | zoom_info_init (&S.zoom); |
49 | 49 | ||
50 | GLint viewport[4]; | 50 | GLint viewport[4]; |
51 | glGetIntegerv (GL_VIEWPORT, viewport); | 51 | glGetIntegerv (GL_VIEWPORT, viewport); |