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
60fde81
..
c9149ff
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-124,7
+124,7
@@
GLfloat angle2 = 30; /* in degrees */
\r
/* Near and far parameters */
\r
GLfloat near = -10;
\r
\r
/* Near and far parameters */
\r
GLfloat near = -10;
\r
-GLfloat far =
5
0;
\r
+GLfloat far =
1
0;
\r
\r
/* Zoom factor for mouse movements */
\r
GLfloat zoomFactor = 1.0;
\r
\r
/* Zoom factor for mouse movements */
\r
GLfloat zoomFactor = 1.0;
\r
@@
-614,11
+614,11
@@
void drawLine() {
glDisable(GL_TEXTURE_2D);
\r
glEnable(GL_BLEND);
\r
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
\r
glDisable(GL_TEXTURE_2D);
\r
glEnable(GL_BLEND);
\r
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
\r
- glColor4ub( 0.0, 0.0, 0.0, 0.
0
);
\r
+ glColor4ub( 0.0, 0.0, 0.0, 0.
5
);
\r
\r
glBegin(GL_LINES);
\r
\r
glBegin(GL_LINES);
\r
- glVertex3i( 10.0, 0, 0.0);
\r
- glVertex3i( -10.0, 0, 0.0);
\r
+ glVertex3i( 10.0, 0
.1
, 0.0);
\r
+ glVertex3i( -10.0, 0
.1
, 0.0);
\r
glEnd();
\r
\r
glDisable(GL_BLEND);
\r
glEnd();
\r
\r
glDisable(GL_BLEND);
\r
@@
-657,7
+657,8
@@
void display() {
\r
drawFloor();
\r
\r
\r
drawFloor();
\r
\r
-
\r
+ drawLine();
\r
+
\r
// Draw teapot for a test object
\r
glPushMatrix();
\r
glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
\r
// Draw teapot for a test object
\r
glPushMatrix();
\r
glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
\r
UCC
git Repository :: git.ucc.asn.au