X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=5ae5f23cf75507cfb626517607bfb935b7980a8c;hp=541ae5fe706b63ca53d49352c3b00ad321712b86;hb=4a470149c629f3adba283d53486b4a8f78cd8262;hpb=9c4c0de38cd7dabbd578527b4f895fe3e0b230a3

diff --git a/scene.c b/scene.c
index 541ae5f..5ae5f23 100644
--- a/scene.c
+++ b/scene.c
@@ -125,7 +125,7 @@ int lightMoving = 0, lightStartX, lightStartY;
 
 /* Time varying or user-controled variables. */
 static float jump = 0.0;
-static float lightAngle = 0.0, lightHeight = 20;
+static float lightAngle = 0.0, lightHeight = 5;
 GLfloat angle = -150;   /* in degrees */
 GLfloat angle2 = 30;   /* in degrees */
 
@@ -484,8 +484,8 @@ void makeMenu() {
  * @param h New height
  */
 void windowReshape(int w, int h) {
-  GLdouble near = -1000.0;
-  GLdouble far = 1000.0;
+  GLdouble near = -10.0;
+  GLdouble far = 10.0;
 
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);
   glMatrixMode(GL_PROJECTION);
@@ -509,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)
 {
@@ -552,58 +552,24 @@ motion(int x, int y)
     lightStartY = y;
     glutPostRedisplay();
   }
-}*/
+}
 
 void idle() {
   angle = (int)(angle + 10) % 360;
-    //angle2 = (int)(angle2 + 10) % 360;
-    printf("Angle 1: %f, Angle 2: %f\n", angle, angle2);
-    sleep(25);
-    glutPostRedisplay();
+  //angle2 = (int)(angle2 + 10) % 360;
+  printf("Angle 1: %f, Angle 2: %f\n", angle, angle2);
+  sleep(1);
+  glutPostRedisplay();
 }
 
-/**
- * Draw a floor.
- */
-void drawFloor() {
-  glDisable(GL_LIGHTING);
-
-  //if (useTexture) {
-  //  glEnable(GL_TEXTURE_2D);
-  //}
-
-  /*glBegin(GL_QUADS);
-    glTexCoord2f(0.0, 0.0);
-    glVertex3fv(floorVertices[0]);
-    glTexCoord2f(0.0, 16.0);
-    glVertex3fv(floorVertices[1]);
-    glTexCoord2f(16.0, 16.0);
-    glVertex3fv(floorVertices[2]);
-    glTexCoord2f(16.0, 0.0);
-    glVertex3fv(floorVertices[3]);
-  glEnd();*/
-
-drawSquare(0, -1000, -1000, 1000, 1000);
 
-  /*if (useTexture) {
-    glDisable(GL_TEXTURE_2D);
-  }*/
-
-  glEnable(GL_LIGHTING);
-}
-
-int drawFloorRecurse = 2;
-/*void drawSquare(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
-  drawSquare(0, x1, y1, x2, y2);
-}*/
+int drawFloorRecurse = 5;
 
-void drawSquare(int recurseLevel, GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
-
-  printf("Recurse level %d\n", recurseLevel);
+void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
 
   if ( drawFloorRecurse != recurseLevel ) {
-    GLfloat xm = (x1 + x2) / 2.0;
-    GLfloat ym = (y1 + y2) / 2.0;
+    float xm = (x1 + x2) / 2.0;
+    float ym = (y1 + y2) / 2.0;
     int rnew = recurseLevel + 1;
 
     // Split into four sub-quads
@@ -611,9 +577,8 @@ void drawSquare(int recurseLevel, GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2
     drawSquare(rnew, x1, ym, xm, y2);
     drawSquare(rnew, xm, ym, x2, y2);
     drawSquare(rnew, xm, y1, x2, ym);
-    
+
   } else {
-    printf("Drawing (%f, %f) -> (%f, %f)\n", x1, y2, x2, y2);
     glBegin(GL_QUADS);
       glVertex3f(x1, 0.0, y1);
       glVertex3f(x1, 0.0, y2);
@@ -624,6 +589,23 @@ void drawSquare(int recurseLevel, GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2
 
 }
 
+/**
+ * Draw a floor.
+ */
+void drawFloor() {
+ 
+drawSquare(0, -100.0, -100.0, 100.0, 100.0);
+
+  /*if (useTexture) {
+    glDisable(GL_TEXTURE_2D);
+  }*/
+
+}
+
+/*void drawSquare(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
+  drawSquare(0, x1, y1, x2, y2);
+}*/
+
 /**
  * Display function
  */
@@ -631,11 +613,13 @@ void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glLoadIdentity();
   gluLookAt(
-    0.0, 0.0, 60.0,  /* eye is at (x,y,z) */
+    0.0, 0.0, 10.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 */
     );
 
+  glRotatef(30.0, 1.0, 0.0, 0.0);
+
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
   lightPosition[1] = lightHeight;
@@ -644,7 +628,7 @@ void display() {
 
   glPushMatrix();
       /* Perform scene rotations based on user mouse input. */
-    glRotatef(angle2, 1.0, 0.0, 0.0);
+    
     glRotatef(angle, 0.0, 1.0, 0.0);
 
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
@@ -657,7 +641,7 @@ void display() {
     glPushMatrix();
     
       //glTranslatef(0.0, 0.0, 0.0);
-      glutWireTeapot(30); // Draw teapot for test
+      glutWireTeapot(1); // Draw teapot for test
     glPopMatrix();
 
     glPushMatrix();
@@ -666,7 +650,7 @@ void display() {
 
       /* Draw a yellow ball at the light source. */
       glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);
-      glutSolidSphere(1.0, 5, 5);
+      glutSolidSphere(1.0, 50, 50);
 
       glEnable(GL_LIGHTING);
     glPopMatrix();
@@ -739,9 +723,9 @@ int main(int argc, char **argv) {
 
   glutReshapeFunc(windowReshape);
   glutDisplayFunc(display);
-  //glutMouseFunc(mouse);
-  //glutMotionFunc(motion);
-  glutIdleFunc(idle);
+  glutMouseFunc(mouse);
+  glutMotionFunc(motion);
+  //glutIdleFunc(idle);
 
   makeMenu();