(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index c62831e..386586e 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -25,17 +25,14 @@
 void processMainEvents(int id) {\r
   switch (id) {\r
     case M_ROTATE_MOVE_CAMERA:\r
-      // Do stuff\r
+      manipulateState = STATE_CAMERA_ROTATE_MOVE;\r
       break;\r
-\r
     case M_POSITION_SCALE:\r
-      // Do stuff\r
+      manipulateState = STATE_OBJECT_POSITION_SCALE;\r
       break;\r
-\r
     case M_ROTATION_TEXTURE_SCALE:\r
-      // Do stuff\r
+      manipulateState = STATE_OBJECT_ROTATION_TEXTURE_SCALE;\r
       break;\r
-\r
     case M_EXIT:\r
       exit(EXIT_SUCCESS);\r
 \r
@@ -165,10 +162,10 @@ void makeMenu() {
 \r
   // Construct main menu\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("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
   //glutAddSubMenu("Material", materialMenu);\r
   //glutAddSubMenu("Texture", textureMenu);\r
   glutAddSubMenu("Ground texture", gTextureMenu);\r
@@ -206,6 +203,8 @@ void mouse(int button, int state, int x, int y) {
       } else if ( state == GLUT_UP ) {\r
         buttonSelected = -1;\r
       }\r
+      startx = x;\r
+      starty = y;\r
       break;\r
   }\r
 }\r
@@ -285,7 +284,6 @@ void motion(int x, int y) {
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: rotate, h: zoom\r
         zoom += (y - starty);\r
-        printf("zoom is %f\n", zoom);\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: rotate, h: tilt\r
         camAngle += (y - starty);\r