X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=6be6503f6ed5105da1583c8e0a72878276938e3f;hp=3bda9b42afdb3c4f77f2079cfa04766b448992da;hb=3907265dfa666c2490c4d7299a9610e5c506ccb1;hpb=519f453dab3dd31341d4dc2e6e1ae4f3beac977c

diff --git a/scene.c b/scene.c
index 3bda9b4..6be6503 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);
 
@@ -318,7 +319,7 @@ void display() {
     75.0,
     aspect,
     0.1,
-    200
+    300
     );
 
   glMatrixMode(GL_MODELVIEW);
@@ -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. */
@@ -355,8 +362,6 @@ void display() {
     glLightfv(GL_LIGHT1, GL_POSITION, lightPosition1);
 
     drawFloor();
-
-    drawLine();
     
     // Draw teapot for a test object
     glPushMatrix();
@@ -385,6 +390,8 @@ void display() {
       glEnable(GL_LIGHTING);
     glPopMatrix();
 
+    drawAxisLines();
+
   glPopMatrix();
 
   glutSwapBuffers();
@@ -400,6 +407,7 @@ void init() {
   glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0);
 
   glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 90.0);
+  glLightf(GL_LIGHT0, GL_SPOT_EXPONENT,1);
 
   glLightfv(GL_LIGHT1, GL_AMBIENT, ambient1);
   glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse1);
@@ -407,14 +415,16 @@ void init() {
   glLightfv(GL_LIGHT1, GL_SPOT_DIRECTION, direction1);
 
   glLightf(GL_LIGHT1, GL_SPOT_CUTOFF, 90.0);
+  glLightf(GL_LIGHT1, GL_SPOT_EXPONENT,1);
 
   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);
-  glMaterialfv(GL_FRONT, GL_SPECULAR, specular);
-  glMaterialfv(GL_FRONT, GL_EMISSION, emission);
-  glMaterialf(GL_FRONT, GL_SHININESS, shine);
+  //glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);
+  //glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);
+  //glMaterialfv(GL_FRONT, GL_SPECULAR, specular);
+  //glMaterialfv(GL_FRONT, GL_EMISSION, emission);
+  //glMaterialf(GL_FRONT, GL_SHININESS, shine);
 
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHT1);
@@ -453,7 +463,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);