fixes #34, + typos + comments + formatting

Author: Calvin1602

common/texture.cpp

@@ -21,7 +21,11 @@ GLuint loadBMP_custom(const char * imagepath){
 
 	// Open the file
 	FILE * file = fopen(imagepath,"rb");
-	if (!file)							    {printf("%s could not be opened. Are you in the right directory ? Don't forget to read the FAQ !\n", imagepath); getchar(); return 0;}
+	if (!file){
+		printf("%s could not be opened. Are you in the right directory ? Don't forget to read the FAQ !\n", imagepath);
+		getchar();
+		return 0;
+	}
 
 	// Read the header, i.e. the 54 first bytes
 
@@ -57,7 +61,7 @@ GLuint loadBMP_custom(const char * imagepath){
 	// Read the actual data from the file into the buffer
 	fread(data,1,imageSize,file);
 
-	// Everything is in memory now, the file wan be closed
+	// Everything is in memory now, the file can be closed.
 	fclose (file);
 
 	// Create one OpenGL texture
@@ -72,17 +76,17 @@ GLuint loadBMP_custom(const char * imagepath){
 
 	// OpenGL has now copied the data. Free our own version
 	delete [] data;
-	fclose(file);
 
 	// Poor filtering, or ...
 	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); 
 
-	// ... nice trilinear filtering.
+	// ... nice trilinear filtering ...
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); 
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+	// ... which requires mipmaps. Generate them automatically.
 	glGenerateMipmap(GL_TEXTURE_2D);
 
 	// Return the ID of the texture we just created