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
ca09d1d
..
07824dd
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-113,7
+113,8
@@
void processLightEvents(int id) {
* @param id ID of object selected
\r
*/
\r
void processObjectEvents(int id) {
\r
* @param id ID of object selected
\r
*/
\r
void processObjectEvents(int id) {
\r
-
\r
+ // **NOTE: For the testing phase, only have the teapot
\r
+ addSceneObject(id);
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
@@
-407,7
+408,7
@@
void init() {
glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0);
\r
\r
//glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 90.0);
\r
glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0);
\r
\r
//glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 90.0);
\r
- glLighti(GL_LIGHT0, GL_SPOT_EXPONENT,100);
\r
+
//
glLighti(GL_LIGHT0, GL_SPOT_EXPONENT,100);
\r
\r
glLightfv(GL_LIGHT1, GL_AMBIENT, ambient1);
\r
glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse1);
\r
\r
glLightfv(GL_LIGHT1, GL_AMBIENT, ambient1);
\r
glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse1);
\r
@@
-415,7
+416,7
@@
void init() {
glLightfv(GL_LIGHT1, GL_SPOT_DIRECTION, direction1);
\r
\r
//glLightf(GL_LIGHT1, GL_SPOT_CUTOFF, 90.0);
\r
glLightfv(GL_LIGHT1, GL_SPOT_DIRECTION, direction1);
\r
\r
//glLightf(GL_LIGHT1, GL_SPOT_CUTOFF, 90.0);
\r
- glLighti(GL_LIGHT1, GL_SPOT_EXPONENT,100);
\r
+
//
glLighti(GL_LIGHT1, GL_SPOT_EXPONENT,100);
\r
\r
glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);
\r
glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
\r
\r
glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);
\r
glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
\r
UCC
git Repository :: git.ucc.asn.au