(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index f4b4343..281f99f 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -308,6 +308,7 @@ void motion(int x, int y) {
 \r
         // **NOTE: Currently a work in progress, does not work correctly\r
         printf("cam angle: %f\n", rotate*camRotateFactor);\r
+       // float arc = arctan()\r
         sceneObjs[curObject].x += diffx * sin(rotate*camRotateFactor);\r
         sceneObjs[curObject].z += diffx * cos(rotate*camRotateFactor);\r
 \r
@@ -328,8 +329,6 @@ void motion(int x, int y) {
 \r
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:\r
 \r
-      // FML DOES NOT ROTATE PROPERLY\r
-\r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: rotate on y\r
         sceneObjs[curObject].rotation.y += diffx * rotateFactor;\r
@@ -414,7 +413,7 @@ void display() {
   glPushMatrix();\r
 \r
     /* Perform scene rotations based on user mouse/keyboard input. */\r
-    glRotatef(rotate*camRotateFactor, 0.0, 1.0, 0.0);\r
+    //glRotatef(rotate*camRotateFactor, 0.0, 1.0, 0.0);\r
     glTranslatef(camx, camy, camz);\r
     glRotatef(keyrot, 1.0, 0.0, 0.0);\r
 \r