| -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) glLoadName (i); // Draw the protein geometry. - float* v = S.base_vertices_data + (i * 2); + float *v = S.base_vertices_data + (i * 2); glPushMatrix (); - glTranslatef (*v, - *(v+1), 0.0); + glTranslatef (*v, *(v + 1), 0.0); glColor4fv (S.base_colors_data + (i * 4)); glCallList (S.list_offset + PROTEIN_GEOMETRY); glPopMatrix (); @@ -27,10 +26,9 @@ map_geometry (void) if (S.selection.set[i]) { glPushMatrix (); - glTranslatef (*v, - *(v+1), 0.0); + glTranslatef (*v, *(v + 1), 0.0); glColor4f (0.5, 0.5, 0.5, 1.0); - glCallList (S.list_offset + PROTEIN_SELECTED_GEOMETRY); + glCallList (S.list_offset + PROTEIN_SELECTED_GEOMETRY); glPopMatrix (); } } |
