git.ucc.asn.au
/
atyndall
/
cits2231.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[atyndall/cits2231.git]
/
scene.c
diff --git
a/scene.c
b/scene.c
index
3a52435
..
74e79a7
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-307,21
+307,13
@@
void motion(int x, int y) {
// w: big/small, h: up/down
\r
\r
// For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf
\r
// w: big/small, h: up/down
\r
\r
// For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf
\r
- float diff = (
y - starty
);
\r
- float scaling;
\r
+ float diff = (
x - startx
);
\r
+ float scaling
= ( diff + (float)height/2 ) / ( (float)height/2 )
;
\r
\r
\r
- if ( diff < 0 ) {
\r
- scaling = (diff - -((float)height/2))/(0 - -((float)height/2));
\r
- } else {
\r
- scaling = diff;
\r
- }
\r
-
\r
- printf("Diff is %f, Scaling by %f on all axii\n", diff, scaling);
\r
sceneObjs[curObject].scale[0] *= scaling;
\r
sceneObjs[curObject].scale[1] *= scaling;
\r
sceneObjs[curObject].scale[2] *= scaling;
\r
sceneObjs[curObject].scale[0] *= scaling;
\r
sceneObjs[curObject].scale[1] *= scaling;
\r
sceneObjs[curObject].scale[2] *= scaling;
\r
-
\r
- starty = y;
\r
+ printf("Diff is %f, Scaling by %f on all axii, 1/map is %f\n", diff, sceneObjs[curObject].scale[0], scaling);
\r
}
\r
\r
startx = x;
\r
}
\r
\r
startx = x;
\r
UCC
git Repository :: git.ucc.asn.au