X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=954d75ce1f1ec1f31daf757659c977469966fc95;hp=b4469b752e909f30fe1628bf0764e440a27f8b76;hb=272fb88381b2021bc430384231d0d2fcd64fa1b6;hpb=e1fc70add9281f69123aef6261d7ac016f3275d6

diff --git a/scene.c b/scene.c
index b4469b7..954d75c 100644
--- a/scene.c
+++ b/scene.c
@@ -123,8 +123,8 @@ GLfloat angle = -150;   /* in degrees */
 GLfloat angle2 = 30;   /* in degrees */
 
 /* Near and far parameters */
-GLfloat near = -10;
-GLfloat far = 10;
+GLfloat near = -100;
+GLfloat far = 100;
 
 /* Zoom factor for mouse movements */
 GLfloat zoomFactor = 1.0;
@@ -135,6 +135,13 @@ int drawFloorRecurse = 5;
 /* Size of floor, from -n to n */
 int floorSize = 100;
 
+/* Light 0 parameters */
+GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};
+GLfloat ambient0[] = {1.0, 1.0, 1.0, 1.0};
+GLfloat specular0[] = {1.0, 1.0, 1.0, 1.0};
+GLfloat light0_pos[] ={ 1.0, 2.0, 3,0, 1.0};
+
+
 /**
  * Prints out error message when file cannot be read
  * @param fileName Name of file that could not be read
@@ -626,29 +633,24 @@ void display() {
 
     /* Perform scene rotations based on user mouse input. */
     glRotatef(angle, 0.0, 1.0, 0.0);
-    glRotatef(angle2, 1.0, 0.0, 0.0);
+    //glRotatef(angle2, 1.0, 0.0, 0.0); **NOTE: Only one degree of freedom
 
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
 
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     drawFloor();
-    glDisable(GL_BLEND);
 
+    // Draw teapot for a test object
     glPushMatrix();
-    
-      glTranslatef(0.0, 1.0, 0.0);
-      glutWireTeapot(1); // Draw teapot for test
+      glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
+      glutWireTeapot(1);
     glPopMatrix();
 
+    // Draw a white ball over the light source
     glPushMatrix();
       glDisable(GL_LIGHTING);
       glColor3f(1.0, 1.0, 1.0);
-
-      /* Draw a yellow ball at the light source. */
       glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);
       glutSolidSphere(1.0, 50, 50);
-
       glEnable(GL_LIGHTING);
     glPopMatrix();
 
@@ -665,23 +667,17 @@ void init() {
   glLoadIdentity();
 
   gluPerspective(
-       60.0,  /* field of view in degree */
-        1.0,  /* aspect ratio */
-     near,  /* Z near */
+    60.0,  /* field of view in degree */
+     1.0,  /* aspect ratio */
+    near,  /* Z near */
      far   /* Z far */
     );    
 
-
-GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};
-GLfloat ambient0[] = {1.0, 1.0, 1.0, 1.0};
-GLfloat specular0[] = {1.0, 1.0, 1.0, 1.0};
-GLfloat light0_pos[] ={ 1.0, 2.0, 3,0, 1.0};
-
-glEnable(GL_LIGHT0);
-glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
-glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
-glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
-glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);
+  glEnable(GL_LIGHT0);
+  glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
+  glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
+  glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
+  glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);
   glEnable(GL_LIGHTING);
 
   glMatrixMode(GL_MODELVIEW);
@@ -728,7 +724,6 @@ int main(int argc, char **argv) {
   glutDisplayFunc(display);
   glutMouseFunc(mouse);
   glutMotionFunc(motion);
-  //glutIdleFunc(idle);
 
   makeMenu();