(no commit message)

[atyndall/cits2231.git] / scene.c

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