X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=f87412d8d9d4ae06eefcd1c37866a037d43f3069;hb=9ef4031c2586c4164580c88a8fcf198235a0ccc8;hp=3f2c2ab4e235d68041db566e04aa5e1b014434ce;hpb=ab838687c0439bc042cf3818fd7dcba9c23963a4;p=atyndall%2Fcits2231.git diff --git a/scene.c b/scene.c index 3f2c2ab..f87412d 100644 --- a/scene.c +++ b/scene.c @@ -308,12 +308,13 @@ void motion(int x, int y) { // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf float diff = (y - starty); + float map = (diff - -((float)height/2))/(0 - -((float)height/2)); float scaling; if ( diff < 0 ) { - scaling = (diff - -((float)height/2))/(0 - -((float)height/2)); + scaling = map; } else { - scaling = diff; + scaling = pow(1.0/map, diff); } if ( scaling != 0 ) { @@ -322,7 +323,7 @@ void motion(int x, int y) { 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]); + printf("Diff is %f, Scaling by %f on all axii, 1/map is %f\n", diff, sceneObjs[curObject].scale[0], 1/map); }