| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | r/connect.R | 16 | ||||
| -rw-r--r-- | src/controller/exp004mouse.c | 51 | ||||
| -rw-r--r-- | src/controller/exp004processhits.c | 16 | ||||
| -rw-r--r-- | src/controller/exp004reshape.c | 26 | ||||
| -rw-r--r-- | src/controller/keyboard.c | 2 | ||||
| -rw-r--r-- | src/controller/selection_from_db.sqc | 9 | ||||
| -rw-r--r-- | src/controller/selsave.sqc | 4 | ||||
| -rw-r--r-- | src/controller/set_ortho.c | 11 | ||||
| -rw-r--r-- | src/controller/vis_sel_set.h | 3 | ||||
| -rw-r--r-- | src/model/coordinates.h | 3 | ||||
| -rw-r--r-- | src/model/exp004base.sqc | 30 | ||||
| -rw-r--r-- | src/model/exp004state.h | 30 | ||||
| -rw-r--r-- | src/model/selection_info.h | 11 | ||||
| -rw-r--r-- | src/model/selection_info_init.c | 2 | ||||
| -rw-r--r-- | src/model/selection_info_init.h | 2 | ||||
| -rw-r--r-- | src/model/selection_purposes.h | 22 | ||||
| -rw-r--r-- | src/model/zoom_info.h | 5 | ||||
| -rw-r--r-- | src/model/zoom_info_init.c | 2 | ||||
| -rw-r--r-- | src/model/zoom_info_init.h | 2 | ||||
| -rw-r--r-- | src/util/pick_convert.c | 7 | ||||
| -rw-r--r-- | src/util/sqlinfoprint.c | 2 | ||||
| -rw-r--r-- | src/util/sqlinfoprint.h | 7 | ||||
| -rw-r--r-- | src/view/exp004geometry.c | 6 | ||||
| -rw-r--r-- | src/view/exp004view.c | 7 |
25 files changed, 140 insertions, 146 deletions
diff --git a/src/view/exp004view.c b/src/view/exp004view.c index cc27a93..b7e4367 100644 --- a/src/view/exp004view.c +++ b/src/view/exp004view.c @@ -5,6 +5,7 @@ #include "../db/dbconnect.h" #include "../model/exp004base.h" #include "exp004init.h" +#include "exp004state0.h" #include "exp004view.h" #include <GL/glut.h> @@ -20,8 +21,8 @@ exp004view (void) glutCreateWindow ("Exp004"); // GL Initialization - glClearColor (0.0, 0.0, 0.0, 1.0); - glColor3f (1.0, 1.0, 1.0); + glClearColor (CLEAR_COLOR); + glColor3f (DRAW_COLOR); glEnable (GL_AUTO_NORMAL); glEnable (GL_DEPTH_TEST); glEnable (GL_MAP1_VERTEX_3); @@ -30,7 +31,7 @@ exp004view (void) /* Buffer objects to use. */ glEnableClientState (GL_COLOR_ARRAY); glEnableClientState (GL_VERTEX_ARRAY); - + /* Enable Antialiasing as described in "Antialiasing" [Shreiner,247]. */ glEnable (GL_LINE_SMOOTH); |
