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
3d7dcd3
..
8101ddb
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-289,7
+289,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, 3
0.0, /* eye is at (x,y,z) */
\r
+ 0.0,
10.0, 10
0.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
@@
-298,7
+298,7
@@
void display() {
\r
// **NOTE: Currently this rotation function is all that moves the camera off
\r
// the flat surface. Need to integrate function into gluLookAt
\r
\r
// **NOTE: Currently this rotation function is all that moves the camera off
\r
// the flat surface. Need to integrate function into gluLookAt
\r
- glRotatef(30.0, 1.0, 0.0, 0.0);
\r
+
//
glRotatef(30.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
@@
-322,7
+322,7
@@
void display() {
glPushMatrix();
\r
glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
\r
glColor3f(0.5, 0.5, 0.5);
\r
glPushMatrix();
\r
glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
\r
glColor3f(0.5, 0.5, 0.5);
\r
- glutSolidTeapot(1);
\r
+ glutSolidTeapot(1
00
);
\r
glPopMatrix();
\r
\r
// Draw a white ball over the light source
\r
glPopMatrix();
\r
\r
// Draw a white ball over the light source
\r
UCC
git Repository :: git.ucc.asn.au