(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index d581f44..57803e5 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -305,19 +305,9 @@ void motion(int x, int y) {
 \r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: left/right, h: near/far\r
-\r
-        // **NOTE: Currently a work in progress, does not work correctly\r
         float angler = 2 * M_PI * ( (rotate*camRotateFactor)/360.0 );\r
-        printf("cam angle: %f\n", rotate*camRotateFactor);\r
-\r
-        //sceneObjs[curObject].x += diffx * cos(angler) * 0.1;\r
-        sceneObjs[curObject].x += diffy * sin(angler) * 0.1;\r
-\r
-        //sceneObjs[curObject].z += diffx * sin(angler) * 0.1;\r
-        sceneObjs[curObject].z += diffy * cos(angler) * 0.1;\r
-\r
-        //sceneObjs[curObject].x += ;\r
-        //sceneObjs[curObject].z += ;\r
+        sceneObjs[curObject].x += diffx * cos(angler) * leftrightFactor + diffy * cos(M_PI/2 + angler) * nearfarFactor;\r
+        sceneObjs[curObject].z += diffx * sin(angler) * leftrightFactor + diffy * sin(M_PI/2 + angler) * nearfarFactor;\r
 \r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: big/small\r