X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=ad7e4bfb08c056ffff6c870f08be40f337f2905b;hp=902e5991e7f50edacfa75e121c77e911c3fd9083;hb=5a9dfd8e5f68b2f6062987a5b67bbd7934828bf1;hpb=09c3124c81ac8607bcb0cdc8dcce79f08f8a1736

diff --git a/scene.c b/scene.c
index 902e599..ad7e4bf 100644
--- a/scene.c
+++ b/scene.c
@@ -1,6 +1,6 @@
 /**
  * CITS2231 Graphics Scene Editor
- * @author Ashley Tyndall (20915779)
+ * @author Ashley Tyndall (20915779), Jenna de la Harpe (20367932)
  */
 
 #include <stdlib.h>
@@ -110,8 +110,8 @@ void processLightEvents(int id) {
  * @param id ID of object selected
  */
 void processObjectEvents(int id) {
-  // **NOTE: For the testing phase, only have the teapot
   addSceneObject(id);
+  manipulateState = STATE_OBJECT_POSITION_SCALE;
   glutPostRedisplay();
 }
 
@@ -120,7 +120,10 @@ void processObjectEvents(int id) {
  * @param id ID of texutre selected
  */
 void processTextureEvents(int id) {
-
+  if ( curObject >= 0 ) {
+    sceneObjs[curObject].texture = id;
+    glutPostRedisplay();
+  }
 }
 
 /**
@@ -168,7 +171,7 @@ void makeMenu() {
   glutAddMenuEntry("Position/Scale", M_POSITION_SCALE);
   glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);
   //glutAddSubMenu("Material", materialMenu);
-  //glutAddSubMenu("Texture", textureMenu);
+  glutAddSubMenu("Texture", textureMenu);
   glutAddSubMenu("Ground texture", gTextureMenu);
   //glutAddSubMenu("Lights", lightMenu);
   glutAddMenuEntry("Exit", M_EXIT);
@@ -296,21 +299,29 @@ void motion(int x, int y) {
       break;
 
     case STATE_OBJECT_POSITION_SCALE:
-      //SceneObject co = sceneObjs[curObject];
-
+      //so.x, so.y, so.z
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: left/right, h: near/far
-        
+        //sceneObjs[curObject].x += (x - startx)*leftrightFactor;
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
         // w: big/small, h: up/down
+        float scaling = (y - starty)*bigsmallFactor;
+        printf("Scaling by %f on all axii\n", scaling);
+        sceneObjs[curObject].scale[0] += scaling;
+        sceneObjs[curObject].scale[1] += scaling;
+        sceneObjs[curObject].scale[2] += scaling;
       }
+
+      startx = x;
       break;
 
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: rotate on width, h: rotate on h
+
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
-        // w & h, rotate on h
+        // w: rotate on height, h: texture scale
+        
       }
       break;
 
@@ -385,18 +396,15 @@ void display() {
     drawFloor();
     
     // Draw sceneObjs array
-    glPushMatrix();
-      for ( int i = 0; i < nObjects; i++ ) {
+    for ( int i = 0; i < nObjects; i++ ) {
+      glPushMatrix();
         SceneObject so = sceneObjs[i];
 
         // Apply rotation vector
-        vector* rv = so.rotation.vect;
-        printf("%f, %f, %f\n", *rv[0], *rv[1], *rv[2]);
-       /* glRotatef(so.rotation.parameter, *rv[0], *rv[1], *rv[2]);
+        glRotatef(so.rotation.amount, so.rotation.vector[0], so.rotation.vector[1], so.rotation.vector[2]);
 
         // Apply scaling vector
-        vector* sv = so.scale;
-        glScalef(*sv[0], *sv[1], *sv[2]);
+        glScalef(so.scale[0], so.scale[1], so.scale[2]);
 
         // Apply translation vector
         glTranslatef(so.x, so.y, so.z);
@@ -407,7 +415,7 @@ void display() {
           glBindTexture(GL_TEXTURE_2D, so.texture);
         } else {
           glBindTexture(GL_TEXTURE_2D, 0);
-        }*/
+        }
 
         // Draw actual object
         if ( so.mesh > 0 ) {
@@ -420,8 +428,9 @@ void display() {
         }
 
         glBindTexture(GL_TEXTURE_2D, 0);
-      }
-    glPopMatrix();
+      glPopMatrix();
+    }
+    
 
     // Draw a white ball over the light source
     glPushMatrix();