(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 3bda9b4..2bf72a3 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
@@ -318,7 +319,7 @@ void display() {
     75.0,\r
     aspect,\r
     0.1,\r
-    200\r
+    300\r
     );\r
 \r
   glMatrixMode(GL_MODELVIEW);\r
@@ -355,8 +356,6 @@ void display() {
     glLightfv(GL_LIGHT1, GL_POSITION, lightPosition1);\r
 \r
     drawFloor();\r
-\r
-    drawLine();\r
     \r
     // Draw teapot for a test object\r
     glPushMatrix();\r
@@ -385,6 +384,8 @@ void display() {
       glEnable(GL_LIGHTING);\r
     glPopMatrix();\r
 \r
+    drawAxisLines();\r
+\r
   glPopMatrix();\r
 \r
   glutSwapBuffers();\r
@@ -417,7 +418,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 +454,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