| -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/actions/pan.c b/src/controller/actions/pan.c index 2f856b0..52e5fc1 100644 --- a/src/controller/actions/pan.c +++ b/src/controller/actions/pan.c @@ -10,10 +10,10 @@ pan (int x1, int y1, int x2, int y2) { int dx = x1 - x2; int dy = y1 - x2; - + if (dx == 0 && dy == 0) return; - + /* * Convert the selection boundary from window coordinates to * world coordinates. @@ -26,9 +26,9 @@ pan (int x1, int y1, int x2, int y2) glGetDoublev (GL_PROJECTION_MATRIX, projection); GLint viewport[4]; glGetIntegerv (GL_VIEWPORT, viewport); - + check_error (__FILE__, __LINE__); - + GLdouble start_position[3]; gluUnProject (x1, y1, @@ -36,11 +36,10 @@ pan (int x1, int y1, int x2, int y2) model, projection, viewport, - &start_position[0], - &start_position[1], &start_position[2]); - + &start_position[0], &start_position[1], &start_position[2]); + check_error (__FILE__, __LINE__); - + GLdouble end_position[3]; gluUnProject (x2, y2, @@ -49,13 +48,13 @@ pan (int x1, int y1, int x2, int y2) projection, viewport, &end_position[0], &end_position[1], &end_position[2]); - + check_error (__FILE__, __LINE__); - + S.pan.trans[0] += end_position[0] - start_position[0]; S.pan.trans[1] -= end_position[1] - start_position[1]; - + glutPostRedisplay (); - + return; } |
