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
74136de
..
9d71579
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
@@
-484,8
+484,8
@@
void makeMenu() {
* @param h New height
\r
*/
\r
void windowReshape(int w, int h) {
\r
* @param h New height
\r
*/
\r
void windowReshape(int w, int h) {
\r
- GLdouble near = -100
0
.0;
\r
- GLdouble far = 100
0
.0;
\r
+ GLdouble near = -100.0;
\r
+ GLdouble far = 100.0;
\r
\r
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
\r
glMatrixMode(GL_PROJECTION);
\r
\r
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
\r
glMatrixMode(GL_PROJECTION);
\r
@@
-613,12
+613,12
@@
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, 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(
45
.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
@@
-641,7
+641,7
@@
void display() {
glPushMatrix();
\r
\r
//glTranslatef(0.0, 0.0, 0.0);
\r
glPushMatrix();
\r
\r
//glTranslatef(0.0, 0.0, 0.0);
\r
- glutWireTeapot(
30
); // Draw teapot for test
\r
+ glutWireTeapot(
1
); // Draw teapot for test
\r
glPopMatrix();
\r
\r
glPushMatrix();
\r
glPopMatrix();
\r
\r
glPushMatrix();
\r
UCC
git Repository :: git.ucc.asn.au