X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=1aef0618bebde3d93e705997be47ac4ad5b04bc7;hp=23144bc8811c4ff811136063b9cf41ee25877add;hb=95c7ea9c6b82ae8b11cb360f0dcb8cc971ef814e;hpb=6c77eb6c640fcb4ac94e063f5e08c907c3b7702b

diff --git a/scene.c b/scene.c
index 23144bc..1aef061 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,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: %f, Angle 2: %f\n", angle, angle2);
+    sleep(25);
+    glutPostRedisplay();
+}
 
 /**
  * Draw a floor.
@@ -575,6 +583,8 @@ void drawFloor() {
     glVertex3fv(floorVertices[3]);
   glEnd();*/
 
+drawSquare(0, -1000, -1000, 1000, 1000);
+
   /*if (useTexture) {
     glDisable(GL_TEXTURE_2D);
   }*/
@@ -582,6 +592,39 @@ void drawFloor() {
   glEnable(GL_LIGHTING);
 }
 
+int drawFloorRecurse = 2;
+/*void drawSquare(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
+  drawSquare(0, x1, y1, x2, y2);
+}*/
+
+void drawSquare(int recurseLevel, GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
+
+  
+
+  if ( drawFloorRecurse != recurseLevel ) {
+    GLfloat xm = (x1 + x2) / 2.0;
+    GLfloat ym = (y1 + y2) / 2.0;
+    int rnew = recurseLevel + 1;
+    printf("Recursing to level %d\n", rnew);
+
+    // 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 {
+    printf("Drawing (%f.10, %f.10) -> (%f.10, %f.10)\n", x1, y2, x2, y2);
+    glBegin(GL_QUADS);
+      glVertex3f(x1, 0.0, y1);
+      glVertex3f(x1, 0.0, y2);
+      glVertex3f(x2, 0.0, y2);
+      glVertex3f(x2, 0.0, y1);
+    glEnd();
+  }
+
+}
+
 /**
  * Display function
  */
@@ -615,8 +658,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 +685,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);
@@ -692,14 +734,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();