36 files changed, 332 insertions, 176 deletions
diff --git a/src/view/exp004view.c b/src/view/exp004view.c index 434c016..b16597d 100644 --- a/src/view/exp004view.c +++ b/src/view/exp004view.c | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | #include "../controller/exp004display.h" | 1 | #include "../controller/callbacks/display.h" |
| 2 | #include "../controller/exp004mouse.h" | 2 | #include "../controller/callbacks/keyboard.h" |
| 3 | #include "../controller/exp004reshape.h" | 3 | #include "../controller/callbacks/mouse.h" |
| 4 | #include "../controller/keyboard.h" | 4 | #include "../controller/callbacks/mouse_wheel.h" |
| 5 | #include "../controller/mousewheel.h" | 5 | #include "../controller/callbacks/reshape.h" |
| 6 | #include "../db/dbconnect.h" | 6 | #include "../db/dbconnect.h" |
| 7 | #include "exp004init.h" | 7 | #include "exp004init.h" |
| 8 | #include "exp004state0.h" | 8 | #include "exp004state0.h" |
| @@ -44,12 +44,12 @@ exp004view (void) | |||
| 44 | // Initialize the model. | 44 | // Initialize the model. |
| 45 | exp004init (); | 45 | exp004init (); |
| 46 | 46 | ||
| 47 | // Callbacks (Controllers) | 47 | // Callbacks |
| 48 | glutDisplayFunc (exp004display); | 48 | glutDisplayFunc (display); |
| 49 | glutKeyboardFunc (keyboard); | 49 | glutKeyboardFunc (keyboard); |
| 50 | glutMouseFunc (exp004mouse); | 50 | glutMouseFunc (mouse); |
| 51 | glutMouseWheelFunc (mousewheel); | 51 | glutMouseWheelFunc (mouse_wheel); |
| 52 | glutReshapeFunc (exp004reshape); | 52 | glutReshapeFunc (reshape); |
| 53 | 53 | ||
| 54 | return; | 54 | return; |
| 55 | } | 55 | } |
