(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 1cc9122..d142941 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -184,16 +184,16 @@ void makeMenu() {
  */\r
 void windowReshape(int w, int h) {\r
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);\r
-  glMatrixMode(GL_PROJECTION);\r
+  /*glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity();\r
   if (w <= h) \r
-    glOrtho(near, far, near*(GLfloat)h/(GLfloat)w,\r
+    glFrustum(near, far, near*(GLfloat)h/(GLfloat)w,\r
              far*(GLfloat)h/(GLfloat)w, -100, 100);\r
   else\r
-    glOrtho(near*(GLfloat)w/(GLfloat)h,\r
+    glFrustum(near*(GLfloat)w/(GLfloat)h,\r
              far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);\r
    glMatrixMode(GL_MODELVIEW);\r
-   glLoadIdentity();\r
+   glLoadIdentity();*/\r
 }\r
 \r
 /**\r
@@ -295,11 +295,11 @@ void motion(int x, int y) {
 void display() {\r
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
   glLoadIdentity();\r
-  gluLookAt(\r
-    0.0, 0.0, 30.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
+  //gluLookAt(\r
+  //  0.0, 0.0, 30.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
   glTranslatef(camx, camy, camz);\r
   \r
@@ -329,7 +329,7 @@ void display() {
     glPushMatrix();\r
       glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface\r
       glColor3f(0.5, 0.5, 0.5);\r
-      glutSolidTeapot(25);\r
+      glutSolidTeapot(1);\r
     glPopMatrix();\r
 \r
     // Draw a white ball over the light source\r
@@ -350,8 +350,8 @@ void display() {
  * init function; sets initial OpenGL state\r
  */\r
 void init() {\r
-  glMatrixMode(GL_PROJECTION);\r
-  glLoadIdentity();\r
+  //glMatrixMode(GL_PROJECTION);\r
+  //glLoadIdentity();\r
 \r
    //gluPerspective(\r
    // 60.0,  /* field of view in degree */\r
@@ -413,9 +413,24 @@ int main(int argc, char **argv) {
   glEnable(GL_TEXTURE_2D);\r
   glLineWidth(1.0);\r
 \r
+  glMatrixMode(GL_PROJECTION);\r
+  gluPerspective(\r
+     40.0, /* field of view in degree */\r
+      1.0, /* aspect ratio */\r
+     10.0, /* Z near */\r
+    1000.0  /* Z far */\r
+    );\r
+\r
+  glMatrixMode(GL_MODELVIEW);\r
+  gluLookAt(\r
+    0.0, 35.0, -20.0,  /* eye is at (0,8,60) */\r
+    0.0,  10.0,  0.0,  /* center is at (0,8,0) */\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
+  glutReshapeFunc(windowReshape);\r
   glutDisplayFunc(display);\r
   glutMouseFunc(mouse);\r
   glutKeyboardFunc(keyboard);\r