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
927c1f4
..
914f3a6
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-500,7
+500,7
@@
void makeMenu() {
*/
\r
void windowReshape(int w, int h) {
\r
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
\r
*/
\r
void windowReshape(int w, int h) {
\r
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
\r
- glMatrixMode(GL_PROJECTION);
\r
+
/*
glMatrixMode(GL_PROJECTION);
\r
glLoadIdentity();
\r
if (w <= h)
\r
glOrtho(near, far, near*(GLfloat)h/(GLfloat)w,
\r
glLoadIdentity();
\r
if (w <= h)
\r
glOrtho(near, far, near*(GLfloat)h/(GLfloat)w,
\r
@@
-509,7
+509,7
@@
void windowReshape(int w, int h) {
glOrtho(near*(GLfloat)w/(GLfloat)h,
\r
far*(GLfloat)w/(GLfloat)h, near, far, near, far);
\r
glMatrixMode(GL_MODELVIEW);
\r
glOrtho(near*(GLfloat)w/(GLfloat)h,
\r
far*(GLfloat)w/(GLfloat)h, near, far, near, far);
\r
glMatrixMode(GL_MODELVIEW);
\r
- glLoadIdentity();
\r
+ glLoadIdentity();
*/
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
@@
-635,7
+635,7
@@
void display() {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
\r
glLoadIdentity();
\r
gluLookAt(
\r
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
\r
glLoadIdentity();
\r
gluLookAt(
\r
- 0.0, 0.0, 10.0, /* eye is at (x,y,z) */
\r
+ 0.0,
1
0.0, 10.0, /* eye is at (x,y,z) */
\r
0.0, 0.0, 0.0, /* center is at (x,y,z) */
\r
0.0, 1.0, 0.0 /* up is in postivie Y direction */
\r
);
\r
0.0, 0.0, 0.0, /* center is at (x,y,z) */
\r
0.0, 1.0, 0.0 /* up is in postivie Y direction */
\r
);
\r
@@
-696,7
+696,7
@@
void init() {
1.0, /* aspect ratio */
\r
near, /* Z near */
\r
far /* Z far */
\r
1.0, /* aspect ratio */
\r
near, /* Z near */
\r
far /* Z far */
\r
- );
\r
+ );
\r
\r
\r
glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
\r
\r
\r
glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
\r
UCC
git Repository :: git.ucc.asn.au