(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 57803e5..9a803cb 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -153,8 +153,8 @@ void makeMenu() {
   // Construct light menu\r
   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 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
 \r
   // Construct object menu\r
@@ -173,7 +173,7 @@ void makeMenu() {
   //glutAddSubMenu("Material", materialMenu);\r
   glutAddSubMenu("Texture", textureMenu);\r
   glutAddSubMenu("Ground texture", gTextureMenu);\r
-  //glutAddSubMenu("Lights", lightMenu);\r
+  glutAddSubMenu("Lights", lightMenu);\r
   glutAddMenuEntry("Exit", M_EXIT);\r
 \r
   // Bind to right mouse button\r
@@ -466,12 +466,12 @@ void display() {
 \r
     glPushMatrix();\r
       glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]);\r
-      glutSolidSphere(0.5, 50, 50);\r
+      glutSolidSphere(lightBallSize, 20, 20);\r
     glPopMatrix();\r
 \r
     glPushMatrix();\r
       glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]);\r
-      glutSolidSphere(0.5, 50, 50);\r
+      glutSolidSphere(lightBallSize, 20, 20);\r
     glPopMatrix();\r
 \r
     glEnable(GL_LIGHTING);\r