diff options
| author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-10-04 10:34:54 +0000 |
|---|---|---|
| committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2007-10-04 10:34:54 +0000 |
| commit | e3a59f0de58d873837252d4decdd8f727392fad7 (patch) | |
| tree | df9dff6bfd8633065467492a2dc25c216041ce12 /src/displaywindow.c | |
| parent | 6c4cc88d5248507a3ce9970e1ed8eca60b60952a (diff) | |
Tidy-up
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@153 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/displaywindow.c')
| -rw-r--r-- | src/displaywindow.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/displaywindow.c b/src/displaywindow.c index 5d4a8c2..250f790 100644 --- a/src/displaywindow.c +++ b/src/displaywindow.c @@ -28,18 +28,12 @@ #include "trackball.h" #include "reflections.h" #include "main.h" -#include "ipr.h" #include "displaywindow.h" #include "basis.h" #include "dirax.h" #include "reproject.h" #include "cache.h" -enum { - DW_ORTHO, - DW_PERSPECTIVE -}; - static void displaywindow_gl_set_ortho(DisplayWindow *dw, GLfloat w, GLfloat h) { glMatrixMode(GL_PROJECTION); @@ -181,8 +175,9 @@ static gint displaywindow_gl_motion_notify(GtkWidget *widget, GdkEventMotion *ev #define DRAW_POINTER \ glBegin(GL_LINES); \ - glVertex3f(50, 0.0, 0.0); \ - glVertex3f(-50, 0.0, 0.0); \ + glNormal3f(1.0, 0.0, 0.0); \ + glVertex3f(50.0, 0.0, 0.0); \ + glVertex3f(-50.0, 0.0, 0.0); \ glEnd(); \ glBegin(GL_TRIANGLE_FAN); \ glNormal3f(1.0, 0.0, 0.0); \ @@ -535,8 +530,8 @@ static void displaywindow_gl_create_list(DisplayWindow *dw) { * Since the rotation is about +z, this is already anticlockwise * when looking down z. */ glRotatef(ctx->images[0].omega, 0.0, 0.0, 1.0); - glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, black); - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, yellow); + glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, yellow); + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, black); glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, black); glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 0.0); DRAW_POINTER |