(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 609fdd1..08e78d8 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -129,7 +129,8 @@ void processTextureEvents(int id) {
  * @param id ID of ground texture selected\r
  */\r
 void processGTextureEvents(int id) {\r
-\r
+  currentGroundTexture = id;\r
+  glutPostRedisplay();\r
 }\r
 \r
 /**\r
@@ -169,7 +170,7 @@ void makeMenu() {
   //glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);\r
   //glutAddSubMenu("Material", materialMenu);\r
   //glutAddSubMenu("Texture", textureMenu);\r
-  //glutAddSubMenu("Ground texture", gTextureMenu);\r
+  glutAddSubMenu("Ground texture", gTextureMenu);\r
   //glutAddSubMenu("Lights", lightMenu);\r
   glutAddMenuEntry("Exit", M_EXIT);\r
 \r
@@ -409,6 +410,7 @@ void init() {
   glLightf(GL_LIGHT1, GL_SPOT_CUTOFF, 90.0);\r
 \r
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);\r
+  glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);\r
 \r
   glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);\r
   glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);\r
@@ -417,7 +419,7 @@ void init() {
   glMaterialf(GL_FRONT, GL_SHININESS, shine);\r
 \r
   glEnable(GL_LIGHT0);\r
-  glEnable(GL_LIGHT1);\r
+  //glEnable(GL_LIGHT1);\r
   glEnable(GL_LIGHTING);\r
 }\r
 \r
@@ -453,7 +455,7 @@ int main(int argc, char **argv) {
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing\r
   glDepthFunc(GL_LEQUAL);  // the type\r
   glEnable(GL_TEXTURE_2D);\r
-  glEnable(GL_CULL_FACE);\r
+  //glEnable(GL_CULL_FACE);\r
   glEnable(GL_NORMALIZE);\r
   glLineWidth(2.0);\r
 \r