(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index de3a2f7..914f3a6 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -123,8 +123,8 @@ GLfloat angle = -150;   /* in degrees */
 GLfloat angle2 = 30;   /* in degrees */\r
 \r
 /* Near and far parameters */\r
-GLfloat near = -10;\r
-GLfloat far = 10;\r
+GLfloat near = -100;\r
+GLfloat far = 100;\r
 \r
 /* Zoom factor for mouse movements */\r
 GLfloat zoomFactor = 1.0;\r
@@ -500,7 +500,7 @@ 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
@@ -509,7 +509,7 @@ void windowReshape(int w, int h) {
     glOrtho(near*(GLfloat)w/(GLfloat)h,\r
              far*(GLfloat)w/(GLfloat)h, near, far, near, far);\r
    glMatrixMode(GL_MODELVIEW); \r
-   glLoadIdentity();\r
+   glLoadIdentity();*/\r
 }\r
 \r
 /**\r
@@ -635,7 +635,7 @@ void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
   glLoadIdentity();\r
   gluLookAt(\r
-    0.0, 0.0, 10.0,  /* eye is at (x,y,z) */\r
+    0.0, 10.0, 10.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
@@ -665,9 +665,9 @@ void display() {
     \r
     // Draw teapot for a test object\r
     glPushMatrix();\r
-      glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface\r
+      glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot does not rest on surface\r
       glColor3f(0.5, 0.5, 0.5);\r
-      glutWireTeapot(1);\r
+      glutSolidTeapot(1);\r
     glPopMatrix();\r
 \r
     // Draw a white ball over the light source\r
@@ -696,7 +696,7 @@ void init() {
      1.0,  /* aspect ratio */\r
     near,  /* Z near */\r
      far   /* Z far */\r
-    );    \r
+    );\r
 \r
   \r
   glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);\r