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

diff --git a/scene.c b/scene.c
index f4b4343..90da255 100644
--- a/scene.c
+++ b/scene.c
@@ -307,9 +307,14 @@ 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 * ( (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);
+
+        sceneObjs[curObject].x += diffx * cos(angler) * 1.0 + diffy * cos(M_PI/2 + angler) * 0.1;
+        sceneObjs[curObject].z += diffx * sin(angler) * 1.0 + diffy * sin(M_PI/2 + angler) * 0.1;
+
+        //sceneObjs[curObject].x += ;
+        //sceneObjs[curObject].z += ;
 
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
         // w: big/small
@@ -328,8 +333,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;