X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=a638c499ff0cfabf874c41c761a597b161b426e7;hp=7e6d209735a0ec5a44dad78073c451cec784ff90;hb=a5f759089021e80d8f2ab1d37e359843f7ca5c52;hpb=354428cd17e38c21c4f9f9371f4db0bfe296e866

diff --git a/scene.c b/scene.c
index 7e6d209..a638c49 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);
 }
 
 /**
@@ -406,26 +407,14 @@ void init() {
   glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);
   glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0);
 
-  glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 90.0);
-  glLightf(GL_LIGHT0, GL_SPOT_EXPONENT,90);
-
   glLightfv(GL_LIGHT1, GL_AMBIENT, ambient1);
   glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse1);
   glLightfv(GL_LIGHT1, GL_SPECULAR, specular1);
   glLightfv(GL_LIGHT1, GL_SPOT_DIRECTION, direction1);
 
-  glLightf(GL_LIGHT1, GL_SPOT_CUTOFF, 90.0);
-  glLightf(GL_LIGHT1, GL_SPOT_EXPONENT,90);
-
   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);
-
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHT1);
   glEnable(GL_LIGHTING);
@@ -462,8 +451,6 @@ int main(int argc, char **argv) {
   glDepthRange(0,1);
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing
   glDepthFunc(GL_LEQUAL);  // the type
-  glEnable(GL_TEXTURE_2D);
-  //glEnable(GL_CULL_FACE);
   glEnable(GL_NORMALIZE);
   glLineWidth(2.0);