summaryrefslogtreecommitdiffstats
Side-by-side diff
-rw-r--r--src/Makefile.am14
-rw-r--r--src/controller/clear_selection.sqc2
-rw-r--r--src/controller/exp004processhits.c6
-rw-r--r--src/controller/exp004processhits.h2
-rw-r--r--src/controller/exp004reshape.c2
-rw-r--r--src/controller/selection_from_db.sqc2
-rw-r--r--src/model/exp004state.h3
-rw-r--r--src/model/geometry/density_legend_geometry.c (renamed from src/model/density_legend_geometry.c)4
-rw-r--r--src/model/geometry/density_legend_geometry.h (renamed from src/model/density_legend_geometry.h)0
-rw-r--r--src/model/geometry/map_geometry.c40
-rw-r--r--src/model/geometry/map_geometry.h (renamed from src/model/map_geometry.h)0
-rw-r--r--src/model/geometry/protein_geometry.c (renamed from src/model/protein_geometry.c)2
-rw-r--r--src/model/geometry/protein_geometry.h (renamed from src/model/protein_geometry.h)0
-rw-r--r--src/model/geometry/protein_selected_geometry.c30
-rw-r--r--src/model/geometry/protein_selected_geometry.h9
-rw-r--r--src/model/map_geometry.c27
-rw-r--r--src/model/selection_info_init.c2
-rw-r--r--src/view/exp004init.c8
18 files changed, 106 insertions, 47 deletions
diff --git a/src/model/geometry/map_geometry.c b/src/model/geometry/map_geometry.c
new file mode 100644
index 0000000..63e409d
--- a/dev/null
+++ b/src/model/geometry/map_geometry.c
@@ -0,0 +1,40 @@
+#include "map_geometry.h"
+#include "../../view/exp004state0.h"
+#include <GL/glut.h>
+
+#define S exp004state0
+
+void
+map_geometry (void)
+{
+ glNewList (S.list_offset + MAP_GEOMETRY, GL_COMPILE);
+ glPolygonMode (GL_FRONT, GL_FILL);
+
+ for (int i = 0; i < ROWS; i++)
+ {
+ glLoadName (i);
+
+ // Draw the protein geometry.
+ 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 ();
+
+ // If the object is selected, draw the selection geometry.
+ if (S.selection.set[i])
+ {
+ glPushMatrix ();
+ glTranslatef (S.base_vertices_data[i][0],
+ S.base_vertices_data[i][1], 0.0);
+ glColor4f (0.5, 0.5, 0.5, 1.0);
+ glCallList (S.list_offset + PROTEIN_SELECTED_GEOMETRY);
+ glPopMatrix ();
+ }
+ }
+
+ glEndList ();
+
+ return;
+}

Valid XHTML 1.0 Strict

Copyright © 2009 Don Pellegrino All Rights Reserved.