X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=73e04ee54289719aea1130d1fd9e3d174eb38408;hp=aa26ba1c695b89eeedf65e7f58faf18465e27223;hb=306ea5fbd16870427a441b947c4d700f3a7147de;hpb=c3f151c018e143e5505a2c13f3ab876fd5b0a67f

diff --git a/scene.c b/scene.c
index aa26ba1..73e04ee 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"
 
@@ -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 = -1000.0;
+  GLdouble far = 1000.0;
 
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);
   glMatrixMode(GL_PROJECTION);
@@ -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,9 +552,43 @@ 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(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.
  */
@@ -575,6 +610,8 @@ void drawFloor() {
     glVertex3fv(floorVertices[3]);
   glEnd();*/
 
+drawSquare(0, -1000.0, -1000.0, 1000.0, 1000.0);
+
   /*if (useTexture) {
     glDisable(GL_TEXTURE_2D);
   }*/
@@ -582,6 +619,10 @@ void drawFloor() {
   glEnable(GL_LIGHTING);
 }
 
+/*void drawSquare(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
+  drawSquare(0, x1, y1, x2, y2);
+}*/
+
 /**
  * Display function
  */
@@ -615,8 +656,7 @@ void display() {
     glPushMatrix();
     
       //glTranslatef(0.0, 0.0, 0.0);
- 
-      glutSolidTeapot(30); // Draw teapot for test
+      glutWireTeapot(30); // Draw teapot for test
     glPopMatrix();
 
     glPushMatrix();
@@ -643,10 +683,10 @@ void init() {
   glLoadIdentity();
 
   gluPerspective(
-     60.0,  /* field of view in degree */
-      1.0,  /* aspect ratio */ 
-      -900.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);
@@ -692,14 +732,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();