X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=242a10482f0cfae27c4c01f2bda37e7f38bf4100;hp=3a7597db39b29325b787063770b73e9346a47d93;hb=fbcff5fdddb4380b77f5cc4eb8a9419266fc1355;hpb=17e3af1a8604dcb5c3cf6fa7f3d9d7d891fe4734

diff --git a/scene.c b/scene.c
index 3a7597d..242a104 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,10 +506,54 @@ 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();
+  }
 }
 
+
 /**
  * Draw a floor.
  */
@@ -512,7 +564,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 +573,7 @@ void drawFloor() {
     glVertex3fv(floorVertices[2]);
     glTexCoord2f(16.0, 0.0);
     glVertex3fv(floorVertices[3]);
-  glEnd();
+  glEnd();*/
 
   /*if (useTexture) {
     glDisable(GL_TEXTURE_2D);
@@ -539,7 +591,7 @@ void display() {
   gluLookAt(
     0.0, 0.0, 60.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 */
+    0.0, -1.0,  0.0   /* up is in postivie Y direction */
     );
 
   /* Reposition the light source. */
@@ -549,6 +601,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);
@@ -557,15 +613,14 @@ 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);
+ 
+      glutSolidTeapot(30); // Draw teapot for test
     glPopMatrix();
 
     glPushMatrix();
       glDisable(GL_LIGHTING);
-      glLoadIdentity();
       glColor3f(1.0, 1.0, 1.0);
 
       /* Draw a yellow ball at the light source. */
@@ -585,6 +640,7 @@ void display() {
  */
 void init() {
   glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
 
   gluPerspective(
      60.0,  /* field of view in degree */
@@ -601,6 +657,7 @@ void init() {
   glEnable(GL_LIGHTING);
 
   glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
 }
 
 /**
@@ -642,6 +699,7 @@ int main(int argc, char **argv) {
   glutReshapeFunc(windowReshape);
   glutDisplayFunc(display);
   glutMouseFunc(mouse);
+  glutMotionFunc(motion);
 
   makeMenu();