| -rw-r--r-- | src/controller/clear_selection.sqc | 9 | ||||
| -rw-r--r-- | src/controller/exp004processhits.c | 6 | ||||
| -rw-r--r-- | src/controller/keyboard.c | 10 | ||||
| -rw-r--r-- | src/controller/selection_from_db.sqc | 6 | ||||
| -rw-r--r-- | src/model/density_legend_geometry.c | 20 | ||||
| -rw-r--r-- | src/model/exp004state.h | 7 | ||||
| -rw-r--r-- | src/model/protein_geometry.c | 2 | ||||
| -rw-r--r-- | src/view/exp004geometry.c | 26 | ||||
| -rw-r--r-- | src/view/exp004init.c | 3 |
9 files changed, 59 insertions, 30 deletions
diff --git a/src/view/exp004geometry.c b/src/view/exp004geometry.c index 6f3bc17..76f39bb 100644 --- a/src/view/exp004geometry.c +++ b/src/view/exp004geometry.c @@ -1,7 +1,4 @@ -/* I seem to need this for glGenBuffers as per - http://www.gamedev.net/community/forums/topic.asp?topic_id=422358 */ #define GL_GLEXT_PROTOTYPES - #include "exp004geometry.h" #include "exp004state0.h" #include <GL/glut.h> @@ -14,21 +11,16 @@ exp004geometry (GLenum mode) glMatrixMode (GL_MODELVIEW); glLoadIdentity (); - glPointSize (0.1); - glColor3f (0.2, 0.2, 0.2); - - for (int i = 0; i < ROWS; i++) - { - glLoadName (i); - glPushMatrix (); - glTranslatef (S.base_vertices_data[i][0], - S.base_vertices_data[i][1], 0.0); - glColor4fv (S.base_colors_data[i]); - glCallList (S.list_offset + PROTEIN_GEOMETRY); - glPopMatrix (); - } + /* + * Draw the map. + */ + glCallList (S.list_offset + MAP_GEOMETRY); - glCallList (S.list_offset + DENSITY_LEGEND_GEOMETRY); + /* + * Draw the legend. + */ + if (S.legend) + glCallList (S.list_offset + DENSITY_LEGEND_GEOMETRY); return; } |
