X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=628d27ece9702b1482b947138ee7f66b5c45a1d8;hp=a7965438f5cff2e1a6588be47718743663f9da32;hb=8f6656802ea9c7a29f69ff58dc675d9c49331875;hpb=66ac3dee15c36c09cb7cb49ffec82640f8ea500a

diff --git a/scene.c b/scene.c
index a796543..628d27e 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);
+  /*glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   if (w <= h) 
-    glOrtho(near, far, near*(GLfloat)h/(GLfloat)w,
+    glFrustum(near, far, near*(GLfloat)h/(GLfloat)w,
              far*(GLfloat)h/(GLfloat)w, -100, 100);
   else
-    glOrtho(near*(GLfloat)w/(GLfloat)h,
+    glFrustum(near*(GLfloat)w/(GLfloat)h,
              far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);
    glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-}*/
+   glLoadIdentity();*/
+}
 
 /**
  * Called when mouse event occurs
@@ -231,6 +231,7 @@ void mouse(int button, int state, int x, int y) {
  * w/s increase/decrease the z
  * a/d increase/decrease the x
  * q/e increase/decrease the y
+ * z/x increase/decrease the angle
  * @param key Key pressed
  * @param x x co-ordinate of mouse
  * @param y y co-ordinate of mouse
@@ -255,8 +256,14 @@ void keyboard(unsigned char key, int x, int y) {
     case 'e':
       camy = camy - 1;
       break;
+    case 'z':
+      rot = rot + 1;
+      break;
+    case 'x':
+      rot = rot - 1;
+      break;
   }
-  printf("Camera is now at (%f, %f, %f)\n", camx, camy, camz);
+  printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, rot);
   glutPostRedisplay();
 }
 
@@ -288,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(50.0, 1.0, 0.0, 0.0);
+  //glRotatef(rot, 1.0, 0.0, 0.0);
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -310,7 +317,7 @@ void display() {
 
     /* Perform scene rotations based on user mouse input. */
     glRotatef(angle, 0.0, 1.0, 0.0);
-    //glRotatef(angle2, 1.0, 0.0, 0.0); **NOTE: Only one degree of freedom
+    glRotatef(angle2, 1.0, 0.0, 0.0); //**NOTE: Only one degree of freedom
 
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
 
@@ -322,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(1);
+      glutSolidTeapot(10);
     glPopMatrix();
 
     // Draw a white ball over the light source
@@ -343,15 +350,15 @@ void display() {
  * init function; sets initial OpenGL state
  */
 void init() {
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-
-   gluPerspective(
-    60.0,  /* field of view in degree */
-     1.0,  /* aspect ratio */
-    nearClip,  /* Z near */
-     farClip   /* Z far */
-    );
+  //glMatrixMode(GL_PROJECTION);
+  //glLoadIdentity();
+
+   //gluPerspective(
+   // 60.0,  /* field of view in degree */
+   //  1.0,  /* aspect ratio */
+   // nearClip,  /* Z near */
+    // farClip   /* Z far */
+   // );
   
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
@@ -406,9 +413,18 @@ int main(int argc, char **argv) {
   glEnable(GL_TEXTURE_2D);
   glLineWidth(1.0);
 
+    glMatrixMode(GL_PROJECTION);
+  gluPerspective( /* field of view in degree */ 40.0,
+  /* aspect ratio */ 1.0,
+    /* Z near */ 20.0, /* Z far */ 100.0);
+  glMatrixMode(GL_MODELVIEW);
+  gluLookAt(0.0, 8.0, 60.0,  /* eye is at (0,8,60) */
+    0.0, 8.0, 0.0,      /* center is at (0,8,0) */
+    0.0, 1.0, 0.);      /* up is in postivie Y direction */
+
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
-  //glutReshapeFunc(windowReshape);
+  glutReshapeFunc(windowReshape);
   glutDisplayFunc(display);
   glutMouseFunc(mouse);
   glutKeyboardFunc(keyboard);