diff --git a/main.cu b/main.cu index 7afa51a..1565528 100644 --- a/main.cu +++ b/main.cu @@ -132,16 +132,14 @@ void glut_render(void) { // light stim::vec3 eye = cam.getPosition(); //get the camera position (eye point) - if (l1[0] + l1[1] + l1[2] + l2[0] + l2[1] + l2[2] == 0) { - stim::vec3 s = bb.size(); + stim::vec3 s = bb.size(); - l1[0] = eye[0] + s[0] / 2; - l1[1] = eye[1] + s[1] / 2; - l1[2] = eye[2] + s[2] / 2; - l2[0] = eye[0] - s[0] / 2; - l2[1] = eye[1] - s[1] / 2; - l2[2] = eye[2] - s[2] / 2; - } + l1[0] = eye[0] + s[0] / 2; + l1[1] = eye[1] + s[1] / 2; + l1[2] = eye[2] + s[2] / 2; + l2[0] = eye[0] - s[0] / 2; + l2[1] = eye[1] - s[1] / 2; + l2[2] = eye[2] - s[2] / 2; GLfloat global_ambient[] = { 0.3, 0.3, 0.3, 1.0 }; GLfloat ambient[] = { 0.0, 0.0, 0.0, 1.0 }; @@ -150,7 +148,6 @@ void glut_render(void) { GLfloat specular[] = { 0.6, 0.6, 0.6, 1.0 }; GLfloat position1[] = { l1[0], l1[1], 50, 0.0 }; // upper right light source GLfloat position2[] = { l2[0], l2[1], 0, 0.0 }; // lower left light source - GLfloat position[] = { eye[0], eye[1], 50, 1.0 }; glClearColor(0.0, 0.0, 0.0, 1.0); glShadeModel(GL_SMOOTH); @@ -166,11 +163,6 @@ void glut_render(void) { glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse2); glLightfv(GL_LIGHT1, GL_SPECULAR, specular); glLightfv(GL_LIGHT1, GL_POSITION, position2); - - glLightfv(GL_LIGHT2, GL_AMBIENT, ambient); - glLightfv(GL_LIGHT2, GL_DIFFUSE, diffuse1); - glLightfv(GL_LIGHT2, GL_SPECULAR, specular); - glLightfv(GL_LIGHT2, GL_POSITION, position); glEnable(GL_COLOR_MATERIAL); @@ -460,14 +452,12 @@ void glut_keyboard(unsigned char key, int x, int y){ glEnable(GL_LIGHTING); glEnable(GL_LIGHT0); glEnable(GL_LIGHT1); - glEnable(GL_LIGHT2); } else if (light_fac && !adjoint_fac) { light_fac = 0; glDisable(GL_LIGHTING); glDisable(GL_LIGHT0); glDisable(GL_LIGHT1); - glDisable(GL_LIGHT2); } break; -- libgit2 0.21.4