removed glu includes

src/Console.cpp

@@ -7,10 +7,8 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#include <GL/glu.h>
 #endif
 
 #include "config.h"

src/Emitter.cpp

@@ -11,10 +11,8 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#include <GL/glu.h>
 #endif
 
 #include "Emitter.h"

src/Game.cpp

@@ -7,10 +7,8 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#include <GL/glu.h>
 #endif
 
 #include <algorithm>

src/Menu.cpp

@@ -7,10 +7,8 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#include <GL/glu.h>
 #endif
 
 #include "config.h"

src/Render.cpp

@@ -10,10 +10,8 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#include <GL/glu.h>
 #endif
 
 #include <stdlib.h>
@@ -439,43 +437,44 @@ void Render::setMode(int n)
 
 // Replaced the deprecated gluLookAt with slightly modified code from here:
 // http://www.khronos.org/message_boards/showthread.php/4991
-void CrossProd(float x1, float y1, float z1, float x2, float y2, float z2, float res[3])
-{
-    res[0] = y1*z2 - y2*z1;
-    res[1] = x2*z1 - x1*z2;
-    res[2] = x1*y2 - x2*y1;
-}
-void deprecated_gluLookAt(float eyeX, float eyeY, float eyeZ, float lookAtX, float lookAtY, float lookAtZ, float upX, float upY, float upZ)
-{
+void gluLookAt(float eyeX, float eyeY, float eyeZ,
+                            float lookAtX, float lookAtY, float lookAtZ,
+                            float upX, float upY, float upZ) {
     float f[3];
+
     // calculating the viewing vector
     f[0] = lookAtX - eyeX;
     f[1] = lookAtY - eyeY;
     f[2] = lookAtZ - eyeZ;
     float fMag, upMag;
-    fMag = sqrtf(f[0]*f[0] + f[1]*f[1] + f[2]*f[2]);
-    upMag = sqrtf(upX*upX + upY*upY + upZ*upZ);
+    fMag = sqrtf(f[0] * f[0] + f[1] * f[1] + f[2] * f[2]);
+    upMag = sqrtf(upX * upX + upY * upY + upZ * upZ);
+
     // normalizing the viewing vector
-    f[0] = f[0]/fMag;
-    f[1] = f[1]/fMag;
-    f[2] = f[2]/fMag;
-    // normalising the up vector. no need for this here if you have your
-    // up vector already normalised, which is mostly the case.
-    upX = upX/upMag;
-    upY = upY/upMag;
-    upZ = upZ/upMag;
-    float s[3], u[3];
-    CrossProd(f[0], f[1], f[2], upX, upY, upZ, s);
-    CrossProd(s[0], s[1], s[2], f[0], f[1], f[2], u);
-    float M[]=
-    {
+    f[0] = f[0] / fMag;
+    f[1] = f[1] / fMag;
+    f[2] = f[2] / fMag;
+
+    float s[3] = {
+        f[1] * upZ - upY * f[2],
+        upX * f[2] - f[0] * upZ,
+        f[0] * upY - upX * f[1]
+    };
+
+    float u[3] = {
+        s[1] * f[2] - f[1] * s[2],
+        f[0] * s[2] - s[0] * f[2],
+        s[0] * f[1] - f[0] * s[1]
+    };
+
+    float m[16] = {
         s[0], u[0], -f[0], 0,
         s[1], u[1], -f[1], 0,
         s[2], u[2], -f[2], 0,
-        0, 0, 0, 1
+           0,    0,     0, 1
     };
-    glMultMatrixf(M);
-    glTranslatef (-eyeX, -eyeY, -eyeZ);
+    glMultMatrixf(m);
+    glTranslatef(-eyeX, -eyeY, -eyeZ);
 }
 
 void Render::Display()
@@ -566,9 +565,8 @@ void Render::Display()
     gOpenRaider->mGame->mCamera->getPosition(camPos);
     gOpenRaider->mGame->mCamera->getTarget(atPos);
     // Mongoose 2002.08.13, Quick fix to render OpenRaider upside down
-    // gluLookAt(camPos[0], camPos[1], camPos[2], atPos[0], atPos[1], atPos[2], 0.0, -1.0, 0.0);
 
-    deprecated_gluLookAt(camPos[0], camPos[1], camPos[2], atPos[0], atPos[1], atPos[2], 0.0f, -1.0f, 0.0f);
+    gluLookAt(camPos[0], camPos[1], camPos[2], atPos[0], atPos[1], atPos[2], 0.0f, -1.0f, 0.0f);
 
     // Update view volume for vising
     updateViewVolume();

src/Texture.cpp

@@ -14,10 +14,8 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#include <GL/glu.h>
 #endif
 
 #include "utils/tga.h"
@@ -189,14 +187,6 @@ void convertARGB32bppToRGBA32bpp(unsigned char *image,
     }
 }
 
-// http://mmmovania.blogspot.de/2011/01/opengl-30-and-above-deprecated-func-and.html
-// http://www.g-truc.net/post-0256.html
-GLint deprecated_gluBuild2DMipmaps(GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data) {
-    glTexParameteri(target, GL_GENERATE_MIPMAP, GL_TRUE);
-    glTexImage2D(target, 0, internalFormat, width, height, 0, format, type, data);
-    return 0;
-}
-
 int Texture::loadBufferSlot(unsigned char *image,
         unsigned int width, unsigned int height,
         ColorMode mode, unsigned int bpp,
@@ -267,9 +257,8 @@ int Texture::loadBufferSlot(unsigned char *image,
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
                 GL_LINEAR_MIPMAP_LINEAR);
 
-        //gluBuild2DMipmaps(GL_TEXTURE_2D, bytes, width, height, glcMode, GL_UNSIGNED_BYTE, image);
-        // gluBuild2DMipmaps is deprecated. Replacement by xythobuz
-        deprecated_gluBuild2DMipmaps(GL_TEXTURE_2D, bytes, width, height, glcMode, GL_UNSIGNED_BYTE, image);
+        glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+        glTexImage2D(GL_TEXTURE_2D, 0, bytes, width, height, 0, glcMode, GL_UNSIGNED_BYTE, image);
     } else {
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 

src/Window.cpp

@@ -12,10 +12,8 @@
 
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#include <GL/glu.h>
 #endif
 
 #include "math/math.h"