git.ucc.asn.au
/
atyndall
/
cits2231.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a94c1e2
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Tue, 18 Oct 2011 03:48:46 +0000
(11:48 +0800)
committer
Ash Tyndall
<
[email protected]
>
Tue, 18 Oct 2011 03:48:46 +0000
(11:48 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
638683e
..
7808d37
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-570,18
+570,9
@@
void display() {
// lightPosition[3] = 1.0;
\r
//}
\r
\r
// lightPosition[3] = 1.0;
\r
//}
\r
\r
- glPushMatrix();
\r
-
\r
- /* Tell GL new light source position. */
\r
+ glPushMatrix();
\r
glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
\r
\r
glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
\r
\r
- /* Draw "bottom" of floor in blue. */
\r
- glFrontFace(GL_CW); /* Switch face orientation. */
\r
- glColor4f(0.1, 0.1, 0.7, 1.0);
\r
- drawFloor();
\r
- glFrontFace(GL_CCW);
\r
-
\r
- /* Draw "top" of floor. Use blending to blend in reflection. */
\r
glEnable(GL_BLEND);
\r
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
\r
glColor4f(0.7, 0.0, 0.0, 0.3);
\r
glEnable(GL_BLEND);
\r
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
\r
glColor4f(0.7, 0.0, 0.0, 0.3);
\r
@@
-589,18
+580,22
@@
void display() {
drawFloor();
\r
glDisable(GL_BLEND);
\r
\r
drawFloor();
\r
glDisable(GL_BLEND);
\r
\r
+ glutSolidTeapot(1);
\r
+
\r
glPushMatrix();
\r
glDisable(GL_LIGHTING);
\r
glPushMatrix();
\r
glDisable(GL_LIGHTING);
\r
+ glColor3f(1.0, 1.0, 0.0);
\r
\r
/* Draw a yellow ball at the light source. */
\r
glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);
\r
glutSolidSphere(1.0, 5, 5);
\r
\r
\r
/* Draw a yellow ball at the light source. */
\r
glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);
\r
glutSolidSphere(1.0, 5, 5);
\r
\r
-
glEnable(GL_LIGHTING);
\r
+ glEnable(GL_LIGHTING);
\r
glPopMatrix();
\r
\r
glPopMatrix();
\r
\r
- drawFloor();
\r
- glutSwapBuffers();
\r
+ glPopMatrix();
\r
+
\r
+ glutSwapBuffers();
\r
}
\r
\r
\r
}
\r
\r
\r
UCC
git Repository :: git.ucc.asn.au