X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=27fc5474f8b9d08e2769ff05526103c236d8aece;hp=b4795f11d8fa036feeefd4f44b1d98c6db400345;hb=2090fa97207b7008eaddbab184478b1720e5fad1;hpb=df625731614cf6e5b31e4c822c2cc42d01fd8069 diff --git a/scene.c b/scene.c index b4795f1..27fc547 100644 --- a/scene.c +++ b/scene.c @@ -311,16 +311,22 @@ void motion(int x, int y) { float scaling; if ( diff < 0 ) { - scaling = (x - (float)-height)/(0 - (float)-height); - printf("Diff is %f, Scaling by %f on all axii\n", diff, scaling); + scaling = (diff - -((float)height/2))/(0 - -((float)height/2)); } else { - scaling = diff; + scaling = pow(1.1, diff); } - - printf("Diff is %f, Scaling by %f on all axii\n", diff, scaling); - sceneObjs[curObject].scale[0] += scaling; - sceneObjs[curObject].scale[1] += scaling; - sceneObjs[curObject].scale[2] += scaling; + + if ( scaling != 0 ) { + + + sceneObjs[curObject].scale[0] *= scaling; + sceneObjs[curObject].scale[1] *= scaling; + sceneObjs[curObject].scale[2] *= scaling; + printf("Diff is %f, Scaling by %f on all axii\n", diff, sceneObjs[curObject].scale[0]); + + } + + starty = y; } startx = x;