X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=ee4f6148b0e21499b4a9c9fdef7032e563537972;hp=f4b4343b2617ea1c8ef343c936f7eca43903376c;hb=abac37ff45eff5c4c818dc72a01020818bfdece2;hpb=f58aed98d64aef9753f2b26e41db597c9df1dce4

diff --git a/scene.c b/scene.c
index f4b4343..ee4f614 100644
--- a/scene.c
+++ b/scene.c
@@ -307,9 +307,11 @@ void motion(int x, int y) {
         // w: left/right, h: near/far
 
         // **NOTE: Currently a work in progress, does not work correctly
+        float angler = 2 * M_PI * ( (90 - rotate*camRotateFactor)/360.0 );
         printf("cam angle: %f\n", rotate*camRotateFactor);
-        sceneObjs[curObject].x += diffx * sin(rotate*camRotateFactor);
-        sceneObjs[curObject].z += diffx * cos(rotate*camRotateFactor);
+       // float arc = arctan()
+        sceneObjs[curObject].x += diffx * cos(angler) * 0.3;
+        sceneObjs[curObject].z += diffx * sin(angler) * 0.3;
 
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
         // w: big/small
@@ -328,8 +330,6 @@ void motion(int x, int y) {
 
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:
 
-      // FML DOES NOT ROTATE PROPERLY
-
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: rotate on y
         sceneObjs[curObject].rotation.y += diffx * rotateFactor;