(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 0c5329b..af2d52c 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -184,7 +184,8 @@ void makeMenu() {
  */\r
 void windowReshape(int w, int h) {\r
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);\r
-  // **NOTE: windowReshape needs to be re-written using glFrustrum and perspective projection calculations\r
+  width = w;\r
+  height = h;\r
 }\r
 \r
 /**\r
@@ -285,8 +286,32 @@ void motion(int x, int y) {
  */\r
 void display() {\r
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
+  \r
+  // Redraw projection matrix\r
+  glMatrixMode(GL_PROJECTION);\r
+  glLoadIdentity();\r
+\r
+  float aspect = (float)height / (float)width;\r
+  if ( width > height ) aspect = (float)width / (float)height;\r
+\r
+  gluPerspective(\r
+    75.0,\r
+    aspect,\r
+    0.1,\r
+    200\r
+    );\r
+\r
+  glMatrixMode(GL_MODELVIEW);\r
   glLoadIdentity();\r
 \r
+  gluLookAt(\r
+    0.0,  0.0,  5.0,  /* eye is at (x,y,z) */\r
+    0.0,  0.0,  0.0,  /* center is at (x,y,z) */\r
+    0.0,  1.0,  0.0   /* up is in postivie Y direction */\r
+    );\r
+\r
+  glRotatef(75.0, 1.0, 0.0, 0.0);\r
+\r
   /* Reposition the light source. */\r
   lightPosition[0] = 12*cos(lightAngle);\r
   lightPosition[1] = lightHeight;\r
@@ -296,7 +321,7 @@ void display() {
   glPushMatrix();\r
 \r
     /* Perform scene rotations based on user mouse/keyboard input. */\r
-    glRotatef(angle, 0.0, 1.0, 0.0);\r
+    glRotatef(angle, 0.0, 0.0,1.0);\r
     glRotatef(angle2, 1.0, 0.0, 0.0);\r
     glTranslatef(camx, camy, camz);\r
     glRotatef(rot, 1.0, 0.0, 0.0);\r
@@ -332,9 +357,6 @@ void display() {
  * init function; sets initial OpenGL state\r
  */\r
 void init() {\r
-  glMatrixMode(GL_MODELVIEW);\r
-  glLoadIdentity();\r
-\r
   glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);\r
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);\r
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);\r
@@ -345,11 +367,11 @@ void init() {
 \r
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);\r
 \r
-  glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);\r
-  glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);\r
-  glMaterialfv(GL_FRONT, GL_SPECULAR, specular);\r
-  glMaterialfv(GL_FRONT, GL_EMISSION, emission0);\r
-  glMaterialf(GL_FRONT, GL_SHININESS, shine);\r
+  glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, ambient);\r
+  glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diffuse);\r
+  glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specular);\r
+  glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, emission0);\r
+  glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shine);\r
 \r
   glEnable(GL_LIGHT0);\r
   glEnable(GL_LIGHTING);\r
@@ -388,24 +410,9 @@ int main(int argc, char **argv) {
   glDepthFunc(GL_LEQUAL);  // the type\r
   glEnable(GL_CULL_FACE);\r
   glEnable(GL_TEXTURE_2D);\r
+  glEnable(GL_NORMALIZE);\r
   glLineWidth(1.0);\r
 \r
-  // **NOTE: Currently the perspective and look-at code is static, for testing purposes\r
-  glMatrixMode(GL_PROJECTION);\r
-  gluPerspective(\r
-     40.0, /* field of view in degree */\r
-      1.0, /* aspect ratio */\r
-      1.0, /* Z near */ // **NOTE: Seems to be issue with near < 0 causing invisible everything\r
-    100.0  /* Z far */\r
-    );\r
-\r
-  glMatrixMode(GL_MODELVIEW);\r
-  gluLookAt(\r
-    0.0,  35.0, -20.0,  /* eye is at (x,y,z) */\r
-    0.0,  10.0,  0.0,  /* center is at (x,y,z) */\r
-    0.0,  1.0,   0.0   /* up is in postivie Y direction */\r
-    );\r
-\r
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);\r
 \r
   glutReshapeFunc(windowReshape);\r