git.ucc.asn.au
/
atyndall
/
cits2231.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
19906e0
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Sat, 22 Oct 2011 08:26:43 +0000
(16:26 +0800)
committer
Ash Tyndall
<
[email protected]
>
Sat, 22 Oct 2011 08:26:43 +0000
(16:26 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
55b1856
..
c41dafb
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-122,6
+122,7
@@
void processObjectEvents(int id) {
void processTextureEvents(int id) {
\r
if ( curObject >= 0 ) {
\r
sceneObjs[curObject].texture.id = id;
\r
+ sceneObjs[curObject].texture.scale = 1;
\r
glutPostRedisplay();
\r
}
\r
}
\r
@@
-279,7
+280,7
@@
void motion(int x, int y) {
\r
// h: texture scale
\r
float max = (float)height/texscaleFactor;
\r
- float scaling = (diffy + max) / max;
\r
+ float scaling = (
-
diffy + max) / max;
\r
sceneObjs[curObject].texture.scale *= scaling;
\r
\r
}
\r
UCC
git Repository :: git.ucc.asn.au