(no commit message)

diff --git a/scene.c b/scene.c
index c650c05..ffa63dd 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -1,6 +1,6 @@
 /**\r
  * CITS2231 Graphics Scene Editor\r
 /**\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
  */\r
 \r
 #include <stdlib.h>\r


@@ -111,6 +111,7 @@ void processLightEvents(int id) {
  */\r
 void processObjectEvents(int id) {\r
   addSceneObject(id);\r
  */\r
 void processObjectEvents(int id) {\r
   addSceneObject(id);\r

+  manipulateState = STATE_OBJECT_POSITION_SCALE;\r

   glutPostRedisplay();\r
 }\r
 \r
   glutPostRedisplay();\r
 }\r
 \r


@@ -167,8 +168,8 @@ void makeMenu() {
   glutCreateMenu(processMainEvents);\r
   glutAddMenuEntry("Rotate/Move Camera", M_ROTATE_MOVE_CAMERA);\r
   glutAddSubMenu("Add object", objectMenu);\r
   glutCreateMenu(processMainEvents);\r
   glutAddMenuEntry("Rotate/Move Camera", M_ROTATE_MOVE_CAMERA);\r
   glutAddSubMenu("Add object", objectMenu);\r

-  glutAddMenuEntry("Position/Scale", M_POSITION_SCALE);\r
-  glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);\r
+  //glutAddMenuEntry("Position/Scale", M_POSITION_SCALE);\r
+  //glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);\r

   //glutAddSubMenu("Material", materialMenu);\r
   glutAddSubMenu("Texture", textureMenu);\r
   glutAddSubMenu("Ground texture", gTextureMenu);\r
   //glutAddSubMenu("Material", materialMenu);\r
   glutAddSubMenu("Texture", textureMenu);\r
   glutAddSubMenu("Ground texture", gTextureMenu);\r


@@ -298,21 +299,24 @@ void motion(int x, int y) {
       break;\r
 \r
     case STATE_OBJECT_POSITION_SCALE:\r
       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
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: left/right, h: near/far\r

-        \r
+        sceneObjs[curObject].x += (x - startx);\r

       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: big/small, h: up/down\r
       }\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: big/small, h: up/down\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
       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
       } 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
       }\r
       break;\r
 \r