X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=7e287ed0d188bab5671461239aae2dfadf107569;hp=4a5a6865c150d42655d2a00348248e2fe44b2a59;hb=eeed8ee2fcc8f6d83cdfffd9543b1351dad1ebfe;hpb=3ec168e4f99e004e9bcc18bad462a627462ba870

diff --git a/scene.c b/scene.c
index 4a5a686..7e287ed 100644
--- a/scene.c
+++ b/scene.c
@@ -184,15 +184,8 @@ void makeMenu() {
  */
 void windowReshape(int w, int h) {
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  if (w <= h)
-    glFrustum(-1.0, 1.0, -1.0*(GLfloat) h / (GLfloat) w,
-      1.0*(GLfloat) h / (GLfloat) w, 2.0, 10.0);
-  else
-    glFrustum(-1.0*(GLfloat) w / (GLfloat) h,
-       1.0*(GLfloat) w / (GLfloat) h, -1.0, 1.0, 2.0, 10.0);
-  glMatrixMode(GL_MODELVIEW);
+  width = w;
+  height = h;
 }
 
 /**
@@ -293,8 +286,32 @@ void motion(int x, int y) {
  */
 void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  
+  // Redraw projection matrix
+  glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
 
+  float aspect = (float)height / (float)width;
+  if ( width > height ) aspect = (float)width / (float)height;
+
+  gluPerspective(
+    75.0,
+    aspect,
+    0.1,
+    200
+    );
+
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+
+  gluLookAt(
+    0.0,  0.0,  5.0,  /* eye is at (x,y,z) */
+    0.0,  0.0,  0.0,  /* center is at (x,y,z) */
+    0.0,  1.0,  0.0   /* up is in postivie Y direction */
+    );
+
+  glRotatef(75.0, 1.0, 0.0, 0.0);
+
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
   lightPosition[1] = lightHeight;
@@ -340,9 +357,6 @@ void display() {
  * init function; sets initial OpenGL state
  */
 void init() {
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-
   glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
@@ -353,11 +367,11 @@ void init() {
 
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);
 
-  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);
+  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);
 
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
@@ -398,22 +412,6 @@ int main(int argc, char **argv) {
   glEnable(GL_TEXTURE_2D);
   glLineWidth(1.0);
 
-  // **NOTE: Currently the perspective and look-at code is static, for testing purposes
-  //glMatrixMode(GL_PROJECTION);
-  //gluPerspective(
-  //   40.0, /* field of view in degree */
-  //    1.0, /* aspect ratio */
-  //    1.0, /* Z near */ // **NOTE: Seems to be issue with near < 0 causing invisible everything
-   // 100.0  /* Z far */
-  //  );
-
-  glMatrixMode(GL_MODELVIEW);
-  gluLookAt(
-    0.0,  35.0, -20.0,  /* eye is at (x,y,z) */
-    0.0,  10.0,  0.0,  /* center is at (x,y,z) */
-    0.0,  1.0,   0.0   /* up is in postivie Y direction */
-    );
-
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
   glutReshapeFunc(windowReshape);