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

diff --git a/scene.c b/scene.c
index c1e1eb9..c650c05 100644
--- a/scene.c
+++ b/scene.c
@@ -110,7 +110,6 @@ 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);
   glutPostRedisplay();
 }
@@ -120,7 +119,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 +170,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);
@@ -385,18 +387,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("%d, %d, %d\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 +406,7 @@ void display() {
           glBindTexture(GL_TEXTURE_2D, so.texture);
         } else {
           glBindTexture(GL_TEXTURE_2D, 0);
-        }*/
+        }
 
         // Draw actual object
         if ( so.mesh > 0 ) {
@@ -420,8 +419,9 @@ void display() {
         }
 
         glBindTexture(GL_TEXTURE_2D, 0);
-      }
-    glPopMatrix();
+      glPopMatrix();
+    }
+    
 
     // Draw a white ball over the light source
     glPushMatrix();