X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=cb4278dcca7ceb0e4d1dc88e816af63868e72618;hp=471555bb321d4399a43bbfada4c4fd53c4f6e6de;hb=98e1aa8665249d427fee1bedceec646bd16c35b6;hpb=cd6001f4abb00d08233ae487f922e2fc9ecdb67d

diff --git a/helper.c b/helper.c
index 471555b..cb4278d 100644
--- a/helper.c
+++ b/helper.c
@@ -210,64 +210,37 @@ int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSiz
  * Draw a floor by looping over the floorSize and squareSize variables
  */
 void drawFloor() {
-  if ( currentGroundTexture != 0 ) {
+  if ( currentGroundTexture == 0 ) {
+    getTexture(1);
+    glBindTexture(GL_TEXTURE_2D, 1);
+  } else {
     getTexture(currentGroundTexture);
     glBindTexture(GL_TEXTURE_2D, currentGroundTexture);
   }
 
 	glBegin(GL_QUADS);  
 
-
-  // **NOTE: Code under development to solve the texture-is-larger than square problem
-
-  int textureTileSize = 50;
-  int divisions = 2;
-
-  for ( int tx = -floorSize; tx <= floorSize; tx += textureTileSize ) {
-    for ( int tz = -floorSize; tz <= floorSize; tz += textureTileSize ) {
-      int subTileWidth = textureTileSize / divisions;
-      for ( int x = 0; x <= divisions * 2; x++ ) {
-        for ( int z = 0; z <= divisions * 2; z++ ) {
-          glColor3f( 1.0, 1.0, 1.0 );
-
-          printf("Creating a subtile.\n");
-          printf("Texture box is: (%d, %d), (%d, %d), (%d, %d), (%d, %d)\n",tx+textureTileSize, tz+textureTileSize,tx+textureTileSize, tz,tx, tz, tx, tz+textureTileSize );
-          printf("Polygon box is: (%d, %d), (%d, %d), (%d, %d), (%d, %d)\n",(x+1)*subTileWidth+tx, (z+1)*subTileWidth+tz ,(x+1)*subTileWidth+tx, z*subTileWidth+tz, x*subTileWidth+tx, z*subTileWidth+tz, x*subTileWidth+tx, (z+1)*subTileWidth+tz);
-
-          glTexCoord2f( tx+textureTileSize, tz+textureTileSize );
-          glVertex3f  ( (x+1)*subTileWidth+tx, 0.0, (z+1)*subTileWidth+tz );
-
-          glTexCoord2f( tx+textureTileSize, tz );
-          glVertex3f  ( (x+1)*subTileWidth+tx, 0.0,     z*subTileWidth+tz );
-
-          glTexCoord2f( tx, tz );
-          glVertex3f  (     x*subTileWidth+tx, 0.0,     z*subTileWidth+tz );
-
-          glTexCoord2f( tx, tz+textureTileSize );
-          glVertex3f  (     x*subTileWidth+tx, 0.0, (z+1)*subTileWidth+tz );
-        }
-      }
-    }
-  }
-
-/*
     for ( int x = -floorSize; x < floorSize; x++ ) {
       for ( int z = -floorSize; z < floorSize; z++ ) {
         glColor3f( 1.0, 1.0, 1.0 );
-        
+
+        glNormal3i( 1, 1, 0 );
         glTexCoord2f( 1.0, 1.0 );
         glVertex3f  ( (x+1)*squareSize, 0.0, (z+1)*squareSize );
 
+        glNormal3i( 1, 1, 0 );
         glTexCoord2f( 1.0, 0.0 );
         glVertex3f  ( (x+1)*squareSize, 0.0,     z*squareSize );
 
+        glNormal3i( 1, 1, 0 );
         glTexCoord2f( 0.0, 0.0 );
         glVertex3f  (     x*squareSize, 0.0,     z*squareSize );
 
+        glNormal3i( 1, 1, 0 );
         glTexCoord2f( 0.0, 1.0 );
         glVertex3f  (     x*squareSize, 0.0, (z+1)*squareSize );
       }
-    }*/
+    }
 
 	glEnd();
 
@@ -318,4 +291,97 @@ void drawAxisLines() {
   glDisable(GL_BLEND);
   glEnable(GL_LIGHTING);
   glEnable(GL_TEXTURE_2D);
+}
+
+int addSceneObject(int id) {
+  // **NOTE: Currently only adds the teapot
+
+  curObject = nObjects;
+
+  sceneObjs[nObjects].mesh = -1; // Teapot is -1 mesh
+  sceneObjs[nObjects].texture.id = -1; // No texture
+  sceneObjs[nObjects].texture.scale = 1;
+  sceneObjs[nObjects].x = 0;
+  sceneObjs[nObjects].y = 0;
+  sceneObjs[nObjects].z = 0;
+
+  sceneObjs[nObjects].scale[0] = 1;
+  sceneObjs[nObjects].scale[1] = 1;
+  sceneObjs[nObjects].scale[2] = 1;
+
+  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,  lightObjs[i].exponent  );
+
+    glEnable ( GL_LIGHT0 + i );
+
+    // Draw light ball for light
+    glPushMatrix();
+      glColor3f(0.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);
+}
+
+/**
+ * Sets variables to the state they are in to begin with.
+ */
+void initializeState() {
+  /* Initial light 0 position. */
+  lightObjs[0].position[0] = 4;
+  lightObjs[0].position[1] = 5;
+  lightObjs[0].position[2] = 6;
+  lightObjs[0].position[3] = 0.0;
+
+  /* Initial light 1 position. */
+  lightObjs[1].position[0] = -4;
+  lightObjs[1].position[1] = 5;
+  lightObjs[1].position[2] = -6;
+  lightObjs[1].position[3] = 0.0;
+
+  /* Initial floor texture */
+  // **NOTE: Commented out while testing lighting
+  //currentGroundTexture = 5;
 }
\ No newline at end of file