From 5d4e993e485ae3432eabb45caf4e4d43c9bc54e6 Mon Sep 17 00:00:00 2001 From: Evan Goers Date: Tue, 24 Jan 2012 06:44:19 +0000 Subject: Added a 'specular' material parameter. Defaults to 'color' values. Tweaked lighting a bit. --- src/ui/modelview.cc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/ui') diff --git a/src/ui/modelview.cc b/src/ui/modelview.cc index ec840c1..65954d8 100755 --- a/src/ui/modelview.cc +++ b/src/ui/modelview.cc @@ -190,21 +190,15 @@ void ModelView::draw() // we set up the light in camera space GLfloat modelview_light[] = { -10.0f * model->radius(), 0, 0, 1.0f }; GLfloat ambient_light[] = { 0.1f, 0.1f, 0.1f, 1.0f }; - GLfloat diffuse_light[4]; - GLfloat specular_light[4]; - for (size_t i = 0; i < 3; i++) { - diffuse_light[i] = 0.8f; - specular_light[i] = 0.4f; - } - diffuse_light[3] = 1.0f; - specular_light[3] = 1.0f; + GLfloat diffuse_light[] = { 0.75f, 0.75f, 0.75f, 1.0f }; + GLfloat specular_light[] = { 0.75f, 0.75f, 0.75f, 1.0f }; glLightfv(GL_LIGHT1, GL_POSITION, modelview_light); glLightfv(GL_LIGHT1, GL_AMBIENT, ambient_light); glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse_light); glLightfv(GL_LIGHT1, GL_SPECULAR, specular_light); - glLightf(GL_LIGHT1, GL_LINEAR_ATTENUATION, 0.05f); + glLightf(GL_LIGHT1, GL_LINEAR_ATTENUATION, 0.75f); gl::enable(GL_LIGHT1); -- cgit v1.2.3