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:
fa5eba8
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Sun, 9 Oct 2011 07:10:27 +0000
(15:10 +0800)
committer
Ash Tyndall
<
[email protected]
>
Sun, 9 Oct 2011 07:10:27 +0000
(15:10 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
b50bae1
..
8905850
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-467,8
+467,21
@@
void windowReshape(int width, int height) {
glViewport(0, 0, (GLsizei)width, (GLsizei)height);
\r
glMatrixMode(GL_PROJECTION);
\r
glLoadIdentity();
\r
glViewport(0, 0, (GLsizei)width, (GLsizei)height);
\r
glMatrixMode(GL_PROJECTION);
\r
glLoadIdentity();
\r
- gluPerspective(60, 1.0, 0.1, 1000.0);
\r
+
\r
+ if (width <= height)
\r
+ gluPerspective(60, (GLfloat)height / (GLfloat)width, 0.1, 1000.0);
\r
+ else
\r
+ gluPerspective(60, (GLfloat)width / (GLfloat)height, 0.1, 1000.0);
\r
glMatrixMode(GL_MODELVIEW);
\r
glMatrixMode(GL_MODELVIEW);
\r
+
\r
+ /*glViewport(0, 0, w, h);
\r
+ glMatrixMode(GL_PROJECTION); /* switch matrix mode
\r
+ glLoadIdentity();
\r
+ if (w <= h)
\r
+ gluOrtho2D(-2.0, 2.0, -2.0 * (GLfloat) h / (GLfloat) w, 2.0 * (GLfloat) h / (GLfloat) w);
\r
+ else
\r
+ gluOrtho2D(-2.0 * (GLfloat) w / (GLfloat) h, 2.0 * (GLfloat) w / (GLfloat) h, -2.0, 2.0);
\r
+ glMatrixMode(GL_MODELVIEW); /* return to modelview mode */
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
UCC
git Repository :: git.ucc.asn.au