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
82d3cef
..
76b437b
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-535,12
+535,11
@@
void drawFloor() {
*/
\r
void display() {
\r
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
\r
*/
\r
void display() {
\r
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
\r
- glMatrixMode(GL_MODELVIEW);
\r
glLoadIdentity();
\r
gluLookAt(
\r
glLoadIdentity();
\r
gluLookAt(
\r
- 0.0,
9
0.0, 60.0, /* eye is at (x,y,z) */
\r
+ 0.0,
1000
0.0, 60.0, /* eye is at (x,y,z) */
\r
0.0, 0.0, 0.0, /* center is at (x,y,z) */
\r
0.0, 0.0, 0.0, /* center is at (x,y,z) */
\r
- 0.0, 1
00
.0, 0.0 /* up is in postivie Y direction */
\r
+ 0.0, 1.0, 0.0 /* up is in postivie Y direction */
\r
);
\r
\r
/* Reposition the light source. */
\r
);
\r
\r
/* Reposition the light source. */
\r
@@
-549,7
+548,6
@@
void display() {
lightPosition[2] = 12*sin(lightAngle);
\r
lightPosition[3] = 0.0;
\r
\r
lightPosition[2] = 12*sin(lightAngle);
\r
lightPosition[3] = 0.0;
\r
\r
- glMatrixMode(GL_PROJECTION);
\r
glPushMatrix();
\r
glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
\r
\r
glPushMatrix();
\r
glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
\r
\r
@@
-559,15
+557,14
@@
void display() {
glDisable(GL_BLEND);
\r
\r
glPushMatrix();
\r
glDisable(GL_BLEND);
\r
\r
glPushMatrix();
\r
- glLoadIdentity();
\r
-
glTranslatef(0.0, -90.0, -6
0.0);
\r
-
\r
+
\r
+
//glTranslatef(0.0, 0.0,
0.0);
\r
+ glLoadIdentity();
\r
glutSolidTeapot(5); // Draw teapot for test
\r
glPopMatrix();
\r
\r
glPushMatrix();
\r
glDisable(GL_LIGHTING);
\r
glutSolidTeapot(5); // Draw teapot for test
\r
glPopMatrix();
\r
\r
glPushMatrix();
\r
glDisable(GL_LIGHTING);
\r
- glLoadIdentity();
\r
glColor3f(1.0, 1.0, 1.0);
\r
\r
/* Draw a yellow ball at the light source. */
\r
glColor3f(1.0, 1.0, 1.0);
\r
\r
/* Draw a yellow ball at the light source. */
\r
@@
-587,6
+584,7
@@
void display() {
*/
\r
void init() {
\r
glMatrixMode(GL_PROJECTION);
\r
*/
\r
void init() {
\r
glMatrixMode(GL_PROJECTION);
\r
+ glLoadIdentity();
\r
\r
gluPerspective(
\r
60.0, /* field of view in degree */
\r
\r
gluPerspective(
\r
60.0, /* field of view in degree */
\r
@@
-601,6
+599,9
@@
void init() {
glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
\r
glEnable(GL_LIGHT0);
\r
glEnable(GL_LIGHTING);
\r
glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
\r
glEnable(GL_LIGHT0);
\r
glEnable(GL_LIGHTING);
\r
+
\r
+ glMatrixMode(GL_MODELVIEW);
\r
+ glLoadIdentity();
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
UCC
git Repository :: git.ucc.asn.au