| -rw-r--r-- | r/connect.R | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/controller/exp004reshape.c | 11 | ||||
| -rw-r--r-- | src/model/density_legend_geometry.c | 81 | ||||
| -rw-r--r-- | src/model/density_legend_geometry.h | 9 | ||||
| -rw-r--r-- | src/model/display_list_index.h | 6 | ||||
| -rw-r--r-- | src/model/exp004state.h | 14 | ||||
| -rw-r--r-- | src/util/check_error.c | 6 | ||||
| -rw-r--r-- | src/view/exp004geometry.c | 7 | ||||
| -rw-r--r-- | src/view/exp004init.c | 8 | ||||
| -rw-r--r-- | src/view/exp004view.c | 4 |
11 files changed, 124 insertions, 27 deletions
diff --git a/src/view/exp004init.c b/src/view/exp004init.c index e7da51d..ab12d2a 100644 --- a/src/view/exp004init.c +++ b/src/view/exp004init.c | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | #include "exp004init.h" | 1 | #include "exp004init.h" |
| 2 | #include "exp004state0.h" | 2 | #include "exp004state0.h" |
| 3 | #include "../model/density_legend_geometry.h" | ||
| 4 | #include "../model/protein_geometry.h" | ||
| 3 | #include "../model/selection_info_init.h" | 5 | #include "../model/selection_info_init.h" |
| 4 | #include "../model/zoom_info_init.h" | 6 | #include "../model/zoom_info_init.h" |
| 5 | #include <GL/glut.h> | 7 | #include <GL/glut.h> |
| @@ -12,7 +14,9 @@ exp004init (void) | |||
| 12 | selection_info_init (&S.selection); | 14 | selection_info_init (&S.selection); |
| 13 | zoom_info_init (&S.zoom); | 15 | zoom_info_init (&S.zoom); |
| 14 | 16 | ||
| 15 | S.list_offset = glGenLists (1); | 17 | S.list_offset = glGenLists (NUM_LISTS); |
| 16 | 18 | protein_geometry (); | |
| 19 | density_legend_geometry (); | ||
| 20 | |||
| 17 | return; | 21 | return; |
| 18 | } | 22 | } |
