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 (from parent 1:
0400887
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Tue, 18 Oct 2011 07:10:31 +0000
(15:10 +0800)
committer
Ash Tyndall
<
[email protected]
>
Tue, 18 Oct 2011 07:10:31 +0000
(15:10 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
736d5e6
..
93d2171
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-556,14
+556,14
@@
void display() {
glutSolidTeapot(1); // Draw teapot for test
\r
\r
glPushMatrix();
\r
glutSolidTeapot(1); // Draw teapot for test
\r
\r
glPushMatrix();
\r
- glDisable(GL_LIGHTING);
\r
+
//
glDisable(GL_LIGHTING);
\r
glColor3f(1.0, 1.0, 1.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
glColor3f(1.0, 1.0, 1.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
- glEnable(GL_LIGHTING);
\r
+
//
glEnable(GL_LIGHTING);
\r
glPopMatrix();
\r
\r
glPopMatrix();
\r
glPopMatrix();
\r
\r
glPopMatrix();
\r
@@
-595,14
+595,12
@@
void init() {
0.0, 1.0, 0.0 /* up is in postivie Y direction */
\r
);
\r
\r
0.0, 1.0, 0.0 /* up is in postivie Y direction */
\r
);
\r
\r
- glTranslatef( 0.0f, 0.0f, -600.0f); // Move into the Screen 10.0
\r
-
\r
- /*glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);
\r
+ glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);
\r
glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColor);
\r
glLightf(GL_LIGHT0, GL_CONSTANT_ATTENUATION, 0.1);
\r
glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
\r
glEnable(GL_LIGHT0);
\r
glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColor);
\r
glLightf(GL_LIGHT0, GL_CONSTANT_ATTENUATION, 0.1);
\r
glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
\r
glEnable(GL_LIGHT0);
\r
- glEnable(GL_LIGHTING);
*/
\r
+ glEnable(GL_LIGHTING);
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
UCC
git Repository :: git.ucc.asn.au