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
3bda9b4
..
7e5e2ad
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-318,7
+318,7
@@
void display() {
75.0,
\r
aspect,
\r
0.1,
\r
75.0,
\r
aspect,
\r
0.1,
\r
-
2
00
\r
+
3
00
\r
);
\r
\r
glMatrixMode(GL_MODELVIEW);
\r
);
\r
\r
glMatrixMode(GL_MODELVIEW);
\r
@@
-355,8
+355,6
@@
void display() {
glLightfv(GL_LIGHT1, GL_POSITION, lightPosition1);
\r
\r
drawFloor();
\r
glLightfv(GL_LIGHT1, GL_POSITION, lightPosition1);
\r
\r
drawFloor();
\r
-
\r
- drawLine();
\r
\r
// Draw teapot for a test object
\r
glPushMatrix();
\r
\r
// Draw teapot for a test object
\r
glPushMatrix();
\r
@@
-385,6
+383,8
@@
void display() {
glEnable(GL_LIGHTING);
\r
glPopMatrix();
\r
\r
glEnable(GL_LIGHTING);
\r
glPopMatrix();
\r
\r
+ drawAxisLines();
\r
+
\r
glPopMatrix();
\r
\r
glutSwapBuffers();
\r
glPopMatrix();
\r
\r
glutSwapBuffers();
\r
@@
-416,8
+416,8
@@
void init() {
glMaterialfv(GL_FRONT, GL_EMISSION, emission);
\r
glMaterialf(GL_FRONT, GL_SHININESS, shine);
\r
\r
glMaterialfv(GL_FRONT, GL_EMISSION, emission);
\r
glMaterialf(GL_FRONT, GL_SHININESS, shine);
\r
\r
- glEnable(GL_LIGHT0);
\r
- glEnable(GL_LIGHT1);
\r
+
//
glEnable(GL_LIGHT0);
\r
+
//
glEnable(GL_LIGHT1);
\r
glEnable(GL_LIGHTING);
\r
}
\r
\r
glEnable(GL_LIGHTING);
\r
}
\r
\r
UCC
git Repository :: git.ucc.asn.au