X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=81c5b562361e52da32384c9c6e0cee3dafcf7389;hb=e4ce2f6ee4857a66d2f9845c5dc10e35b80f3946;hp=242a10482f0cfae27c4c01f2bda37e7f38bf4100;hpb=fbcff5fdddb4380b77f5cc4eb8a9419266fc1355;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 242a104..81c5b56 100644
--- a/scene.c
+++ b/scene.c
@@ -10,6 +10,7 @@
 #include <math.h>
 #include <GL/gl.h>
 #include <GL/glut.h>
+#include <time.h>
 
 #include "bitmap.h"
 
@@ -508,7 +509,7 @@ void windowReshape(int w, int h) {
  */
 /*void mouse(int btn, int state, int x, int y) {
   
-}*/
+}*//*
 static void
 mouse(int button, int state, int x, int y)
 {
@@ -551,8 +552,15 @@ motion(int x, int y)
     lightStartY = y;
     glutPostRedisplay();
   }
-}
+}*/
 
+void idle() {
+  angle = (int)(angle + 10) % 360;
+    //angle2 = (int)(angle2 + 10) % 360;
+    printf("Angle 1: %d, Angle 2: %d", angle, angle2);
+    sleep(2);
+    glutPostRedisplay();
+}
 
 /**
  * Draw a floor.
@@ -591,7 +599,7 @@ void display() {
   gluLookAt(
     0.0, 0.0, 60.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 */
+    0.0, 1.0,  0.0   /* up is in postivie Y direction */
     );
 
   /* Reposition the light source. */
@@ -614,9 +622,8 @@ void display() {
 
     glPushMatrix();
     
-      //glTranslatef(0.0, 0.0, 0.0);
- 
-      glutSolidTeapot(30); // Draw teapot for test
+      glTranslatef(0.0, 0.0, 0.0);
+      glutWireTeapot(30); // Draw teapot for test
     glPopMatrix();
 
     glPushMatrix();
@@ -692,14 +699,15 @@ int main(int argc, char **argv) {
   glDepthFunc(GL_LEQUAL);  // the type
   glEnable(GL_CULL_FACE);
   glEnable(GL_TEXTURE_2D);
-  glLineWidth(3.0);
+  glLineWidth(1.0);
 
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
   glutReshapeFunc(windowReshape);
   glutDisplayFunc(display);
-  glutMouseFunc(mouse);
-  glutMotionFunc(motion);
+  //glutMouseFunc(mouse);
+  //glutMotionFunc(motion);
+  glutIdleFunc(idle);
 
   makeMenu();