| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/controller/exp004mouse.c | 55 | ||||
| -rw-r--r-- | src/controller/mousewheel.c | 45 | ||||
| -rw-r--r-- | src/controller/mousewheel.h | 11 | ||||
| -rw-r--r-- | src/controller/performzoom.c | 65 | ||||
| -rw-r--r-- | src/controller/performzoom.h | 9 | ||||
| -rw-r--r-- | src/view/exp004view.c | 4 |
7 files changed, 149 insertions, 44 deletions
diff --git a/src/view/exp004view.c b/src/view/exp004view.c index 92cb56e..434c016 100644 --- a/src/view/exp004view.c +++ b/src/view/exp004view.c | |||
| @@ -2,10 +2,13 @@ | |||
| 2 | #include "../controller/exp004mouse.h" | 2 | #include "../controller/exp004mouse.h" |
| 3 | #include "../controller/exp004reshape.h" | 3 | #include "../controller/exp004reshape.h" |
| 4 | #include "../controller/keyboard.h" | 4 | #include "../controller/keyboard.h" |
| 5 | #include "../controller/mousewheel.h" | ||
| 5 | #include "../db/dbconnect.h" | 6 | #include "../db/dbconnect.h" |
| 6 | #include "exp004init.h" | 7 | #include "exp004init.h" |
| 7 | #include "exp004state0.h" | 8 | #include "exp004state0.h" |
| 8 | #include "exp004view.h" | 9 | #include "exp004view.h" |
| 10 | #include <GL/freeglut.h> | ||
| 11 | #include <GL/freeglut_ext.h> | ||
| 9 | #include <GL/glut.h> | 12 | #include <GL/glut.h> |
| 10 | 13 | ||
| 11 | void | 14 | void |
| @@ -45,6 +48,7 @@ exp004view (void) | |||
| 45 | glutDisplayFunc (exp004display); | 48 | glutDisplayFunc (exp004display); |
| 46 | glutKeyboardFunc (keyboard); | 49 | glutKeyboardFunc (keyboard); |
| 47 | glutMouseFunc (exp004mouse); | 50 | glutMouseFunc (exp004mouse); |
| 51 | glutMouseWheelFunc (mousewheel); | ||
| 48 | glutReshapeFunc (exp004reshape); | 52 | glutReshapeFunc (exp004reshape); |
| 49 | 53 | ||
| 50 | return; | 54 | return; |
