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
19d74af
..
609fdd1
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
@@
-370,21
+368,23
@@
void display() {
// Draw a white ball over the light source
\r
glPushMatrix();
\r
glDisable(GL_LIGHTING);
\r
// Draw a white ball over the light source
\r
glPushMatrix();
\r
glDisable(GL_LIGHTING);
\r
- glColor3f(1.0, 1.0,
0
.0);
\r
+ glColor3f(1.0, 1.0,
1
.0);
\r
glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]);
\r
glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]);
\r
- glutSolidSphere(
1.0
, 50, 50);
\r
+ glutSolidSphere(
0.5
, 50, 50);
\r
glEnable(GL_LIGHTING);
\r
glPopMatrix();
\r
\r
// Draw a white ball over the light source
\r
glPushMatrix();
\r
glDisable(GL_LIGHTING);
\r
glEnable(GL_LIGHTING);
\r
glPopMatrix();
\r
\r
// Draw a white ball over the light source
\r
glPushMatrix();
\r
glDisable(GL_LIGHTING);
\r
- glColor3f(1.0, 1.0,
0
.0);
\r
+ glColor3f(1.0, 1.0,
1
.0);
\r
glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]);
\r
glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]);
\r
- glutSolidSphere(
1.0
, 50, 50);
\r
+ glutSolidSphere(
0.5
, 50, 50);
\r
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
UCC
git Repository :: git.ucc.asn.au