X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=6d47393250a084c9a7075613fa8c04882d1cd8a1;hb=5e6a932345dfe95c3d2b289053b93abfb5c5d4fb;hp=a1ff085702f745f036240cac9d048859a5ed76dd;hpb=63e9aefdfc12daef518074efa3021b7b9a0f5d38;p=atyndall%2Fcits2231.git diff --git a/scene.c b/scene.c index a1ff085..6d47393 100644 --- a/scene.c +++ b/scene.c @@ -302,9 +302,13 @@ void motion(int x, int y) { //so.x, so.y, so.z if ( buttonSelected == GLUT_LEFT_BUTTON ) { // w: left/right, h: near/far - sceneObjs[curObject].x += (x - startx); + //sceneObjs[curObject].x += (x - startx)*leftrightFactor; } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) { // w: big/small, h: up/down + float scaling = (y - starty)*bigsmallFactor; + sceneObjs[curObject].scale[0] += scaling; + sceneObjs[curObject].scale[1] += scaling; + sceneObjs[curObject].scale[2] += scaling; } startx = x;