X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=ad373f09dcb6fcbd7cfd1803a67b3f7685cc724d;hp=cc687e7e5efb754ad6743843010c829b6e8fbf1e;hb=b52538349a594cfb6458e5e3320e33ff67d0ae3e;hpb=bab833c4516be2cf9015238dcefd6eef24cd19f8;ds=sidebyside

diff --git a/scene.c b/scene.c
index cc687e7..ad373f0 100644
--- a/scene.c
+++ b/scene.c
@@ -184,7 +184,7 @@ void makeMenu() {
  */
 void windowReshape(int w, int h) {
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);
-  glMatrixMode(GL_PROJECTION);
+  /*glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   if (w <= h) 
     glFrustum(near, far, near*(GLfloat)h/(GLfloat)w,
@@ -193,7 +193,7 @@ void windowReshape(int w, int h) {
     glFrustum(near*(GLfloat)w/(GLfloat)h,
              far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);
    glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
+   glLoadIdentity();*/
 }
 
 /**
@@ -295,17 +295,17 @@ void motion(int x, int y) {
 void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glLoadIdentity();
-  gluLookAt(
-    0.0, 0.0, 30.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 */
-    );
+  //gluLookAt(
+  //  0.0, 0.0, 30.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 */
+   // );
 
-  glTranslatef(camx, camy, camz);
+  //glTranslatef(camx, camy, camz);
   
   // **NOTE: Currently this rotation function is all that moves the camera off
   //         the flat surface. Need to integrate function into gluLookAt
-  glRotatef(rot, 1.0, 0.0, 0.0);
+  //glRotatef(rot, 1.0, 0.0, 0.0);
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -329,7 +329,7 @@ void display() {
     glPushMatrix();
       glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
       glColor3f(0.5, 0.5, 0.5);
-      glutSolidTeapot(25);
+      glutSolidTeapot(100);
     glPopMatrix();
 
     // Draw a white ball over the light source
@@ -350,8 +350,8 @@ void display() {
  * init function; sets initial OpenGL state
  */
 void init() {
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
+  //glMatrixMode(GL_PROJECTION);
+  //glLoadIdentity();
 
    //gluPerspective(
    // 60.0,  /* field of view in degree */