X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=68c3df4797c108d9e2295b01fc0d4754e1bd430b;hp=2263f2df4a05882b7e07f7d5ec1a5e31e654f078;hb=cfaf5f8d8b872ead21aedb529c8266cd7f9af07d;hpb=a1f1247e1535181f174a22686203590c33b136fa

diff --git a/scene.c b/scene.c
index 2263f2d..68c3df4 100644
--- a/scene.c
+++ b/scene.c
@@ -118,7 +118,15 @@ static GLfloat floorVertices[4][3] = {
 
 static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; // White light
 static GLfloat lightPosition[4];
-static float lightAngle = 10.0, lightHeight = 20;
+
+int moving, startx, starty;
+int lightMoving = 0, lightStartX, lightStartY;
+
+/* Time varying or user-controled variables. */
+static float jump = 0.0;
+static float lightAngle = 0.0, lightHeight = 20;
+GLfloat angle = -150;   /* in degrees */
+GLfloat angle2 = 30;   /* in degrees */
 
 /**
  * Prints out error message when file cannot be read
@@ -498,8 +506,58 @@ void windowReshape(int w, int h) {
  * @param x Mouse x position
  * @param y Mouse y position
  */
-void mouse(int btn, int state, int x, int y) {
+/*void mouse(int btn, int state, int x, int y) {
   
+}*//*
+static void
+mouse(int button, int state, int x, int y)
+{
+  if (button == GLUT_LEFT_BUTTON) {
+    if (state == GLUT_DOWN) {
+      moving = 1;
+      startx = x;
+      starty = y;
+    }
+    if (state == GLUT_UP) {
+      moving = 0;
+    }
+  }
+  if (button == GLUT_MIDDLE_BUTTON) {
+    if (state == GLUT_DOWN) {
+      lightMoving = 1;
+      lightStartX = x;
+      lightStartY = y;
+    }
+    if (state == GLUT_UP) {
+      lightMoving = 0;
+    }
+  }
+}
+
+static void
+motion(int x, int y)
+{
+  if (moving) {
+    angle = angle + (x - startx);
+    angle2 = angle2 + (y - starty);
+    startx = x;
+    starty = y;
+    glutPostRedisplay();
+  }
+  if (lightMoving) {
+    lightAngle += (x - lightStartX)/40.0;
+    lightHeight += (lightStartY - y)/20.0;
+    lightStartX = x;
+    lightStartY = y;
+    glutPostRedisplay();
+  }
+}*/
+
+void idle() {
+  angle = (int)(angle + 10) % 360;
+    angle2 = (int)(angle2 + 10) % 360;
+    printf("Angle 1: %d, Angle 2: %d", angle, angle2);
+    glutPostRedisplay();
 }
 
 /**
@@ -512,7 +570,7 @@ void drawFloor() {
   //  glEnable(GL_TEXTURE_2D);
   //}
 
-  glBegin(GL_QUADS);
+  /*glBegin(GL_QUADS);
     glTexCoord2f(0.0, 0.0);
     glVertex3fv(floorVertices[0]);
     glTexCoord2f(0.0, 16.0);
@@ -521,7 +579,7 @@ void drawFloor() {
     glVertex3fv(floorVertices[2]);
     glTexCoord2f(16.0, 0.0);
     glVertex3fv(floorVertices[3]);
-  glEnd();
+  glEnd();*/
 
   /*if (useTexture) {
     glDisable(GL_TEXTURE_2D);
@@ -535,7 +593,6 @@ void drawFloor() {
  */
 void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-  glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
   gluLookAt(
     0.0, 0.0, 60.0,  /* eye is at (x,y,z) */
@@ -550,6 +607,10 @@ void display() {
   lightPosition[3] = 0.0;
 
   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);
 
     glEnable(GL_BLEND);
@@ -558,10 +619,9 @@ void display() {
     glDisable(GL_BLEND);
 
     glPushMatrix();
-    glLoadIdentity();
-      //glTranslatef(0.0, 0.0, 0.0);
-
-      glutSolidTeapot(5); // Draw teapot for test
+    
+      glTranslatef(0.0, 0.0, 0.0);
+      glutWireTeapot(30); // Draw teapot for test
     glPopMatrix();
 
     glPushMatrix();
@@ -585,6 +645,7 @@ void display() {
  */
 void init() {
   glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
 
   gluPerspective(
      60.0,  /* field of view in degree */
@@ -599,6 +660,9 @@ void init() {
   glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
+
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
 }
 
 /**
@@ -633,13 +697,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);
+  //glutMouseFunc(mouse);
+  //glutMotionFunc(motion);
+  glutIdleFunc(idle);
 
   makeMenu();