X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=ecabe1f16b5ffc278f564915507a5987fc1b7a66;hp=c7cd7a53a9a49e83dd388403d157231ac6abae4d;hb=e1106adcec8622ffa66be50379561f4c9cd06ea6;hpb=f369e5b4fb935813043425ddde66098775615261

diff --git a/scene.c b/scene.c
index c7cd7a5..ecabe1f 100644
--- a/scene.c
+++ b/scene.c
@@ -182,7 +182,7 @@ 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();
@@ -191,10 +191,10 @@ void windowReshape(int w, int h) {
              far*(GLfloat)h/(GLfloat)w, -100, 100);
   else
     glOrtho(near*(GLfloat)w/(GLfloat)h,
-             far*(GLfloat)w/(GLfloat)h, near, far, -100, 100);
-   glMatrixMode(GL_MODELVIEW); 
+             far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);
+   glMatrixMode(GL_MODELVIEW);
    glLoadIdentity();
-}
+}*/
 
 /**
  * Called when mouse event occurs
@@ -263,7 +263,7 @@ void display() {
 
   // **NOTE: Currently this rotation function is all that moves the camera off
   //         the flat surface. Need to integrate function into gluLookAt
-  glRotatef(30.0, 1.0, 0.0, 0.0);
+  glRotatef(20, 1.0, 0.0, 0.0);
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -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);