X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=386586e549f2e1656f3f6d9a73095ad7a7ec90e5;hp=c62831e33f41fb3e816b3ed6c23794ba4818a738;hb=d6176afd69975dd4fd1a474db49995b4066a8548;hpb=9e42797448ba7fc0349cc275baec55230e595a26

diff --git a/scene.c b/scene.c
index c62831e..386586e 100644
--- a/scene.c
+++ b/scene.c
@@ -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);
 
@@ -165,10 +162,10 @@ 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);
@@ -206,6 +203,8 @@ void mouse(int button, int state, int x, int y) {
       } else if ( state == GLUT_UP ) {
         buttonSelected = -1;
       }
+      startx = x;
+      starty = y;
       break;
   }
 }
@@ -285,7 +284,6 @@ void motion(int x, int y) {
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: rotate, h: zoom
         zoom += (y - starty);
-        printf("zoom is %f\n", zoom);
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
         // w: rotate, h: tilt
         camAngle += (y - starty);