X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=391cd46e361572853c9f530a9734fa022083729e;hp=cc687e7e5efb754ad6743843010c829b6e8fbf1e;hb=94093fb9572b307fbe6a4c1758ee30e9e8233020;hpb=bab833c4516be2cf9015238dcefd6eef24cd19f8

diff --git a/scene.c b/scene.c
index cc687e7..391cd46 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,11 +295,11 @@ 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);
   
@@ -327,9 +327,9 @@ void display() {
     
     // Draw teapot for a test object
     glPushMatrix();
-      glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
-      glColor3f(0.5, 0.5, 0.5);
-      glutSolidTeapot(25);
+      glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot does not rest on surface
+      glColor3f(0.0, 0.0, 0.0);
+      glutSolidTeapot(1);
     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 */
@@ -413,6 +413,21 @@ int main(int argc, char **argv) {
   glEnable(GL_TEXTURE_2D);
   glLineWidth(1.0);
 
+  glMatrixMode(GL_PROJECTION);
+  gluPerspective(
+     40.0, /* field of view in degree */
+      1.0, /* aspect ratio */
+     10.0, /* Z near */
+    1000.0  /* Z far */
+    );
+
+  glMatrixMode(GL_MODELVIEW);
+  gluLookAt(
+    0.0, 35.0, -20.0,  /* eye is at (0,8,60) */
+    0.0,  10.0,  0.0,  /* center is at (0,8,0) */
+    0.0,  1.0,  0.0   /* up is in postivie Y direction */
+    );
+
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
   glutReshapeFunc(windowReshape);