diff options
author | don bright <hugh.m.bright@gmail.com> | 2013-02-24 20:31:03 (GMT) |
---|---|---|
committer | don bright <hugh.m.bright@gmail.com> | 2013-02-24 20:31:03 (GMT) |
commit | eb2c0d38f22f781cf59ca7078bfec260148ca584 (patch) | |
tree | 7ad292ecdd1bbfdc260a4ef9663ef354e52c70c4 /src/OffscreenView.cc | |
parent | 76c5d5b55c66505af98ddbed70ca5e21719d3bb1 (diff) |
unify intializeGL(), remove duplicate code
Diffstat (limited to 'src/OffscreenView.cc')
-rw-r--r-- | src/OffscreenView.cc | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/OffscreenView.cc b/src/OffscreenView.cc index 0daf8a8..723d8d7 100644 --- a/src/OffscreenView.cc +++ b/src/OffscreenView.cc @@ -12,7 +12,7 @@ OffscreenView::OffscreenView(size_t width, size_t height) object_rot << 35, 0, 25; this->ctx = create_offscreen_context(width, height); if ( this->ctx == NULL ) throw -1; - initializeGL(); + GLView::initializeGL(); GLView::resizeGL(width, height); } @@ -28,34 +28,6 @@ void OffscreenView::display_opencsg_warning() } #endif -void OffscreenView::initializeGL() -{ - glEnable(GL_DEPTH_TEST); - glDepthRange(-FAR_FAR_AWAY, +FAR_FAR_AWAY); - - 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 - enable_opencsg_shaders(); -#endif -} - void OffscreenView::paintGL() { glEnable(GL_LIGHTING); |