X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=25cc0dc1634ce924a84dad5c321dbed67aa1a922;hp=c650c057dc9db23128a1c7de063239157a8f406b;hb=aab2e2f70552398a51a24f644147a1c6de45c766;hpb=55bfed85b24a4fe5471d3fca580e3b86cd74e21d

diff --git a/scene.c b/scene.c
index c650c05..25cc0dc 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>
@@ -111,6 +111,7 @@ void processLightEvents(int id) {
  */
 void processObjectEvents(int id) {
   addSceneObject(id);
+  manipulateState = STATE_OBJECT_POSITION_SCALE;
   glutPostRedisplay();
 }
 
@@ -198,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:
@@ -282,13 +286,14 @@ void motion(int x, int y) {
 
   switch ( manipulateState ) {
     case STATE_CAMERA_ROTATE_MOVE:
+      // w: rotate
       rotate += (x - startx);
 
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
-        // w: rotate, h: zoom
+        // h: zoom
         zoom += (y - starty);
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
-        // w: rotate, h: tilt
+        // h: tilt
         camAngle += (y - starty);
       }
 
@@ -298,21 +303,40 @@ void motion(int x, int y) {
       break;
 
     case STATE_OBJECT_POSITION_SCALE:
-      //SceneObject co = sceneObjs[curObject];
-
+     
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: left/right, h: near/far
-        
+         //so.x, so.y, so.z
+        //sceneObjs[curObject].x += (x - startx)*leftrightFactor;
+        printf("cam angle: %f\n", rotate*rotateFactor);
+        sceneObjs[curObject].x += (x - startx) * cos(rotate*rotateFactor);
+        sceneObjs[curObject].z += (x - startx) * sin(rotate*rotateFactor);
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
-        // w: big/small, h: up/down
+        // w: big/small
+        float diff = (x - startx);
+        float max = (float)height/bigsmallFactor;
+        float scaling = ( diff + max) / max;
+
+        sceneObjs[curObject].scale[0] *= scaling;
+        sceneObjs[curObject].scale[1] *= scaling;
+        sceneObjs[curObject].scale[2] *= scaling;
+
+        // h: up/down
+        sceneObjs[curObject].y -= (y - starty) * updownFactor;
       }
+
+      starty = y;
+      startx = x;
+
       break;
 
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: rotate on width, h: rotate on h
+
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
-        // w & h, rotate on h
+        // w: rotate on height, h: texture scale
+        
       }
       break;
 
@@ -354,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);