33 files changed, 530 insertions, 113 deletions
diff --git a/src/controller/callbacks/mouse.c b/src/controller/callbacks/mouse.c index fc48eff..16e8b8b 100644 --- a/src/controller/callbacks/mouse.c +++ b/src/controller/callbacks/mouse.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #include "../../util/check_error.h" | 1 | #include "../../util/check_error.h" |
| 2 | #include "../../util/pick_convert.h" | 2 | #include "../../util/pick_convert.h" |
| 3 | #include "../../view/exp004geometry.h" | 3 | #include "../../view/geometry.h" |
| 4 | #include "../../view/exp004state0.h" | 4 | #include "../../view/state0.h" |
| 5 | #include "../actions/process_hits.h" | 5 | #include "../actions/process_hits.h" |
| 6 | #include "../actions/set_ortho.h" | 6 | #include "../actions/set_ortho.h" |
| 7 | #include "../actions/zoom.h" | 7 | #include "../actions/zoom.h" |
| @@ -14,7 +14,7 @@ | |||
| 14 | /* | 14 | /* |
| 15 | * A simple alias to make the code more readable. | 15 | * A simple alias to make the code more readable. |
| 16 | */ | 16 | */ |
| 17 | #define S exp004state0 | 17 | #define S state0 |
| 18 | 18 | ||
| 19 | void | 19 | void |
| 20 | mouse (int button, int state, int x, int y) | 20 | mouse (int button, int state, int x, int y) |
| @@ -94,7 +94,7 @@ mouse (int button, int state, int x, int y) | |||
| 94 | * manipulate the name stack so that each primitive of interest | 94 | * manipulate the name stack so that each primitive of interest |
| 95 | * has appropriate names assigned [Redbook]." | 95 | * has appropriate names assigned [Redbook]." |
| 96 | */ | 96 | */ |
| 97 | exp004geometry (GL_SELECT); | 97 | geometry (GL_SELECT); |
| 98 | 98 | ||
| 99 | glMatrixMode (GL_PROJECTION); | 99 | glMatrixMode (GL_PROJECTION); |
| 100 | glPopMatrix (); | 100 | glPopMatrix (); |
