X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=scene.c;h=9a803cbd3b401a9dfd0f1e847ace1a53a914a3fe;hb=156ee3d62238bda349822b1f72009dcdaf1daf80;hp=57803e56aa52f479d83ef5b7066fece38a930337;hpb=cbe1aa264b15c345870500646003c777e4bdef03;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 57803e5..9a803cb 100644
--- a/scene.c
+++ b/scene.c
@@ -153,8 +153,8 @@ void makeMenu() {
   // Construct light menu
   int lightMenu = glutCreateMenu(processLightEvents);
   glutAddMenuEntry("Move Light 1", M_LIGHT_MOVE_LIGHT_1);
-  glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);
-  glutAddMenuEntry("Move Light 2", M_LIGHT_MOVE_LIGHT_2);
+  //glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);
+  //glutAddMenuEntry("Move Light 2", M_LIGHT_MOVE_LIGHT_2);
   glutAddMenuEntry("R/G/B/All Light 2", M_LIGHT_RGBALL_LIGHT_2);
 
   // Construct object menu
@@ -173,7 +173,7 @@ void makeMenu() {
   //glutAddSubMenu("Material", materialMenu);
   glutAddSubMenu("Texture", textureMenu);
   glutAddSubMenu("Ground texture", gTextureMenu);
-  //glutAddSubMenu("Lights", lightMenu);
+  glutAddSubMenu("Lights", lightMenu);
   glutAddMenuEntry("Exit", M_EXIT);
 
   // Bind to right mouse button
@@ -466,12 +466,12 @@ void display() {
 
     glPushMatrix();
       glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]);
-      glutSolidSphere(0.5, 50, 50);
+      glutSolidSphere(lightBallSize, 20, 20);
     glPopMatrix();
 
     glPushMatrix();
       glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]);
-      glutSolidSphere(0.5, 50, 50);
+      glutSolidSphere(lightBallSize, 20, 20);
     glPopMatrix();
 
     glEnable(GL_LIGHTING);