X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=93470921667eda93f674214fe7bb0fae04cf210c;hp=d1dc1a5f233a5baba7d43af17ad56fd5591fe9dc;hb=f66520948800fea23aabf1673512d75e325898b7;hpb=74545b230f573019582cec20108918e64b151519

diff --git a/scene.c b/scene.c
index d1dc1a5..9347092 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"
 
@@ -124,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 = 40;
 GLfloat angle = -150;   /* in degrees */
 GLfloat angle2 = 30;   /* in degrees */
 
@@ -483,8 +484,8 @@ void makeMenu() {
  * @param h New height
  */
 void windowReshape(int w, int h) {
-  GLdouble near = -10.0;
-  GLdouble far = 10.0;
+  GLdouble near = -100.0;
+  GLdouble far = 1000.0;
 
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);
   glMatrixMode(GL_PROJECTION);
@@ -555,40 +556,56 @@ motion(int x, int y)
 
 void idle() {
   angle = (int)(angle + 10) % 360;
-    angle2 = (int)(angle2 + 10) % 360;
-    printf("Angle 1: %d, Angle 2: %d", angle, angle2);
-    sleep(2);
-    glutPostRedisplay();
+  //angle2 = (int)(angle2 + 10) % 360;
+  printf("Angle 1: %f, Angle 2: %f\n", angle, angle2);
+  sleep(1);
+  glutPostRedisplay();
+}
+
+
+int drawFloorRecurse = 5;
+
+void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
+
+  if ( drawFloorRecurse != recurseLevel ) {
+    float xm = (x1 + x2) / 2.0;
+    float ym = (y1 + y2) / 2.0;
+    int rnew = recurseLevel + 1;
+
+    // Split into four sub-quads
+    drawSquare(rnew, x1, y1, xm, ym);
+    drawSquare(rnew, x1, ym, xm, y2);
+    drawSquare(rnew, xm, ym, x2, y2);
+    drawSquare(rnew, xm, y1, x2, ym);
+
+  } else {
+    glBegin(GL_QUADS);
+      glVertex3f(x1, 0.0, y1);
+      glVertex3f(x1, 0.0, y2);
+      glVertex3f(x2, 0.0, y2);
+      glVertex3f(x2, 0.0, y1);
+    glEnd();
+  }
+
 }
 
 /**
  * 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.0, -1000.0, 1000.0, 1000.0);
 
   /*if (useTexture) {
     glDisable(GL_TEXTURE_2D);
   }*/
 
-  glEnable(GL_LIGHTING);
 }
 
+/*void drawSquare(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
+  drawSquare(0, x1, y1, x2, y2);
+}*/
+
 /**
  * Display function
  */
@@ -596,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, 80.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;
@@ -609,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);
@@ -621,7 +640,7 @@ void display() {
 
     glPushMatrix();
     
-      glTranslatef(0.0, 0.0, 0.0);
+      //glTranslatef(0.0, 0.0, 0.0);
       glutWireTeapot(30); // Draw teapot for test
     glPopMatrix();
 
@@ -649,10 +668,10 @@ void init() {
   glLoadIdentity();
 
   gluPerspective(
-     60.0,  /* field of view in degree */
-      1.0,  /* aspect ratio */ 
-      0.0,  /* Z near */
-    900.0   /* Z far */
+       60.0,  /* field of view in degree */
+        1.0,  /* aspect ratio */
+    -1000.0,  /* Z near */
+     1000.0   /* Z far */
     );    
 
   glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);