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

diff --git a/scene.c b/scene.c
index 19d74af..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);
 
@@ -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();
@@ -370,21 +375,23 @@ void display() {
     // Draw a white ball over the light source
     glPushMatrix();
       glDisable(GL_LIGHTING);
-      glColor3f(1.0, 1.0, 0.0);
+      glColor3f(1.0, 1.0, 1.0);
       glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]);
-      glutSolidSphere(1.0, 50, 50);
+      glutSolidSphere(0.5, 50, 50);
       glEnable(GL_LIGHTING);
     glPopMatrix();
 
     // Draw a white ball over the light source
     glPushMatrix();
       glDisable(GL_LIGHTING);
-      glColor3f(1.0, 1.0, 0.0);
+      glColor3f(1.0, 1.0, 1.0);
       glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]);
-      glutSolidSphere(1.0, 50, 50);
+      glutSolidSphere(0.5, 50, 50);
       glEnable(GL_LIGHTING);
     glPopMatrix();
 
+    drawAxisLines();
+
   glPopMatrix();
 
   glutSwapBuffers();
@@ -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);
@@ -453,7 +461,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);