X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=87e0f00e165f6b9dea949dc2e53431313c8be967;hb=e8087a7fdcdb4e8bd8304bdba1d311a4f33e8e92;hp=31eff0e3ffdd3fdbf6f39e1606596f0928202ac0;hpb=36aa202c760cb524f105a465007983f224cb97e3;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 31eff0e..87e0f00 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);
@@ -293,7 +290,6 @@ void motion(int x, int y) {
       }
 
       starty = y;
-      printf("zoom is %f, y is %d starty is %d\n", zoom, y, starty);
       startx = x;
 
       break;
@@ -393,7 +389,7 @@ void display() {
         SceneObject so = sceneObjs[i];
 
         // Apply rotation vector
-        vector* rv = so.rotation.vect;
+        /*vector* rv = so.rotation.vect;
         glRotatef(so.rotation.parameter, *rv[0], *rv[1], *rv[2]);
 
         // Apply scaling vector
@@ -408,10 +404,9 @@ void display() {
           getTexture(so.texture);
           glBindTexture(GL_TEXTURE_2D, so.texture);
         } else {
-          getTexture(0);
           glBindTexture(GL_TEXTURE_2D, 0);
         }
-
+*/
         // Draw actual object
         if ( so.mesh > 0 ) {
           // drawMesh();