X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=69c5a820ed26fa4c983adfd966d7284f76c66f5c;hp=aa27999a91754bcc6b1640e3caab53ad2018d92b;hb=HEAD;hpb=4cf287426fae4fe7d4bf5296453c91307314f8f1

diff --git a/scene.c b/scene.c
index aa27999..69c5a82 100644
--- a/scene.c
+++ b/scene.c
@@ -1,6 +1,6 @@
 /**
  * CITS2231 Graphics Scene Editor
- * @author Ashley Tyndall (20915779)
+ * @author Ashley Tyndall (20915779), Jenna de la Harpe (20367932)
  */
 
 #include <stdlib.h>
@@ -25,17 +25,14 @@
 void processMainEvents(int id) {
   switch (id) {
     case M_ROTATE_MOVE_CAMERA:
-      // Do stuff
+      manipulateState = STATE_CAMERA_ROTATE_MOVE;
       break;
-
     case M_POSITION_SCALE:
-      // Do stuff
+      manipulateState = STATE_OBJECT_POSITION_SCALE;
       break;
-
     case M_ROTATION_TEXTURE_SCALE:
-      // Do stuff
+      manipulateState = STATE_OBJECT_ROTATION_TEXTURE_SCALE;
       break;
-
     case M_EXIT:
       exit(EXIT_SUCCESS);
 
@@ -90,7 +87,7 @@ void processMaterialEvents(int id) {
 void processLightEvents(int id) {
   switch (id) {
     case M_LIGHT_MOVE_LIGHT_1:
-      // Do stuff
+      manipulateState = STATE_LIGHT_1_MOVE;
       break;
 
     case M_LIGHT_RGBALL_LIGHT_1:
@@ -98,7 +95,7 @@ void processLightEvents(int id) {
       break;
 
     case M_LIGHT_MOVE_LIGHT_2:
-      // Do stuff
+      manipulateState = STATE_LIGHT_2_MOVE;
       break;
 
     case M_LIGHT_RGBALL_LIGHT_2:
@@ -113,7 +110,9 @@ void processLightEvents(int id) {
  * @param id ID of object selected
  */
 void processObjectEvents(int id) {
-
+  addSceneObject(id);
+  manipulateState = STATE_OBJECT_POSITION_SCALE;
+  glutPostRedisplay();
 }
 
 /**
@@ -121,7 +120,11 @@ void processObjectEvents(int id) {
  * @param id ID of texutre selected
  */
 void processTextureEvents(int id) {
-
+  if ( curObject >= 0 ) {
+    sceneObjs[curObject].texture.id = id;
+    sceneObjs[curObject].texture.scale = 1;
+    glutPostRedisplay();
+  }
 }
 
 /**
@@ -129,7 +132,8 @@ void processTextureEvents(int id) {
  * @param id ID of ground texture selected
  */
 void processGTextureEvents(int id) {
-
+  currentGroundTexture = id;
+  glutPostRedisplay();
 }
 
 /**
@@ -150,9 +154,9 @@ void makeMenu() {
   // Construct light menu
   int lightMenu = glutCreateMenu(processLightEvents);
   glutAddMenuEntry("Move Light 1", M_LIGHT_MOVE_LIGHT_1);
-  glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);
+  //glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);
   glutAddMenuEntry("Move Light 2", M_LIGHT_MOVE_LIGHT_2);
-  glutAddMenuEntry("R/G/B/All Light 2", M_LIGHT_RGBALL_LIGHT_2);
+  //glutAddMenuEntry("R/G/B/All Light 2", M_LIGHT_RGBALL_LIGHT_2);
 
   // Construct object menu
   int objectMenu = makeSubmenuFromArray( objectMenuEntries, NMESH, processObjectEvents );
@@ -163,14 +167,14 @@ void makeMenu() {
 
   // Construct main menu
   glutCreateMenu(processMainEvents);
-  //glutAddMenuEntry("Rotate/Move Camera", M_ROTATE_MOVE_CAMERA);
-  //glutAddSubMenu("Add object", objectMenu);
-  //glutAddMenuEntry("Position/Scale", M_POSITION_SCALE);
-  //glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);
+  glutAddMenuEntry("Rotate/Move Camera", M_ROTATE_MOVE_CAMERA);
+  glutAddSubMenu("Add object", objectMenu);
+  glutAddMenuEntry("Position/Scale", M_POSITION_SCALE);
+  glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);
   //glutAddSubMenu("Material", materialMenu);
-  //glutAddSubMenu("Texture", textureMenu);
-  //glutAddSubMenu("Ground texture", gTextureMenu);
-  //glutAddSubMenu("Lights", lightMenu);
+  glutAddSubMenu("Texture", textureMenu);
+  glutAddSubMenu("Ground texture", gTextureMenu);
+  glutAddSubMenu("Lights", lightMenu);
   glutAddMenuEntry("Exit", M_EXIT);
 
   // Bind to right mouse button
@@ -196,67 +200,21 @@ void windowReshape(int w, int h) {
  * @param y Mouse y position
  */
 void mouse(int button, int state, int x, int y) {
-  if (button == GLUT_LEFT_BUTTON) {
-    if (state == GLUT_DOWN) {
-      moving = 1;
+  if ( button == GLUT_LEFT_BUTTON && glutGetModifiers() == GLUT_ACTIVE_SHIFT ) {
+    button = GLUT_MIDDLE_BUTTON; // Holding shift with left button is the same as the middle button
+  }
+  switch(button) {
+    case GLUT_LEFT_BUTTON:
+    case GLUT_MIDDLE_BUTTON:
+      if ( state == GLUT_DOWN ) {
+        buttonSelected = button;
+      } else if ( state == GLUT_UP ) {
+        buttonSelected = -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;
-    }
-  }
-}
-
-/**
- * Keybord event handler
- * w/s increase/decrease the z
- * a/d increase/decrease the x
- * q/e increase/decrease the y
- * z/x increase/decrease the angle
- * @param key Key pressed
- * @param x x co-ordinate of mouse
- * @param y y co-ordinate of mouse
- */
-void keyboard(unsigned char key, int x, int y) {
-  switch(key) {
-    case 'w':
-      camz = camz - 1;
-      break;
-    case 'a':
-      camx = camx - 1;
-      break;
-    case 's':
-      camz = camz + 1;
-      break;
-    case 'd':
-      camx = camx + 1;
-      break;
-    case 'q':
-      camy = camy + 1;
-      break;
-    case 'e':
-      camy = camy - 1;
-      break;
-    case 'z':
-      rot = rot + 1;
-      break;
-    case 'x':
-      rot = rot - 1;
       break;
   }
-  printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, rot);
-  glutPostRedisplay();
 }
 
 /**
@@ -265,20 +223,100 @@ void keyboard(unsigned char key, int x, int y) {
  * @param y Mouse y position
  */
 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();
+  if ( buttonSelected == -1 ) return; // No button selected, no action
+
+  float diffx = x - startx;
+  float diffy = y - starty;
+
+  switch ( manipulateState ) {
+    case STATE_CAMERA_ROTATE_MOVE:
+      // w: rotate
+      rotate += diffx;
+
+      if ( buttonSelected == GLUT_LEFT_BUTTON ) {
+        // h: zoom
+        zoom += diffy;
+      } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
+        // h: tilt
+        camAngle += diffy;
+      }
+      break;
+
+    case STATE_OBJECT_POSITION_SCALE:
+
+      if ( buttonSelected == GLUT_LEFT_BUTTON ) {
+        // w: left/right, h: near/far
+        float angler = 2 * M_PI * ( (rotate*camRotateFactor)/360.0 );
+        sceneObjs[curObject].x += diffx * cos(angler) * leftrightFactor + diffy * cos(M_PI/2 + angler) * nearfarFactor;
+        sceneObjs[curObject].z += diffx * sin(angler) * leftrightFactor + diffy * sin(M_PI/2 + angler) * nearfarFactor;
+
+      } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
+        // w: big/small
+        float max = (float)height/bigsmallFactor;
+        float scaling = (diffx + max) / max;
+
+        sceneObjs[curObject].scale[0] *= scaling;
+        sceneObjs[curObject].scale[1] *= scaling;
+        sceneObjs[curObject].scale[2] *= scaling;
+
+        // h: up/down
+        sceneObjs[curObject].y -= diffy * updownFactor;
+      }
+
+      break;
+
+    case STATE_OBJECT_ROTATION_TEXTURE_SCALE:
+
+      if ( buttonSelected == GLUT_LEFT_BUTTON ) {
+        // w: rotate on y
+        sceneObjs[curObject].rotation.y += diffx * rotateFactor;
+
+        // h: rotate on x
+        sceneObjs[curObject].rotation.x += diffy * rotateFactor;
+
+      } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
+        // w: rotate on x
+        sceneObjs[curObject].rotation.x += diffx * rotateFactor;
+
+        // h: texture scale
+        // **NOTE: Seems to be problem with scaling, delayed action
+        float max = (float)height/texscaleFactor;
+        float scaling = (-diffy + max) / max;
+        sceneObjs[curObject].texture.scale *= scaling;
+
+      }
+      
+      break;
+
+    case STATE_LIGHT_1_MOVE:
+    case STATE_LIGHT_2_MOVE:
+      ; // Semi-colon required to allow variable declaration below
+      
+      int i = 0;
+      if ( manipulateState == STATE_LIGHT_2_MOVE ) i = 1;
+
+      if ( buttonSelected == GLUT_LEFT_BUTTON ) {
+        // w: left/right, h: near/far
+        float angler = 2 * M_PI * ( (rotate*camRotateFactor)/360.0 );
+        lightObjs[i].position[0] += diffx * cos(angler) * lleftrightFactor + diffy * cos(M_PI/2 + angler) * lnearfarFactor;
+        lightObjs[i].position[2] += diffx * sin(angler) * lleftrightFactor + diffy * sin(M_PI/2 + angler) * lnearfarFactor;
+
+      } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
+        // w: increase/decrease some light param
+        // **NOTE: Currently not implemented
+
+        // h: up/down
+        lightObjs[i].position[1] -= diffy * updownFactor;
+      }
+
+      break;
+
   }
+
+  starty = y;
+  startx = x;
+
+  glutPostRedisplay();
 }
 
 /**
@@ -302,83 +340,75 @@ void display() {
     75.0,
     aspect,
     0.1,
-    200
+    300
     );
 
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
 
   gluLookAt(
-    0.0,  0.0,  5.0,  /* eye is at (x,y,z) */
+    0.0,  0.0,  15.0 + (zoom*zoomFactor),  /* 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,  10.0,  0.0   /* up is in postivie Y direction */
     );
 
-  glRotatef(75.0, 1.0, 0.0, 0.0);
-
-  /* Reposition the light source. */
-  lightPosition[0] = 12*cos(lightAngle);
-  lightPosition[1] = lightHeight;
-  lightPosition[2] = 12*sin(lightAngle);
-  lightPosition[3] = 0.0;
+  glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0); // Set camera angle upward
 
   glPushMatrix();
 
-    /* Perform scene rotations based on user mouse/keyboard input. */
-    glRotatef(angle, 0.0, 1.0, 0.0);
-    glRotatef(angle2, 1.0, 0.0, 0.0);
-    glTranslatef(camx, camy, camz);
-    glRotatef(rot, 1.0, 0.0, 0.0);
-
-    glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
+    /* Perform scene rotations based on user mouse input. */
+    glRotatef(rotate*camRotateFactor, 0.0, 1.0, 0.0);
 
     drawFloor();
-
-    drawLine();
     
-    // Draw teapot for a test object
-    glPushMatrix();
-      glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot currently does not rest on surface
-      glColor3f(0.0, 0.0, 0.0);
-      glutSolidTeapot(1);
-    glPopMatrix();
-
-    // Draw a white ball over the light source
-    glPushMatrix();
-      glDisable(GL_LIGHTING);
-      glColor3f(1.0, 1.0, 0.0);
-      glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);
-      glutSolidSphere(1.0, 50, 50);
-      glEnable(GL_LIGHTING);
-    glPopMatrix();
-
-  glPopMatrix();
-
-  glutSwapBuffers();
-}
-
-/**
- * init function; sets initial OpenGL state
- */
-void init() {
-  glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
-  glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
-  glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
-  glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);
-  glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0);
+    // Draw sceneObjs array
+    for ( int i = 0; i < nObjects; i++ ) {
+      glPushMatrix();
+        SceneObject so = sceneObjs[i];
+
+        // Apply translation vector
+        glTranslatef(so.x, so.y, so.z);
+
+        // Apply independant rotation vectors
+        glRotatef(so.rotation.x, 1.0, 0.0, 0.0);
+        glRotatef(so.rotation.y, 0.0, 1.0, 0.0);
+        glRotatef(so.rotation.z, 0.0, 0.0, 1.0);
+
+        // Apply scaling vector
+        glScalef(so.scale[0], so.scale[1], so.scale[2]);
+
+        // Apply texture
+        if ( so.texture.id > 0 ) {
+          getTexture(so.texture.id);
+          glBindTexture(GL_TEXTURE_2D, so.texture.id);
+          glMatrixMode(GL_TEXTURE);
+          glScalef(so.texture.scale, so.texture.scale, so.texture.scale);
+          glMatrixMode(GL_MODELVIEW);
+        } else {
+          glBindTexture(GL_TEXTURE_2D, 0);
+        }
+
+        // Draw actual object
+        if ( so.mesh > 0 ) {
+          // drawMesh();
+        } else if ( so.mesh == -1 ) { // a mesh of -1 draws the teapot
+          // The teapot does not obey the right-hand rule
+          glFrontFace(GL_CW);
+          glutSolidTeapot(1);
+          glFrontFace(GL_CCW);
+        }
+
+        glBindTexture(GL_TEXTURE_2D, 0);
+      glPopMatrix();
+    }
 
-  glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 90.0);
+    updateLights();
 
-  glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);
+    drawAxisLines();
 
-  glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, ambient);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diffuse);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specular);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, emission0);
-  glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shine);
+  glPopMatrix();
 
-  glEnable(GL_LIGHT0);
-  glEnable(GL_LIGHTING);
+  glutSwapBuffers();
 }
 
 /**
@@ -403,8 +433,8 @@ int main(int argc, char **argv) {
 
   glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
 
-  glutInitWindowSize(500, 500);
-  glutCreateWindow("Scene Editor");
+  glutInitWindowSize(width, height);
+  glutCreateWindow("Scene Editor - Ashley Tyndall (20915779), Jenna de la Harpe (20367932)");
 
   glShadeModel(GL_SMOOTH); // Enables Smooth Shading
   glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background
@@ -412,21 +442,19 @@ int main(int argc, char **argv) {
   glDepthRange(0,1);
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing
   glDepthFunc(GL_LEQUAL);  // the type
-  glEnable(GL_TEXTURE_2D);
-  glEnable(GL_NORMALIZE);
-  glLineWidth(2.0);
+  //glEnable(GL_CULL_FACE);
+  glLineWidth(1.0);
 
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
   glutReshapeFunc(windowReshape);
   glutDisplayFunc(display);
   glutMouseFunc(mouse);
-  glutKeyboardFunc(keyboard);
   glutMotionFunc(motion);
 
   makeMenu();
-
-  init();
+  initializeLights();
+  initializeState();
 
   glutMainLoop();
 }
\ No newline at end of file