X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=74b15cab6f46692b72c105149a7ab1621ebe7642;hp=bc6e5950ff3186d57797b1b6b10e48c3a2353dae;hb=732047b86f9fca77cec1c110eca712997894808a;hpb=35fb03fca913e98a903e9dc5b179e941505235ee

diff --git a/scene.c b/scene.c
index bc6e595..74b15ca 100644
--- a/scene.c
+++ b/scene.c
@@ -129,7 +129,8 @@ void processTextureEvents(int id) {
  * @param id ID of ground texture selected
  */
 void processGTextureEvents(int id) {
-
+  currentGroundTexture = id;
+  glutPostRedisplay();
 }
 
 /**
@@ -169,7 +170,7 @@ void makeMenu() {
   //glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);
   //glutAddSubMenu("Material", materialMenu);
   //glutAddSubMenu("Texture", textureMenu);
-  //glutAddSubMenu("Ground texture", gTextureMenu);
+  glutAddSubMenu("Ground texture", gTextureMenu);
   //glutAddSubMenu("Lights", lightMenu);
   glutAddMenuEntry("Exit", M_EXIT);
 
@@ -338,12 +339,18 @@ void display() {
   lightPosition0[2] = 12*sin(lightAngle0);
   lightPosition0[3] = 0.0;
 
+  direction0[0] = lightPosition0[0];
+  direction0[2] = lightPosition0[2];
+
   /* Reposition the light source 1. */
   lightPosition1[0] = 12*cos(lightAngle1);
   lightPosition1[1] = lightHeight1;
   lightPosition1[2] = 12*sin(lightAngle1);
   lightPosition1[3] = 0.0;
 
+  direction1[0] = lightPosition1[0];
+  direction1[2] = lightPosition1[2];
+
   glPushMatrix();
 
     /* Perform scene rotations based on user mouse/keyboard input. */
@@ -409,6 +416,7 @@ void init() {
   glLightf(GL_LIGHT1, GL_SPOT_CUTOFF, 90.0);
 
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);
+  glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
 
   glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);
   glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);
@@ -416,8 +424,8 @@ void init() {
   glMaterialfv(GL_FRONT, GL_EMISSION, emission);
   glMaterialf(GL_FRONT, GL_SHININESS, shine);
 
-  //glEnable(GL_LIGHT0);
-  //glEnable(GL_LIGHT1);
+  glEnable(GL_LIGHT0);
+  glEnable(GL_LIGHT1);
   glEnable(GL_LIGHTING);
 }