X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=6f74153d176ed43babe4a7cb788b9b89e4fdefe1;hp=0251439ca2796b485987d7a6ecc6a3f7552e6151;hb=bc7b210b34ea0d6fb40bd163955a50d80db3a11e;hpb=2931dc8f8168076f7cceed66414ad44969bf9e4b

diff --git a/scene.c b/scene.c
index 0251439..6f74153 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>
@@ -110,8 +110,8 @@ void processLightEvents(int id) {
  * @param id ID of object selected
  */
 void processObjectEvents(int id) {
-  // **NOTE: For the testing phase, only have the teapot
   addSceneObject(id);
+  manipulateState = STATE_OBJECT_POSITION_SCALE;
   glutPostRedisplay();
 }
 
@@ -120,7 +120,10 @@ void processObjectEvents(int id) {
  * @param id ID of texutre selected
  */
 void processTextureEvents(int id) {
-
+  if ( curObject >= 0 ) {
+    sceneObjs[curObject].texture = id;
+    glutPostRedisplay();
+  }
 }
 
 /**
@@ -168,7 +171,7 @@ void makeMenu() {
   glutAddMenuEntry("Position/Scale", M_POSITION_SCALE);
   glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);
   //glutAddSubMenu("Material", materialMenu);
-  //glutAddSubMenu("Texture", textureMenu);
+  glutAddSubMenu("Texture", textureMenu);
   glutAddSubMenu("Ground texture", gTextureMenu);
   //glutAddSubMenu("Lights", lightMenu);
   glutAddMenuEntry("Exit", M_EXIT);
@@ -196,6 +199,9 @@ 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 && 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:
@@ -278,44 +284,64 @@ void keyboard(unsigned char key, int x, int y) {
 void motion(int x, int y) {
   if ( buttonSelected == -1 ) return; // No button selected, no action
 
+  float diffx = x - startx;
+  float diffy = y - starty;
+
   switch ( manipulateState ) {
     case STATE_CAMERA_ROTATE_MOVE:
-      rotate += (x - startx);
+      // w: rotate
+      rotate += diffx;
 
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
-        // w: rotate, h: zoom
-        zoom += (y - starty);
+        // h: zoom
+        zoom += diffy;
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
-        // w: rotate, h: tilt
-        camAngle += (y - starty);
+        // h: tilt
+        camAngle += diffy;
       }
-
-      starty = y;
-      startx = x;
-
       break;
 
     case STATE_OBJECT_POSITION_SCALE:
-      //SceneObject co = sceneObjs[curObject];
 
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: left/right, h: near/far
-        
+
+        // **NOTE: Currently a work in progress
+        printf("cam angle: %f\n", rotate*rotateFactor);
+        sceneObjs[curObject].x += diffx * sin(rotate*rotateFactor);
+        sceneObjs[curObject].z += diffx * cos(rotate*rotateFactor);
+
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
-        // w: big/small, h: up/down
+        // 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 width, h: rotate on h
+        sceneObjs[curObject].rotation.x += diffx * rotateFactor;
+
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
-        // w & h, rotate on h
+        // w: rotate on height, h: texture scale
+        
       }
       break;
 
   }
 
+  starty = y;
+  startx = x;
+
   glutPostRedisplay();
 }
 
@@ -352,7 +378,7 @@ void display() {
     0.0,  10.0,  0.0   /* up is in postivie Y direction */
     );
 
-  glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0);
+  glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0); // Set camera angle upward
 
   /* Reposition the light source 0. */
   lightPosition0[0] = 12*cos(lightAngle0);
@@ -389,14 +415,16 @@ void display() {
       glPushMatrix();
         SceneObject so = sceneObjs[i];
 
-        // Apply rotation vector
-        //glRotatef(so.rotation.amount, so.rotation.vector[0], so.rotation.vector[1], so.rotation.vector[2]);
+        // 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 translation vector
-        //glTranslatef(so.x, so.y, so.z);
+        glTranslatef(so.x, so.y, so.z);
 
         // Apply texture
         if ( so.texture > 0 ) {
@@ -421,24 +449,22 @@ void display() {
     }
     
 
-    // Draw a white ball over the light source
+    // Draw a white ball over the light sources
+    glDisable(GL_LIGHTING);
+    glColor3f(1.0, 1.0, 1.0);
+
     glPushMatrix();
-      glDisable(GL_LIGHTING);
-      glColor3f(1.0, 1.0, 1.0);
       glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]);
       glutSolidSphere(0.5, 50, 50);
-      glEnable(GL_LIGHTING);
     glPopMatrix();
 
-    // Draw a white ball over the light source
     glPushMatrix();
-      glDisable(GL_LIGHTING);
-      glColor3f(1.0, 1.0, 1.0);
       glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]);
       glutSolidSphere(0.5, 50, 50);
-      glEnable(GL_LIGHTING);
     glPopMatrix();
 
+    glEnable(GL_LIGHTING);
+
     drawAxisLines();
 
   glPopMatrix();