From: Ash Tyndall <git@atyndall.net>
Date: Fri, 21 Oct 2011 09:14:46 +0000 (+0800)
Subject: Added ground textures support and tried more lighting experimentation.
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=a5f759089021e80d8f2ab1d37e359843f7ca5c52;p=atyndall%2Fcits2231.git

Added ground textures support and tried more lighting experimentation.
---

diff --git a/helper.c b/helper.c
index abdc56e..ea80294 100644
--- a/helper.c
+++ b/helper.c
@@ -220,40 +220,6 @@ void drawFloor() {
 
 	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 );
diff --git a/scene.c b/scene.c
index 641be1a..a638c49 100644
--- a/scene.c
+++ b/scene.c
@@ -407,26 +407,14 @@ void init() {
   glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);
   glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0);
 
- // 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, 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);
 
-  //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);
@@ -463,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);