git.ucc.asn.au
/
atyndall
/
cits2231.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6e377a4
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Fri, 21 Oct 2011 03:51:58 +0000
(11:51 +0800)
committer
Ash Tyndall
<
[email protected]
>
Fri, 21 Oct 2011 03:51:58 +0000
(11:51 +0800)
globals.c
patch
|
blob
|
history
diff --git
a/globals.c
b/globals.c
index
634060c
..
237e399
100644
(file)
--- a/
globals.c
+++ b/
globals.c
@@
-70,9
+70,9
@@
GLfloat factor = 1.0;
GLfloat lineLength = 10;
/* Light 0 parameters */
GLfloat lineLength = 10;
/* Light 0 parameters */
-GLfloat diffuse0[]={
0.2, 0.2, 0.2
, 1.0};
-GLfloat ambient0[]={
0.2, 0.2, 0.2
, 1.0};
-GLfloat specular0[]={
0.2, 0.2, 0.2
, 1.0};
+GLfloat diffuse0[]={
1.0, 0.0, 0.0
, 1.0};
+GLfloat ambient0[]={
1.0, 0.0, 0.0
, 1.0};
+GLfloat specular0[]={
1.0, 0.0, 0.0
, 1.0};
GLfloat direction0[] = {0.0, 0.0, 0.0};
GLfloat lightColor0[] = {1.0, 1.0, 1.0, 1.0}; // White light
GLfloat direction0[] = {0.0, 0.0, 0.0};
GLfloat lightColor0[] = {1.0, 1.0, 1.0, 1.0}; // White light
@@
-82,9
+82,9
@@
float lightAngle0 = 0.0, lightHeight0 = 5;
int lightMoving0 = 0, lightStartX0, lightStartY0;
/* Light 1 parameters */
int lightMoving0 = 0, lightStartX0, lightStartY0;
/* Light 1 parameters */
-GLfloat diffuse1[]={
0.2, 0.2, 0.2
, 1.0};
-GLfloat ambient1[]={
0.2, 0.2, 0.2
, 1.0};
-GLfloat specular1[]={
0.2, 0.2, 0.2
, 1.0};
+GLfloat diffuse1[]={
1.0, 0.0, 0.0
, 1.0};
+GLfloat ambient1[]={
1.0, 0.0, 0.0
, 1.0};
+GLfloat specular1[]={
1.0, 0.0, 0.0
, 1.0};
GLfloat direction1[] = {0.0, 0.0, 0.0};
GLfloat lightColor1[] = {1.0, 1.0, 1.0, 1.0}; // White light
GLfloat direction1[] = {0.0, 0.0, 0.0};
GLfloat lightColor1[] = {1.0, 1.0, 1.0, 1.0}; // White light
@@
-99,7
+99,7
@@
GLfloat diffuse[] = {1.0, 0.8, 0.0, 1.0};
GLfloat specular[] = {1.0, 1.0, 1.0, 1.0};
GLfloat shine = 100.0;
GLfloat glightmodel[] = {0.2,0.2,0.2,1};
GLfloat specular[] = {1.0, 1.0, 1.0, 1.0};
GLfloat shine = 100.0;
GLfloat glightmodel[] = {0.2,0.2,0.2,1};
-GLfloat emission[] = {
1.0, 1.0, 1.0
, 1.0};
+GLfloat emission[] = {
0.0, 0.3, 0.3
, 1.0};
/* Zoom and rotate tracking */
GLfloat zoom = 0.0, rotate = 0.0;
/* Zoom and rotate tracking */
GLfloat zoom = 0.0, rotate = 0.0;
UCC
git Repository :: git.ucc.asn.au