diff options
| author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2008-02-27 18:28:31 +0000 |
|---|---|---|
| committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2008-02-27 18:28:31 +0000 |
| commit | ba569b6fe87cde9a0f1224afd43a5da68465ec0f (patch) | |
| tree | b21862b58068071ab89feeccb478d99e9eea9642 | |
| parent | 59e898d6454f19d5a86ae34e823b767e424d2ed2 (diff) | |
New colour scheme
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@266 bf6ca9ba-c028-0410-8290-897cf20841d1
| -rw-r--r-- | src/glbits.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/glbits.c b/src/glbits.c index 5aed16b..9624bc8 100644 --- a/src/glbits.c +++ b/src/glbits.c @@ -650,7 +650,6 @@ gint glbits_expose(GtkWidget *widget, GdkEventExpose *event, DisplayWindow *dw) GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(widget); float m[4][4]; GLfloat black[] = { 0.0, 0.0, 0.0, 1.0 }; - GLfloat green[] = { 0.0, 1.0, 0.0, 1.0 }; GLfloat blue[] = { 0.0, 0.0, 0.5, 1.0 }; GLfloat blue_spec[] = { 0.0, 0.0, 1.0, 1.0 }; GLfloat gold[] = { 0.5, 0.5, 0.0, 1.0 }; @@ -658,8 +657,6 @@ gint glbits_expose(GtkWidget *widget, GdkEventExpose *event, DisplayWindow *dw) GLfloat light0_position[] = { 0.1, 0.1, 1.0, 0.0 }; GLfloat light0_diffuse[] = { 0.8, 0.8, 0.8, 1.0 }; GLfloat light0_specular[] = { 0.8, 0.8, 0.8, 1.0 }; - GLfloat bg_top[] = { 0.0, 0.2, 0.0, 1.0 }; - GLfloat bg_bot[] = { 0.0, 0.0, 0.0, 1.0 }; GLfloat grey[] = { 0.6, 0.6, 0.6, 1.0 }; if ( !gdk_gl_drawable_gl_begin(gldrawable, glcontext) ) { @@ -673,6 +670,8 @@ gint glbits_expose(GtkWidget *widget, GdkEventExpose *event, DisplayWindow *dw) GLfloat w = dw->drawing_area->allocation.width; GLfloat h = dw->drawing_area->allocation.height; GLfloat aspect = w/h; + GLfloat bg_top[] = { 0.7, 0.9, 0.7, 1.0 }; + GLfloat bg_bot[] = { 0.4, 0.7, 0.4, 1.0 }; glMatrixMode(GL_MODELVIEW); glLoadIdentity(); @@ -729,10 +728,10 @@ gint glbits_expose(GtkWidget *widget, GdkEventExpose *event, DisplayWindow *dw) GLfloat att[] = {1.0, 1.0, 0.0}; glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION, att); - glPointSize(10.0); + glPointSize(20.0); glEnable(GL_POINT_SMOOTH); - glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, green); + glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, black); 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); |