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]
/
helper.c
diff --git
a/helper.c
b/helper.c
index
d685e51
..
33799d5
100644
(file)
--- a/
helper.c
+++ b/
helper.c
@@
-216,7
+216,6
@@
int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSiz
* @param z2 bottom-left z
*/
void drawSquare(int recurseLevel, float x1, float z1, float x2, float z2) {
* @param z2 bottom-left z
*/
void drawSquare(int recurseLevel, float x1, float z1, float x2, float z2) {
-
if ( drawFloorRecurse != recurseLevel ) {
// Calculate middle points
float xm = (x1 + x2) / 2.0;
if ( drawFloorRecurse != recurseLevel ) {
// Calculate middle points
float xm = (x1 + x2) / 2.0;
@@
-234,14
+233,16
@@
void drawSquare(int recurseLevel, float x1, float z1, float x2, float z2) {
} else {
// Draw square.
// **NOTE: Is the polygon facing in the right direction?
} else {
// Draw square.
// **NOTE: Is the polygon facing in the right direction?
+ // **NOTE: We're drawing large strips, which might be a lighting problem
+
glBegin(GL_QUADS);
glBegin(GL_QUADS);
+ glNormal3f(0,1,0);
glVertex3f(x1, 0.0, z1);
glVertex3f(x1, 0.0, z2);
glVertex3f(x2, 0.0, z2);
glVertex3f(x2, 0.0, z1);
glEnd();
}
glVertex3f(x1, 0.0, z1);
glVertex3f(x1, 0.0, z2);
glVertex3f(x2, 0.0, z2);
glVertex3f(x2, 0.0, z1);
glEnd();
}
-
}
/**
}
/**
@@
-257,15
+258,22
@@
void drawFloor() {
void drawLine() {
// **NOTE: fix function
glDisable(GL_TEXTURE_2D);
void drawLine() {
// **NOTE: fix function
glDisable(GL_TEXTURE_2D);
- glEnable(GL_BLEND);
+ glDisable(GL_LIGHTING);
+ //glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4ub( 0.0, 0.0, 0.0, 0.5 );
+ glColor3f( 0.0, 0.0, 0.0 );
+
+ glBegin(GL_LINES);
+ glVertex3i( lineLength, 0.0, 0.0 );
+ glVertex3i( -lineLength, 0.0, 0.0 );
+ glEnd();
glBegin(GL_LINES);
glBegin(GL_LINES);
- glVertex3i(
10.0, 0.1, 10.0
);
- glVertex3i(
-10.0, 0.1, -10.0
);
+ glVertex3i(
0.0, 0.0, lineLength
);
+ glVertex3i(
0.0, 0.0, -lineLength
);
glEnd();
glEnd();
- glDisable(GL_BLEND);
+ //glDisable(GL_BLEND);
+ glEnable(GL_LIGHTING);
glEnable(GL_TEXTURE_2D);
}
\ No newline at end of file
glEnable(GL_TEXTURE_2D);
}
\ No newline at end of file
UCC
git Repository :: git.ucc.asn.au