X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=bb4b8156d9aa9d8e0472453eb7773cc6f5f6e65f;hp=74b15cab6f46692b72c105149a7ab1621ebe7642;hb=600240b234c1a3e01560332b6b0f230fbcf48ac3;hpb=732047b86f9fca77cec1c110eca712997894808a

diff --git a/scene.c b/scene.c
index 74b15ca..bb4b815 100644
--- a/scene.c
+++ b/scene.c
@@ -113,7 +113,8 @@ void processLightEvents(int id) {
  * @param id ID of object selected
  */
 void processObjectEvents(int id) {
-
+  // **NOTE: For the testing phase, only have the teapot
+  addSceneObject(id);
 }
 
 /**
@@ -407,6 +408,7 @@ void init() {
   glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0);
 
   glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 90.0);
+  glLighti(GL_LIGHT0, GL_SPOT_EXPONENT,10);
 
   glLightfv(GL_LIGHT1, GL_AMBIENT, ambient1);
   glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse1);
@@ -414,15 +416,16 @@ void init() {
   glLightfv(GL_LIGHT1, GL_SPOT_DIRECTION, direction1);
 
   glLightf(GL_LIGHT1, GL_SPOT_CUTOFF, 90.0);
+  glLighti(GL_LIGHT1, GL_SPOT_EXPONENT,10);
 
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);
   glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
 
-  glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);
-  glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);
-  glMaterialfv(GL_FRONT, GL_SPECULAR, specular);
-  glMaterialfv(GL_FRONT, GL_EMISSION, emission);
-  glMaterialf(GL_FRONT, GL_SHININESS, shine);
+  //glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);
+  //glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);
+  //glMaterialfv(GL_FRONT, GL_SPECULAR, specular);
+  //glMaterialfv(GL_FRONT, GL_EMISSION, emission);
+  //glMaterialf(GL_FRONT, GL_SHININESS, shine);
 
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHT1);