(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 4514e79..d73df53 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -1,6 +1,6 @@
 /**\r
  * CITS2231 Graphics Scene Editor\r
- * @author Ashley Tyndall (20915779)\r
+ * @author Ashley Tyndall (20915779), Jenna de la Harpe (20367932)\r
  */\r
 \r
 #include <stdlib.h>\r
@@ -110,8 +110,8 @@ void processLightEvents(int id) {
  * @param id ID of object selected\r
  */\r
 void processObjectEvents(int id) {\r
-  // **NOTE: For the testing phase, only have the teapot\r
   addSceneObject(id);\r
+  manipulateState = STATE_OBJECT_POSITION_SCALE;\r
   glutPostRedisplay();\r
 }\r
 \r
@@ -299,21 +299,39 @@ void motion(int x, int y) {
       break;\r
 \r
     case STATE_OBJECT_POSITION_SCALE:\r
-      //SceneObject co = sceneObjs[curObject];\r
-\r
+      //so.x, so.y, so.z\r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: left/right, h: near/far\r
-        \r
+        //sceneObjs[curObject].x += (x - startx)*leftrightFactor;\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: big/small, h: up/down\r
+\r
+        // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf\r
+        float diff = (y - starty);\r
+        float scaling;\r
+\r
+        if ( scaling < 0 ) {\r
+          scaling = (x - -height)/(0 - -height);\r
+        } else {\r
+          scaling = diff;\r
+        }\r
+        \r
+        printf("Scaling by %f on all axii\n", scaling);\r
+        sceneObjs[curObject].scale[0] += scaling;\r
+        sceneObjs[curObject].scale[1] += scaling;\r
+        sceneObjs[curObject].scale[2] += scaling;\r
       }\r
+\r
+      startx = x;\r
       break;\r
 \r
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:\r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: rotate on width, h: rotate on h\r
+\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
-        // w & h, rotate on h\r
+        // w: rotate on height, h: texture scale\r
+        \r
       }\r
       break;\r
 \r