X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=99a95e54503793d60d16283483941eea7012b950;hp=a0fbff18df54e6e473c8f518462e5a2dd1ce3bf8;hb=d94feaa1fc0039ef6ec3c3a16fe022da86038177;hpb=295ff719ec8db6df738d0210005a948eb2507c77

diff --git a/scene.c b/scene.c
index a0fbff1..99a95e5 100644
--- a/scene.c
+++ b/scene.c
@@ -306,7 +306,7 @@ void motion(int x, int y) {
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: left/right, h: near/far
 
-        // **NOTE: Currently a work in progress
+        // **NOTE: Currently a work in progress, does not work correctly
         printf("cam angle: %f\n", rotate*camRotateFactor);
         sceneObjs[curObject].x += diffx * sin(rotate*camRotateFactor);
         sceneObjs[curObject].z += diffx * cos(rotate*camRotateFactor);
@@ -327,19 +327,25 @@ void motion(int x, int y) {
       break;
 
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:
+
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: rotate on y
         sceneObjs[curObject].rotation.y += diffx * rotateFactor;
+
         // h: rotate on x
         sceneObjs[curObject].rotation.x += diffy * rotateFactor;
+
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
         // w: rotate on x
         sceneObjs[curObject].rotation.x += diffx * rotateFactor;
+
         // h: texture scale
         float max = (float)height/texscaleFactor;
         float scaling = (diffy + max) / max;
         sceneObjs[curObject].texture.scale *= scaling;
+
       }
+      
       break;
 
   }
@@ -455,7 +461,6 @@ void display() {
         glBindTexture(GL_TEXTURE_2D, 0);
       glPopMatrix();
     }
-    
 
     // Draw a white ball over the light sources
     glDisable(GL_LIGHTING);
@@ -524,8 +529,8 @@ int main(int argc, char **argv) {
 
   glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
 
-  glutInitWindowSize(500, 500);
-  glutCreateWindow("Scene Editor");
+  glutInitWindowSize(width, height);
+  glutCreateWindow("Scene Editor - Ashley Tyndall (20915779), Jenna de la Harpe (20367932)");
 
   glShadeModel(GL_SMOOTH); // Enables Smooth Shading
   glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background