X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=c1e1eb9a8c39a256d8b530cee905d49319472f7b;hp=e2e8cd27f00cc915b14cd290844614dddc16bb97;hb=bc1e4447312bdfb7fd6bc13cfbec364b96d5806e;hpb=f1c86cda52b306cdfbe62e1776eb38cff811f47b

diff --git a/scene.c b/scene.c
index e2e8cd2..c1e1eb9 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);
 
@@ -115,6 +112,7 @@ void processLightEvents(int id) {
 void processObjectEvents(int id) {
   // **NOTE: For the testing phase, only have the teapot
   addSceneObject(id);
+  glutPostRedisplay();
 }
 
 /**
@@ -165,10 +163,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 +204,8 @@ void mouse(int button, int state, int x, int y) {
       } else if ( state == GLUT_UP ) {
         buttonSelected = -1;
       }
+      startx = x;
+      starty = y;
       break;
   }
 }
@@ -284,7 +284,7 @@ void motion(int x, int y) {
 
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: rotate, h: zoom
-        zoom += (y - starty);       
+        zoom += (y - starty);
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
         // w: rotate, h: tilt
         camAngle += (y - starty);
@@ -391,7 +391,8 @@ void display() {
 
         // Apply rotation vector
         vector* rv = so.rotation.vect;
-        glRotatef(so.rotation.parameter, *rv[0], *rv[1], *rv[2]);
+        printf("%d, %d, %d\n", *rv[0], *rv[1], *rv[2]);
+       /* glRotatef(so.rotation.parameter, *rv[0], *rv[1], *rv[2]);
 
         // Apply scaling vector
         vector* sv = so.scale;
@@ -405,9 +406,8 @@ 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 ) {