X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=642fdcdc5bfce55a355ca9e68597233e8effdc66;hp=079433c9b26172f87f968e39e8db5de2dad97672;hb=736f5bfdedf4e3cd741eed4ee2974b3d133106fd;hpb=9630fcbe763ed8c935c60a44c0d8ace778383109

diff --git a/scene.c b/scene.c
index 079433c..642fdcd 100644
--- a/scene.c
+++ b/scene.c
@@ -291,14 +291,18 @@ void display() {
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
 
-  float aspect = (float)height / (float)width;
-  if ( width > height ) aspect = (float)width / (float)height;
+  float aspect;
+  if ( width <= height ) {
+    aspect = (float)height / (float)width;
+  } else {
+    aspect = (float)width / (float)height;
+  }
 
   gluPerspective(
-    90.0,
+    75.0,
     aspect,
     0.1,
-    100
+    200
     );
 
   glMatrixMode(GL_MODELVIEW);
@@ -310,7 +314,7 @@ void display() {
     0.0,  1.0,  0.0   /* up is in postivie Y direction */
     );
 
-  glRotatef(45.0, 1.0, 0.0, 0.0);
+  glRotatef(75.0, 1.0, 0.0, 0.0);
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -336,7 +340,9 @@ void display() {
     glPushMatrix();
       glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot currently does not rest on surface
       glColor3f(0.0, 0.0, 0.0);
+      glFrontFace(GL_CW);
       glutSolidTeapot(1);
+      glFrontFace(GL_CCW);
     glPopMatrix();
 
     // Draw a white ball over the light source
@@ -367,11 +373,11 @@ void init() {
 
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);
 
-  glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, ambient);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diffuse);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specular);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, emission0);
-  glMaterialf(GL_FRONT_AND_BACK, 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, emission0);
+  glMaterialf(GL_FRONT, GL_SHININESS, shine);
 
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
@@ -408,9 +414,10 @@ int main(int argc, char **argv) {
   glDepthRange(0,1);
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing
   glDepthFunc(GL_LEQUAL);  // the type
-  glEnable(GL_CULL_FACE);
   glEnable(GL_TEXTURE_2D);
-  glLineWidth(1.0);
+  glEnable(GL_CULL_FACE);
+  glEnable(GL_NORMALIZE);
+  glLineWidth(2.0);
 
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);