Fixed all warnings related to use of deprecated OpenGL functions.

Author: johnb003

CMakeLists.txt

@@ -29,6 +29,7 @@ add_executable(SDLJumpStart
 	src/engine.cpp
 	src/font.cpp
 	src/main.cpp
+	src/math_stub.cpp
 )
 
 # Do you need C++11? Maybe just indicate the features you need like this

src/engine.cpp

@@ -3,6 +3,7 @@
 #include "AssertMsg.h"
 
 #include "sdl_gl.h"
+#include "math_stub.h"
 
 // #define _USE_MATH_DEFINES 1
 #include <math.h>
@@ -88,7 +89,8 @@ Engine::Engine() : font(NULL), sdl_gl_context(NULL), sdl_window(NULL)
 	glViewport(0, 0, clientW, clientH);
 	glMatrixMode( GL_PROJECTION );
 	glLoadIdentity( );
-	gluPerspective( 60.0, (float)clientW/(float)clientH, 0.00000000001, 1024.0 );
+
+	SetGLPerspectiveMat(60.0, (float)clientW/(float)clientH, 0.0001, 1024.0);
 
 	font = new FixedWidthBMPFont("images/font.bmp", 16);
 
@@ -156,7 +158,7 @@ void Engine::Draw()
 	glViewport(0, 0, clientW, clientH);
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
-	gluPerspective(60.0, (float)clientW/(float)clientH, 0.0001, 1024.0);
+	SetGLPerspectiveMat(60.0, (float)clientW/(float)clientH, 0.0001, 1024.0);
 
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();

src/math_stub.cpp

@@ -0,0 +1,38 @@
+#include "math_stub.h"
+#include "sdl_gl.h"
+
+#include <cmath>
+
+#define PI_OVER_360 (M_PI/360.0f)
+
+void BuildPerspProjMat(float *m, float fov, float aspect, float znear, float zfar)
+{
+    float f = 1.0f / tan(fov * PI_OVER_360);
+
+    m[0]  = f / aspect;
+    m[1]  = 0;
+    m[2]  = 0;
+    m[3]  = 0;
+
+    m[4]  = 0;
+    m[5]  = f;
+    m[6]  = 0;
+    m[7]  = 0;
+
+    m[8]  = 0;
+    m[9]  = 0;
+    m[10] = (zfar + znear) / (znear - zfar);
+    m[11] = -1;
+
+    m[12] = 0;
+    m[13] = 0;
+    m[14] = 2 * zfar * znear / (znear - zfar);
+    m[15] = 0;
+}
+
+void SetGLPerspectiveMat(float fov, float aspect, float znear, float zfar)
+{
+    float m[16];
+    BuildPerspProjMat(m, fov, aspect, znear, zfar);
+    glLoadMatrixf(m);
+}

src/math_stub.h

@@ -0,0 +1,16 @@
+#ifndef MATH_STUB_H
+#define MATH_STUB_H
+
+// Check out the math library I wrote: https://github.com/johnb003/mathing
+//
+// There's not much point in forcing a reference to a math library for this project, however a math
+// lib will inevitably be needed for any real work based on this.
+
+// Here are some basic implementations that can be replaced easily with a math lib.
+
+void BuildPerspProjMat(float *m, float fov, float aspect, float znear, float zfar);
+
+// direct alternative to gluPerspective
+void SetGLPerspectiveMat(float fov, float aspect, float znear, float zfar);
+
+#endif  // MATH_STUB_H

src/sdl_gl_texture.cpp

@@ -50,14 +50,15 @@ unsigned int LoadTexture(const char *filename, bool mipmapped)
 	{
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
-		gluBuild2DMipmaps(GL_TEXTURE_2D, intFmt, surface->w, surface->h, fmt, GL_UNSIGNED_BYTE, surface->pixels);
 	}
 	else
 	{
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		glTexImage2D(GL_TEXTURE_2D, 0, intFmt, surface->w, surface->h, 0, fmt, GL_UNSIGNED_BYTE, surface->pixels);		
 	}
+
+	glTexImage2D(GL_TEXTURE_2D, 0, intFmt, surface->w, surface->h, 0, fmt, GL_UNSIGNED_BYTE, surface->pixels);		
+	if (mipmapped) glGenerateMipmap(GL_TEXTURE_2D);
 
 	SDL_FreeSurface(surface);
 	return textureIndex;