-rw-r--r-- | Makefile.am | 17 | ||||
-rw-r--r-- | src/controller/actions/pan.c | 23 | ||||
-rw-r--r-- | src/controller/actions/set_ortho.c | 5 | ||||
-rw-r--r-- | src/controller/actions/zoom.c | 8 | ||||
-rw-r--r-- | src/controller/callbacks/keyboard.c | 2 | ||||
-rw-r--r-- | src/controller/callbacks/mouse.c | 30 | ||||
-rw-r--r-- | src/controller/callbacks/mouse_motion.c | 2 | ||||
-rw-r--r-- | src/controller/callbacks/mouse_wheel.c | 8 | ||||
-rw-r--r-- | src/controller/callbacks/reshape.c | 26 | ||||
-rw-r--r-- | src/model/geometry/map_geometry.c | 10 | ||||
-rw-r--r-- | src/model/state/pan_info_init.h | 2 | ||||
-rw-r--r-- | src/model/state/zoom_info_init.c | 2 |
12 files changed, 70 insertions, 65 deletions
diff --git a/src/model/geometry/map_geometry.c b/src/model/geometry/map_geometry.c index 8bc79a3..c4c8db0 100644 --- a/src/model/geometry/map_geometry.c +++ b/src/model/geometry/map_geometry.c | |||
@@ -15,10 +15,9 @@ map_geometry (void) | |||
15 | glLoadName (i); | 15 | glLoadName (i); |
16 | 16 | ||
17 | // Draw the protein geometry. | 17 | // Draw the protein geometry. |
18 | float* v = S.base_vertices_data + (i * 2); | 18 | float *v = S.base_vertices_data + (i * 2); |
19 | glPushMatrix (); | 19 | glPushMatrix (); |
20 | glTranslatef (*v, | 20 | glTranslatef (*v, *(v + 1), 0.0); |
21 | *(v+1), 0.0); | ||
22 | glColor4fv (S.base_colors_data + (i * 4)); | 21 | glColor4fv (S.base_colors_data + (i * 4)); |
23 | glCallList (S.list_offset + PROTEIN_GEOMETRY); | 22 | glCallList (S.list_offset + PROTEIN_GEOMETRY); |
24 | glPopMatrix (); | 23 | glPopMatrix (); |
@@ -27,10 +26,9 @@ map_geometry (void) | |||
27 | if (S.selection.set[i]) | 26 | if (S.selection.set[i]) |
28 | { | 27 | { |
29 | glPushMatrix (); | 28 | glPushMatrix (); |
30 | glTranslatef (*v, | 29 | glTranslatef (*v, *(v + 1), 0.0); |
31 | *(v+1), 0.0); | ||
32 | glColor4f (0.5, 0.5, 0.5, 1.0); | 30 | glColor4f (0.5, 0.5, 0.5, 1.0); |
33 | glCallList (S.list_offset + PROTEIN_SELECTED_GEOMETRY); | 31 | glCallList (S.list_offset + PROTEIN_SELECTED_GEOMETRY); |
34 | glPopMatrix (); | 32 | glPopMatrix (); |
35 | } | 33 | } |
36 | } | 34 | } |