diff options
| author | Giles Bathgate <gilesbathgate@gmail.com> | 2011-05-14 15:43:43 (GMT) |
|---|---|---|
| committer | Giles Bathgate <gilesbathgate@gmail.com> | 2011-05-14 15:43:43 (GMT) |
| commit | f698f2ad7ecd8d8c7890c3435eab3259ade09470 (patch) | |
| tree | 4dca4a923f893bd39036fad4fa96b104a070f054 /src | |
| parent | 9ca6f0dedf65ba917319088fdd7708957e87c30c (diff) | |
Move light setup code out of paint method and into init.
Diffstat (limited to 'src')
| -rw-r--r-- | src/glview.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/glview.cc b/src/glview.cc index 870a1c9..3a4218a 100644 --- a/src/glview.cc +++ b/src/glview.cc @@ -85,6 +85,22 @@ void GLView::initializeGL() glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GLfloat light_diffuse[] = {1.0, 1.0, 1.0, 1.0}; + GLfloat light_position0[] = {-1.0, -1.0, +1.0, 0.0}; + GLfloat light_position1[] = {+1.0, +1.0, -1.0, 0.0}; + + glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse); + glLightfv(GL_LIGHT0, GL_POSITION, light_position0); + glEnable(GL_LIGHT0); + glLightfv(GL_LIGHT1, GL_DIFFUSE, light_diffuse); + glLightfv(GL_LIGHT1, GL_POSITION, light_position1); + glEnable(GL_LIGHT1); + glEnable(GL_LIGHTING); + glEnable(GL_NORMALIZE); + + glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE); + glEnable(GL_COLOR_MATERIAL); + #ifdef ENABLE_OPENCSG GLenum err = glewInit(); if (GLEW_OK != err) { @@ -234,22 +250,6 @@ void GLView::paintGL() glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - GLfloat light_diffuse[] = {1.0, 1.0, 1.0, 1.0}; - GLfloat light_position0[] = {-1.0, -1.0, +1.0, 0.0}; - GLfloat light_position1[] = {+1.0, +1.0, -1.0, 0.0}; - - glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse); - glLightfv(GL_LIGHT0, GL_POSITION, light_position0); - glEnable(GL_LIGHT0); - glLightfv(GL_LIGHT1, GL_DIFFUSE, light_diffuse); - glLightfv(GL_LIGHT1, GL_POSITION, light_position1); - glEnable(GL_LIGHT1); - glEnable(GL_LIGHTING); - glEnable(GL_NORMALIZE); - - glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE); - glEnable(GL_COLOR_MATERIAL); - glRotated(object_rot_x, 1.0, 0.0, 0.0); glRotated(object_rot_y, 0.0, 1.0, 0.0); glRotated(object_rot_z, 0.0, 0.0, 1.0); |