diff options
| author | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2008-06-06 11:18:42 +0000 |
|---|---|---|
| committer | taw27 <taw27@bf6ca9ba-c028-0410-8290-897cf20841d1> | 2008-06-06 11:18:42 +0000 |
| commit | 0772a4fa2344d228f78541e320627c487a5ee4d3 (patch) | |
| tree | 0ee265542e3458ab12849ca1b6e24bc6701adf8c /src/glbits.c | |
| parent | dadacff0823b881b687e48312aafa5351d4818e0 (diff) | |
Shader fixes (pulled across from Synth3D)
git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@282 bf6ca9ba-c028-0410-8290-897cf20841d1
Diffstat (limited to 'src/glbits.c')
| -rw-r--r-- | src/glbits.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/glbits.c b/src/glbits.c index aff3a36..b489ea6 100644 --- a/src/glbits.c +++ b/src/glbits.c @@ -651,10 +651,9 @@ gint glbits_expose(GtkWidget *widget, GdkEventExpose *event, DisplayWindow *dw) float m[4][4]; GLfloat black[] = { 0.0, 0.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 }; - GLfloat gold_spec[] = { 0.9, 0.9, 0.0, 1.0 }; - GLfloat light0_position[] = { 0.1, 0.1, 1.0, 0.0 }; + GLfloat white[] = { 1.0, 1.0, 1.0, 1.0 }; + GLfloat gold[] = { 0.7, 0.7, 0.0, 1.0 }; + GLfloat light0_position[] = { 0.0, 1.0, 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 grey[] = { 0.6, 0.6, 0.6, 1.0 }; @@ -734,6 +733,7 @@ gint glbits_expose(GtkWidget *widget, GdkEventExpose *event, DisplayWindow *dw) 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); + glColor3f(0.0, 0.0, 0.0); glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 0.0); if ( dw->gl_use_buffers ) { @@ -758,8 +758,9 @@ gint glbits_expose(GtkWidget *widget, GdkEventExpose *event, DisplayWindow *dw) glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue); glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, black); - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, blue_spec); - glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 50.0); + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, white); + glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 100.0); + glColor3f(0.0, 0.0, 1.0); if ( dw->gl_use_buffers ) { glBindBufferARB(GL_ARRAY_BUFFER, dw->gl_marker_vertex_buffer); @@ -783,8 +784,9 @@ gint glbits_expose(GtkWidget *widget, GdkEventExpose *event, DisplayWindow *dw) glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, black); glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, gold); - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, gold_spec); - glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 70.0); + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, white); + glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 100.0); + glColor3f(0.7, 0.7, 0.0); glUseProgramObjectARB(dw->gl_program_lightpp); if ( dw->gl_use_buffers ) { |