X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=441b3c9b22bb4b75bde312ae57a0d321a34c1270;hp=3bc100706f56b19dd470de63153391b7453caeae;hb=821c28d874f5560d63a57ed73bc77b11337c3280;hpb=51d8df428ef9188ec1b00656a3e691da8cd0bbe5;ds=sidebyside

diff --git a/helper.c b/helper.c
index 3bc1007..441b3c9 100644
--- a/helper.c
+++ b/helper.c
@@ -299,7 +299,8 @@ int addSceneObject(int id) {
   curObject = nObjects;
 
   sceneObjs[nObjects].mesh = -1; // Teapot is -1 mesh
-  sceneObjs[nObjects].texture = -1;
+  sceneObjs[nObjects].texture.id = -1; // No texture
+  sceneObjs[nObjects].texture.scale = 1;
   sceneObjs[nObjects].x = 0;
   sceneObjs[nObjects].y = 0;
   sceneObjs[nObjects].z = 0;
@@ -308,12 +309,58 @@ int addSceneObject(int id) {
   sceneObjs[nObjects].scale[1] = 1;
   sceneObjs[nObjects].scale[2] = 1;
 
-  sceneObjs[nObjects].rotation.amount = 0;
-  sceneObjs[nObjects].rotation.vector[0] = 0;
-  sceneObjs[nObjects].rotation.vector[1] = 0;
-  sceneObjs[nObjects].rotation.vector[2] = 0;
+  sceneObjs[nObjects].rotation.x = 0;
+  sceneObjs[nObjects].rotation.y = 0;
+  sceneObjs[nObjects].rotation.z = 0;
 
   nObjects += 1; // New object in scene
 
   return nObjects;
+}
+
+void initializeLights() {
+  glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lightGlobalModel);
+  glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
+  
+  for ( int i = 0; i < LIGHTS; i++ ) {
+
+    memcpy( lightObjs[i].position, defaultPosition, sizeof(GLfloat) * 4 );
+    memcpy( lightObjs[i].ambient, defaultAmbient, sizeof(GLfloat) * 4 );
+    memcpy( lightObjs[i].diffuse, defaultDiffuse, sizeof(GLfloat) * 4 );
+    memcpy( lightObjs[i].specular, defaultSpecular, sizeof(GLfloat) * 4 );
+    memcpy( lightObjs[i].direction, defaultDirection, sizeof(GLfloat) * 3 );
+
+    lightObjs[i].cutoff = defaultCutoff;
+    lightObjs[i].exponent = defaultExponent;
+  }
+
+}
+
+void updateLights() {
+  glDisable(GL_LIGHTING);
+
+  for ( int i = 0; i < LIGHTS; i++ ) {
+    glDisable(GL_LIGHT0 + i);
+
+    glLightfv(GL_LIGHT0 + i, GL_POSITION, lightObjs[i].position);
+    glLightfv(GL_LIGHT0 + i, GL_AMBIENT, lightObjs[i].ambient);
+    glLightfv(GL_LIGHT0 + i, GL_DIFFUSE, lightObjs[i].diffuse);
+    glLightfv(GL_LIGHT0 + i, GL_SPECULAR, lightObjs[i].specular);
+    glLightfv(GL_LIGHT0 + i, GL_SPOT_DIRECTION, lightObjs[i].direction);
+
+    glLightf(GL_LIGHT0 + i, GL_SPOT_CUTOFF, lightObjs[i].cutoff);
+    glLighti(GL_LIGHT0 + i, GL_SPOT_EXPONENT, (int)lightObjs[i].exponent );
+
+    glEnable(GL_LIGHT0 + i);
+
+    // Draw light ball for light
+    glPushMatrix();
+      glColor3f(1.0, 1.0, 1.0);
+      glTranslatef(lightObjs[i].position[0], lightObjs[i].position[1], lightObjs[i].position[2]);
+      glutSolidSphere(lightBallSize, 20, 20);
+    glPopMatrix();
+
+  }
+
+  glEnable(GL_LIGHTING);
 }
\ No newline at end of file