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
618fef1
..
af2d52c
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-295,22
+295,22
@@
void display() {
if ( width > height ) aspect = (float)width / (float)height;
\r
\r
gluPerspective(
\r
if ( width > height ) aspect = (float)width / (float)height;
\r
\r
gluPerspective(
\r
-
90
.0,
\r
+
75
.0,
\r
aspect,
\r
0.1,
\r
aspect,
\r
0.1,
\r
-
1
00
\r
+
2
00
\r
);
\r
\r
glMatrixMode(GL_MODELVIEW);
\r
glLoadIdentity();
\r
\r
gluLookAt(
\r
);
\r
\r
glMatrixMode(GL_MODELVIEW);
\r
glLoadIdentity();
\r
\r
gluLookAt(
\r
- 0.0, 0.0,
1
5.0, /* eye is at (x,y,z) */
\r
+ 0.0, 0.0,
5.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
\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
\r
- glRotatef(
4
5.0, 1.0, 0.0, 0.0);
\r
+ glRotatef(
7
5.0, 1.0, 0.0, 0.0);
\r
\r
/* Reposition the light source. */
\r
lightPosition[0] = 12*cos(lightAngle);
\r
\r
/* Reposition the light source. */
\r
lightPosition[0] = 12*cos(lightAngle);
\r
@@
-321,7
+321,7
@@
void display() {
glPushMatrix();
\r
\r
/* Perform scene rotations based on user mouse/keyboard input. */
\r
glPushMatrix();
\r
\r
/* Perform scene rotations based on user mouse/keyboard input. */
\r
- glRotatef(angle, 0.0,
1.0, 0
.0);
\r
+ glRotatef(angle, 0.0,
0.0,1
.0);
\r
glRotatef(angle2, 1.0, 0.0, 0.0);
\r
glTranslatef(camx, camy, camz);
\r
glRotatef(rot, 1.0, 0.0, 0.0);
\r
glRotatef(angle2, 1.0, 0.0, 0.0);
\r
glTranslatef(camx, camy, camz);
\r
glRotatef(rot, 1.0, 0.0, 0.0);
\r
@@
-410,6
+410,7
@@
int main(int argc, char **argv) {
glDepthFunc(GL_LEQUAL); // the type
\r
glEnable(GL_CULL_FACE);
\r
glEnable(GL_TEXTURE_2D);
\r
glDepthFunc(GL_LEQUAL); // the type
\r
glEnable(GL_CULL_FACE);
\r
glEnable(GL_TEXTURE_2D);
\r
+ glEnable(GL_NORMALIZE);
\r
glLineWidth(1.0);
\r
\r
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
\r
glLineWidth(1.0);
\r
\r
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
\r
UCC
git Repository :: git.ucc.asn.au