X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=e8d7bb8777b809d75f424e7d4f99be53ada81b15;hb=4b694f000a2b15bb70939493eaeae2847f099f4b;hp=27466525e62e3a00479cd20e0adea31a19ead70e;hpb=46033191f0e87b94bf98b68146890be3770eaad1;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 2746652..e8d7bb8 100644
--- a/scene.c
+++ b/scene.c
@@ -182,19 +182,19 @@ void makeMenu() {
  * @param w New width
  * @param h New height
  */
-void windowReshape(int w, int h) {
+/*void windowReshape(int w, int h) {
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   if (w <= h) 
     glOrtho(near, far, near*(GLfloat)h/(GLfloat)w,
-             far*(GLfloat)h/(GLfloat)w, near, far);
+             far*(GLfloat)h/(GLfloat)w, -100, 100);
   else
     glOrtho(near*(GLfloat)w/(GLfloat)h,
-             far*(GLfloat)w/(GLfloat)h, near, far, near, far);
-   glMatrixMode(GL_MODELVIEW); 
+             far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);
+   glMatrixMode(GL_MODELVIEW);
    glLoadIdentity();
-}
+}*/
 
 /**
  * Called when mouse event occurs
@@ -255,7 +255,7 @@ void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glLoadIdentity();
   gluLookAt(
-    0.0, 0.0, 10.0,  /* eye is at (x,y,z) */
+    0.0, 10.0, 10.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 */
     );
@@ -285,7 +285,7 @@ void display() {
     
     // Draw teapot for a test object
     glPushMatrix();
-      glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot does not rest on surface
+      glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
       glColor3f(0.5, 0.5, 0.5);
       glutSolidTeapot(1);
     glPopMatrix();
@@ -311,14 +311,16 @@ void init() {
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
 
-  gluPerspective(
+   gluPerspective(
     60.0,  /* field of view in degree */
      1.0,  /* aspect ratio */
-    near,  /* Z near */
-     far   /* Z far */
+    nearClip,  /* Z near */
+     farClip   /* Z far */
     );
-
   
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+
   glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
@@ -333,8 +335,6 @@ void init() {
 
   
 
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
 }
 
 /**
@@ -373,7 +373,7 @@ int main(int argc, char **argv) {
 
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
-  glutReshapeFunc(windowReshape);
+  //glutReshapeFunc(windowReshape);
   glutDisplayFunc(display);
   glutMouseFunc(mouse);
   glutMotionFunc(motion);