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
8a31742
..
07a357e
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-125,7
+125,7
@@
int lightMoving = 0, lightStartX, lightStartY;
\r
/* Time varying or user-controled variables. */
\r
static float jump = 0.0;
\r
\r
/* Time varying or user-controled variables. */
\r
static float jump = 0.0;
\r
-static float lightAngle = 0.0, lightHeight =
2
0;
\r
+static float lightAngle = 0.0, lightHeight =
4
0;
\r
GLfloat angle = -150; /* in degrees */
\r
GLfloat angle2 = 30; /* in degrees */
\r
\r
GLfloat angle = -150; /* in degrees */
\r
GLfloat angle2 = 30; /* in degrees */
\r
\r
@@
-563,7
+563,7
@@
void idle() {
}
\r
\r
\r
}
\r
\r
\r
-int drawFloorRecurse =
6
;
\r
+int drawFloorRecurse =
5
;
\r
\r
void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
\r
\r
\r
void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
\r
\r
@@
-613,11
+613,13
@@
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,
6
0.0, /* eye is at (x,y,z) */
\r
+ 0.0, 0.0,
8
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
\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(30.0, 1.0, 0.0, 0.0);
\r
+
\r
/* Reposition the light source. */
\r
lightPosition[0] = 12*cos(lightAngle);
\r
lightPosition[1] = lightHeight;
\r
/* Reposition the light source. */
\r
lightPosition[0] = 12*cos(lightAngle);
\r
lightPosition[1] = lightHeight;
\r
@@
-626,7
+628,7
@@
void display() {
\r
glPushMatrix();
\r
/* Perform scene rotations based on user mouse input. */
\r
\r
glPushMatrix();
\r
/* Perform scene rotations based on user mouse input. */
\r
- glRotatef(angle2, 1.0, 0.0, 0.0);
\r
+
\r
glRotatef(angle, 0.0, 1.0, 0.0);
\r
\r
glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
\r
glRotatef(angle, 0.0, 1.0, 0.0);
\r
\r
glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
\r
UCC
git Repository :: git.ucc.asn.au