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:
b9dfe71
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Thu, 20 Oct 2011 11:54:52 +0000
(19:54 +0800)
committer
Ash Tyndall
<
[email protected]
>
Thu, 20 Oct 2011 11:54:52 +0000
(19:54 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
e0bc2b1
..
1cc9122
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-182,7
+182,7
@@
void makeMenu() {
* @param w New width
\r
* @param h New height
\r
*/
\r
* @param w New width
\r
* @param h New height
\r
*/
\r
-
/*
void windowReshape(int w, int h) {
\r
+void windowReshape(int w, int h) {
\r
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
\r
glMatrixMode(GL_PROJECTION);
\r
glLoadIdentity();
\r
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
\r
glMatrixMode(GL_PROJECTION);
\r
glLoadIdentity();
\r
@@
-194,7
+194,7
@@
void makeMenu() {
far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);
\r
glMatrixMode(GL_MODELVIEW);
\r
glLoadIdentity();
\r
far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);
\r
glMatrixMode(GL_MODELVIEW);
\r
glLoadIdentity();
\r
-}
*/
\r
+}
\r
\r
/**
\r
* Called when mouse event occurs
\r
\r
/**
\r
* Called when mouse event occurs
\r
@@
-231,6
+231,7
@@
void mouse(int button, int state, int x, int y) {
* w/s increase/decrease the z
\r
* a/d increase/decrease the x
\r
* q/e increase/decrease the y
\r
* w/s increase/decrease the z
\r
* a/d increase/decrease the x
\r
* q/e increase/decrease the y
\r
+ * z/x increase/decrease the angle
\r
* @param key Key pressed
\r
* @param x x co-ordinate of mouse
\r
* @param y y co-ordinate of mouse
\r
* @param key Key pressed
\r
* @param x x co-ordinate of mouse
\r
* @param y y co-ordinate of mouse
\r
@@
-352,12
+353,12
@@
void init() {
glMatrixMode(GL_PROJECTION);
\r
glLoadIdentity();
\r
\r
glMatrixMode(GL_PROJECTION);
\r
glLoadIdentity();
\r
\r
- gluPerspective(
\r
- 60.0, /* field of view in degree */
\r
- 1.0, /* aspect ratio */
\r
- nearClip, /* Z near */
\r
- farClip /* Z far */
\r
- );
\r
+
//
gluPerspective(
\r
+
//
60.0, /* field of view in degree */
\r
+
//
1.0, /* aspect ratio */
\r
+
//
nearClip, /* Z near */
\r
+
//
farClip /* Z far */
\r
+
//
);
\r
\r
glMatrixMode(GL_MODELVIEW);
\r
glLoadIdentity();
\r
\r
glMatrixMode(GL_MODELVIEW);
\r
glLoadIdentity();
\r
UCC
git Repository :: git.ucc.asn.au