(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 31eff0e..902e599 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
@@ -115,6 +112,7 @@ void processLightEvents(int id) {
 void processObjectEvents(int id) {\r
   // **NOTE: For the testing phase, only have the teapot\r
   addSceneObject(id);\r
+  glutPostRedisplay();\r
 }\r
 \r
 /**\r
@@ -165,10 +163,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
@@ -293,7 +291,6 @@ void motion(int x, int y) {
       }\r
 \r
       starty = y;\r
-      printf("zoom is %f, y is %d starty is %d\n", zoom, y, starty);\r
       startx = x;\r
 \r
       break;\r
@@ -394,7 +391,8 @@ void display() {
 \r
         // Apply rotation vector\r
         vector* rv = so.rotation.vect;\r
-        glRotatef(so.rotation.parameter, *rv[0], *rv[1], *rv[2]);\r
+        printf("%f, %f, %f\n", *rv[0], *rv[1], *rv[2]);\r
+       /* glRotatef(so.rotation.parameter, *rv[0], *rv[1], *rv[2]);\r
 \r
         // Apply scaling vector\r
         vector* sv = so.scale;\r
@@ -408,9 +406,8 @@ void display() {
           getTexture(so.texture);\r
           glBindTexture(GL_TEXTURE_2D, so.texture);\r
         } else {\r
-          getTexture(0);\r
           glBindTexture(GL_TEXTURE_2D, 0);\r
-        }\r
+        }*/\r
 \r
         // Draw actual object\r
         if ( so.mesh > 0 ) {\r