(no commit message)

[atyndall/cits2231.git] / scene.c

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