int lightMenu = glutCreateMenu(processLightEvents);\r
glutAddMenuEntry("Move Light 1", M_LIGHT_MOVE_LIGHT_1);\r
//glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);\r
- //glutAddMenuEntry("Move Light 2", M_LIGHT_MOVE_LIGHT_2);\r
- glutAddMenuEntry("R/G/B/All Light 2", M_LIGHT_RGBALL_LIGHT_2);\r
+ glutAddMenuEntry("Move Light 2", M_LIGHT_MOVE_LIGHT_2);\r
+ //glutAddMenuEntry("R/G/B/All Light 2", M_LIGHT_RGBALL_LIGHT_2);\r
\r
// Construct object menu\r
int objectMenu = makeSubmenuFromArray( objectMenuEntries, NMESH, processObjectEvents );\r
glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0); // Set camera angle upward\r
\r
/* Reposition the light source 0. */\r
- lightPosition0[0] = 12*cos(lightAngle0);\r
- lightPosition0[1] = lightHeight0;\r
- lightPosition0[2] = 12*sin(lightAngle0);\r
- lightPosition0[3] = 0.0;\r
+ lightObjs[0].position[0] = 12;\r
+ lightObjs[0].position[1] = 5;\r
+ lightObjs[0].position[2] = 12;\r
+ lightObjs[0].position[3] = 0.0;\r
\r
- direction0[0] = lightPosition0[0];\r
- direction0[2] = lightPosition0[2];\r
-\r
- /* Reposition the light source 1. */\r
- lightPosition1[0] = 12*cos(lightAngle1);\r
- lightPosition1[1] = lightHeight1;\r
- lightPosition1[2] = 12*sin(lightAngle1);\r
- lightPosition1[3] = 0.0;\r
-\r
- direction1[0] = lightPosition1[0];\r
- direction1[2] = lightPosition1[2];\r
+ //direction0[0] = lightPosition0[0];\r
+ //direction0[2] = lightPosition0[2];\r
\r
glPushMatrix();\r
\r
glTranslatef(camx, camy, camz);\r
glRotatef(keyrot, 1.0, 0.0, 0.0);\r
\r
- glLightfv(GL_LIGHT0, GL_POSITION, lightPosition0);\r
- glLightfv(GL_LIGHT1, GL_POSITION, lightPosition1);\r
-\r
drawFloor();\r
\r
// Draw sceneObjs array\r
glPopMatrix();\r
}\r
\r
- // Draw a white ball over the light sources\r
- glDisable(GL_LIGHTING);\r
- glColor3f(1.0, 1.0, 1.0);\r
-\r
- glPushMatrix();\r
- glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]);\r
- glutSolidSphere(0.5, 50, 50);\r
- glPopMatrix();\r
-\r
- glPushMatrix();\r
- glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]);\r
- glutSolidSphere(0.5, 50, 50);\r
- glPopMatrix();\r
-\r
- glEnable(GL_LIGHTING);\r
+ updateLights();\r
\r
drawAxisLines();\r
\r
glutSwapBuffers();\r
}\r
\r
-/**\r
- * init function; sets initial OpenGL state\r
- */\r
-void init() {\r
- glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);\r
- glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);\r
- glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);\r
- glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0);\r
-\r
- glLightfv(GL_LIGHT1, GL_AMBIENT, ambient1);\r
- glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse1);\r
- glLightfv(GL_LIGHT1, GL_SPECULAR, specular1);\r
- glLightfv(GL_LIGHT1, GL_SPOT_DIRECTION, direction1);\r
-\r
- glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);\r
- glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);\r
-\r
- glEnable(GL_LIGHT0);\r
- glEnable(GL_LIGHT1);\r
- glEnable(GL_LIGHTING);\r
-}\r
-\r
/**\r
* Main function\r
* @param argc Number of arguments\r
\r
makeMenu();\r
\r
- init();\r
+ initializeLights();\r
\r
glutMainLoop();\r
}
\ No newline at end of file