| -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/exp004view.c b/src/view/exp004view.c index 68a4e79..33198ad 100644 --- a/src/view/exp004view.c +++ b/src/view/exp004view.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #include "../controller/keyboard.h" | 4 | #include "../controller/keyboard.h" |
| 5 | #include "../db/dbconnect.h" | 5 | #include "../db/dbconnect.h" |
| 6 | #include "../model/exp004base.h" | 6 | #include "../model/exp004base.h" |
| 7 | #include "../model/protein_geometry.h" | ||
| 8 | #include "exp004init.h" | 7 | #include "exp004init.h" |
| 9 | #include "exp004state0.h" | 8 | #include "exp004state0.h" |
| 10 | #include "exp004view.h" | 9 | #include "exp004view.h" |
| @@ -25,7 +24,7 @@ exp004view (void) | |||
| 25 | glClearColor (CLEAR_COLOR); | 24 | glClearColor (CLEAR_COLOR); |
| 26 | glColor3f (DRAW_COLOR); | 25 | glColor3f (DRAW_COLOR); |
| 27 | glEnable (GL_AUTO_NORMAL); | 26 | glEnable (GL_AUTO_NORMAL); |
| 28 | glEnable (GL_DEPTH_TEST); | 27 | glDisable (GL_DEPTH_TEST); |
| 29 | glEnable (GL_MAP1_VERTEX_3); | 28 | glEnable (GL_MAP1_VERTEX_3); |
| 30 | glShadeModel (GL_SMOOTH); | 29 | glShadeModel (GL_SMOOTH); |
| 31 | 30 | ||
| @@ -43,7 +42,6 @@ exp004view (void) | |||
| 43 | // Initialize the model. | 42 | // Initialize the model. |
| 44 | exp004base (); | 43 | exp004base (); |
| 45 | exp004init (); | 44 | exp004init (); |
| 46 | protein_geometry (); | ||
| 47 | 45 | ||
| 48 | // Callbacks (Controllers) | 46 | // Callbacks (Controllers) |
| 49 | glutDisplayFunc (exp004display); | 47 | glutDisplayFunc (exp004display); |
