(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index f4b4343..08daa01 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -307,9 +307,11 @@ void motion(int x, int y) {
         // 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
-        sceneObjs[curObject].x += diffx * sin(rotate*camRotateFactor);\r
-        sceneObjs[curObject].z += diffx * cos(rotate*camRotateFactor);\r
+       // float arc = arctan()\r
+        sceneObjs[curObject].x += diffx * cos(angler) * 0.3;\r
+        sceneObjs[curObject].z += diffx * sin(angler) * 0.3;\r
 \r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: big/small\r
@@ -328,8 +330,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