(no commit message)

diff --git a/scene.c b/scene.c
index 2410cd1..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
 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
       break;\r

-\r

     case M_POSITION_SCALE:\r
     case M_POSITION_SCALE:\r

-      // Do stuff\r
+      manipulateState = STATE_OBJECT_POSITION_SCALE;\r

       break;\r
       break;\r

-\r

     case M_ROTATION_TEXTURE_SCALE:\r
     case M_ROTATION_TEXTURE_SCALE:\r

-      // Do stuff\r
+      manipulateState = STATE_OBJECT_ROTATION_TEXTURE_SCALE;\r

       break;\r
       break;\r

-\r

     case M_EXIT:\r
       exit(EXIT_SUCCESS);\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
 \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
   //glutAddSubMenu("Material", materialMenu);\r
   //glutAddSubMenu("Texture", textureMenu);\r
   glutAddSubMenu("Ground texture", gTextureMenu);\r