X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=eaa3642e17fef1d8a245b4c451b2140cb9d1464a;hp=b965c9496f99948a8043e33e6726b924938b85fb;hb=05b903c3a9b3bde19372b6c4407939a7ce472195;hpb=87e683d3752833b7efc3e9b8d323b9916edc74b9

diff --git a/scene.c b/scene.c
index b965c94..eaa3642 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,16 +407,16 @@ 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,10);
+  glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 45.0);
+  //glLighti(GL_LIGHT0, GL_SPOT_EXPONENT,10);
 
   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,10);
+  glLightf(GL_LIGHT1, GL_SPOT_CUTOFF, 45.0);
+  //glLighti(GL_LIGHT1, GL_SPOT_EXPONENT,10);
 
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);
   glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
@@ -462,7 +463,7 @@ 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_TEXTURE_2D);
   //glEnable(GL_CULL_FACE);
   glEnable(GL_NORMALIZE);
   glLineWidth(2.0);