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
c9149ff
..
f3c4d2c
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-137,9
+137,10
@@
int floorSize = 100;
\r
/* Light 0 parameters */
\r
GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};
\r
\r
/* Light 0 parameters */
\r
GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};
\r
-GLfloat ambient0[] = {
1.0, 1.0, 1
.0, 1.0};
\r
+GLfloat ambient0[] = {
0.0, 0.0, 0
.0, 1.0};
\r
GLfloat specular0[] = {1.0, 1.0, 1.0, 1.0};
\r
GLfloat specular0[] = {1.0, 1.0, 1.0, 1.0};
\r
-GLfloat light0_pos[] ={ 1.0, 2.0, 3,0, 1.0};
\r
+GLfloat emission0[] = {0.0, 0.0, 0.0, 1.0};
\r
+GLfloat light0_pos[] ={ 1.0, 1.0, 0,0, 1.0};
\r
\r
\r
/**
\r
\r
\r
/**
\r
@@
-611,14
+612,15
@@
void drawFloor() {
* Draw x, z axis on floor
\r
*/
\r
void drawLine() {
\r
* Draw x, z axis on floor
\r
*/
\r
void drawLine() {
\r
+ // **NOTE: fix function
\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.5 );
\r
\r
glBegin(GL_LINES);
\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.5 );
\r
\r
glBegin(GL_LINES);
\r
- glVertex3i( 10.0, 0.1, 0.0);
\r
- glVertex3i( -10.0, 0.1, 0.0);
\r
+ glVertex3i( 10.0, 0.1,
1
0.0);
\r
+ glVertex3i( -10.0, 0.1,
-1
0.0);
\r
glEnd();
\r
\r
glDisable(GL_BLEND);
\r
glEnd();
\r
\r
glDisable(GL_BLEND);
\r
@@
-637,6
+639,7
@@
void display() {
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
+
\r
// **NOTE: Currently this rotation function is all that moves the camera off
\r
// the flat surface. Need to integrate function into gluLookAt
\r
glRotatef(30.0, 1.0, 0.0, 0.0);
\r
// **NOTE: Currently this rotation function is all that moves the camera off
\r
// the flat surface. Need to integrate function into gluLookAt
\r
glRotatef(30.0, 1.0, 0.0, 0.0);
\r
@@
-698,6
+701,11
@@
void init() {
glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
\r
glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
\r
glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);
\r
glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
\r
glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
\r
glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);
\r
+ glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE );
\r
+ glMaterialfv( GL_FRONT_AND_BACK, GL_SPECULAR, specular0);
\r
+ glMaterialfv( GL_FRONT_AND_BACK, GL_EMISSION, emission0);
\r
+ glEnable(GL_COLOR_MATERIAL);
\r
+
\r
glEnable(GL_LIGHTING);
\r
\r
glMatrixMode(GL_MODELVIEW);
\r
glEnable(GL_LIGHTING);
\r
\r
glMatrixMode(GL_MODELVIEW);
\r
UCC
git Repository :: git.ucc.asn.au