Replaced deprecated gluLookAt()!

src/OpenRaider.cpp

@@ -91,7 +91,9 @@ void killOpenRaiderSingleton()
 	printf("Shutting down Game...\n");
 
 	// Requires public deconstructor
-	delete OpenRaider::Instance();
+    // Causes pointer-being-freed-not-allocated error!
+	//delete OpenRaider::Instance();
+#warning "We can't delete our Game Instance without a not-allocated-free error. Somethings fishy here."
 
 #ifdef DEBUG_MEMEORY
 	printf("\n[Mongoose MEMEORY_DEBUG]\nMemory leak table:\n");
@@ -3583,12 +3585,11 @@ void OpenRaider::handleCommand(char *cmd, unsigned int mode)
 
 int main(int argc, char *argv[])
 {
-	OpenRaider &game = *OpenRaider::Instance();
-
+	OpenRaider *game = OpenRaider::Instance();
 
 	atexit(killOpenRaiderSingleton);
 
-	game.start();
+	game->start();
 
 	return 0;
 }

src/Render.cpp

@@ -753,6 +753,52 @@ 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)
+{
+    float f[3];
+    // calculating the viewing vector
+    f[0] = lookAtX - eyeX;
+    f[1] = lookAtY - eyeY;
+    f[2] = lookAtZ - eyeZ;
+    float fMag, upMag;
+    fMag = sqrt(f[0]*f[0] + f[1]*f[1] + f[2]*f[2]);
+    upMag = sqrt(upX*upX + upY*upY + upZ*upZ);
+    // normalizing the viewing vector
+    if( fMag != 0)
+    {
+        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.
+    if( upMag != 0 )
+    {
+        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[]=
+    {
+        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
+    };
+    glMultMatrixf(M);
+    glTranslatef (-eyeX, -eyeY, -eyeZ);
+}
 
 void Render::Display()
 {
@@ -848,9 +894,9 @@ void Render::Display()
 	mCamera->getPosition(camPos);
 	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);
+	// 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.0, -1.0, 0.0);
 
 	// Update view volume for vising
 	updateViewVolume();