X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=08e78d81501d20aafe064a67d2a45f2e54bd71e4;hp=609fdd1847694307bfa5fab3f0f9f88836ca2ce5;hb=fc636ebc890e3181512b29bd8f2ee111d206c068;hpb=f308eda9ccbd65e715836e689b0bdf73267871d5

diff --git a/scene.c b/scene.c
index 609fdd1..08e78d8 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);
 
@@ -409,6 +410,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);
@@ -417,7 +419,7 @@ void init() {
   glMaterialf(GL_FRONT, GL_SHININESS, shine);
 
   glEnable(GL_LIGHT0);
-  glEnable(GL_LIGHT1);
+  //glEnable(GL_LIGHT1);
   glEnable(GL_LIGHTING);
 }
 
@@ -453,7 +455,7 @@ int main(int argc, char **argv) {
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing
   glDepthFunc(GL_LEQUAL);  // the type
   glEnable(GL_TEXTURE_2D);
-  glEnable(GL_CULL_FACE);
+  //glEnable(GL_CULL_FACE);
   glEnable(GL_NORMALIZE);
   glLineWidth(2.0);