Removed obsolete PLATFORM_MACOSX code

diff --git a/Source/Game.h b/Source/Game.h
index ca3f194a4d6dcee78700d47daf73729eab766145..f554d1ee05e7fc0bd737fbc414f909fe584a7bd4 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -22,20 +22,6 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "SDL.h"
 
-#if (defined(__APPLE__) && defined(__MACH__))
-#  ifdef PLATFORM_MACOSX
-#    error Do not define PLATFORM_MACOSX for new builds. It is for the old Carbonized build.
-#  endif
-#endif
-
-#ifdef PLATFORM_MACOSX
-#include <Carbon.h>
-#include "Quicktime.h"
-#endif
-
-//Jordan included glut.h
-//#include <glut.h>
-
 #include "TGALoader.h"
 
 #include "Terrain.h"
@@ -45,10 +31,8 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Lights.h"
 #include "Person.h"
 #include "Sprite.h"
-//#include <agl.h>
 #include "Text.h"
 #include "Objects.h"
-//#include <DrawSprocket.h>
 #include "Weapons.h"
 #include "binio.h"
 #include <fstream>

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 213d894243d88d8d036a758fe1382a938ee87a3f..6c8ac0abe05950020c30dacb385a5f8132374624 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -230,16 +230,6 @@ int Game::DrawGLScene(StereoSide side)
         if (winfreeze || mainmenu)
             drawmode = normalmode;
 
-#if PLATFORM_MACOSX
-        if (drawmode == glowmode) {
-            RGBColor color2;
-            color2.red = 0;
-            color2.green = 0;
-            color2.blue = 0;
-            DSpContext_FadeGamma(NULL, 200, &color2);
-        }
-#endif
-
         if (drawtoggle != 2)
             drawtoggle = 1 - drawtoggle;
 

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index b60f34da8fdf9dd301767e5301e0023df893bb2a..c7663322b195a7f016aa6670fe86b3a0f88a44d2 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -484,26 +484,6 @@ extern bool cmdline(const char *cmd);
 
 void Game::InitGame()
 {
-#if PLATFORM_MACOSX
-    ProcessSerialNumber PSN;
-    ProcessInfoRec pinfo;
-    FSSpec pspec;
-    OSStatus err;
-    /* set up process serial number */
-    PSN.highLongOfPSN = 0;
-    PSN.lowLongOfPSN = kCurrentProcess;
-    /* set up info block */
-    pinfo.processInfoLength = sizeof(pinfo);
-    pinfo.processName = NULL;
-    pinfo.processAppSpec = &pspec;
-    /* grab the vrefnum and directory */
-    err = GetProcessInformation(&PSN, &pinfo);
-    if (err == noErr) {
-        vRefNum = pspec.vRefNum;
-        dirID = pspec.parID;
-    }
-#endif
-
     LOGFUNC;
 
     numchallengelevels = 14;

diff --git a/Source/MacCompatibility.cpp b/Source/MacCompatibility.cpp
index 7d049058f71297a7de57fe463bffbedae3ff4465..7e06997d8cce9ce55074078dd9c184f117bcc66d 100644 (file)
--- a/Source/MacCompatibility.cpp
+++ b/Source/MacCompatibility.cpp
@@ -17,8 +17,6 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !PLATFORM_MACOSX
-
 /**> HEADER FILES <**/
 #include "MacCompatibility.h"
 
@@ -285,7 +283,3 @@ char* ConvertFileName( const char* orgfilename, const char *mode)
 
     return g_filename;
 }
-
-#endif
-
-

diff --git a/Source/MacCompatibility.h b/Source/MacCompatibility.h
index 1ce59d4858fa7c68d13b0dae9d08609dbee6dc7b..1bade1cf2d54939bf02537d906b1057e0eda5c12 100644 (file)
--- a/Source/MacCompatibility.h
+++ b/Source/MacCompatibility.h
@@ -20,8 +20,6 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef _MACCOMPATIBLITY_H_
 #define _MACCOMPATIBLITY_H_
 
-#if !PLATFORM_MACOSX
-
 #include <stdio.h>
 #include <float.h>
 #include <math.h>
@@ -108,6 +106,5 @@ char* ConvertFileName( const char* orgfilename, const char *mode = "rb" );
 #define fopen( a, b) fopen(ConvertFileName(a, b), b)
 
 #endif
-#endif
 
 

diff --git a/Source/Models.cpp b/Source/Models.cpp
index 0203689a260ffd5b51cbf0bbef51db5b26106cf3..20c30f7eba719626e22a2d7548f1a93ba155d37a 100644 (file)
--- a/Source/Models.cpp
+++ b/Source/Models.cpp
@@ -922,14 +922,7 @@ void Model::draw()
         glInterleavedArrays( GL_T2F_C3F_V3F, 8 * sizeof(GLfloat), &vArray[0]);
     textureptr.bind();
 
-#if PLATFORM_MACOSX
-    glLockArraysEXT( 0, TriangleNum * 3);
-#endif
     glDrawArrays(GL_TRIANGLES, 0, TriangleNum * 3);
-#if PLATFORM_MACOSX
-    glUnlockArraysEXT();
-#endif
-
 
     if (!color)
         glDisableClientState(GL_NORMAL_ARRAY);
@@ -937,7 +930,6 @@ void Model::draw()
         glDisableClientState(GL_COLOR_ARRAY);
     glDisableClientState(GL_VERTEX_ARRAY);
     glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-    //drawimmediate();
 }
 
 //TODO: phase out in favor of Texture

diff --git a/Source/Quaternions.h b/Source/Quaternions.h
index 499bc0da0bd0fcc85151395b1b0f90d59d48a7ea..e88546968196c860ffb86e7d0bc5464beaac9b95 100644 (file)
--- a/Source/Quaternions.h
+++ b/Source/Quaternions.h
@@ -240,25 +240,7 @@ inline void CrossProduct(XYZ P, XYZ Q, XYZ *V)
 
 inline float fast_sqrt (register float arg)
 {
-#if PLATFORM_MACOSX
-    // Can replace with slower return std::sqrt(arg);
-    register float result;
-
-    if (arg == 0.0)
-        return 0.0;
-
-    asm {
-        frsqrte     result, arg         // Calculate Square root
-    }
-
-    // Newton Rhapson iterations.
-    result = result + 0.5 * result * (1.0 - arg * result * result);
-    result = result + 0.5 * result * (1.0 - arg * result * result);
-
-    return result * arg;
-#else
-    return sqrtf( arg);
-#endif
+    return sqrtf(arg);
 }
 
 inline float normaldotproduct(XYZ point1, XYZ point2)

diff --git a/Source/TGALoader.cpp b/Source/TGALoader.cpp
index 748e8e3a6a43e84eb519ad7508ccbee972382c6c..c9796b528b34ba8cce8953c774c6e71feef16f08 100644 (file)
--- a/Source/TGALoader.cpp
+++ b/Source/TGALoader.cpp
@@ -34,104 +34,8 @@ bool upload_image(const unsigned char* filePath, bool hasalpha)
     if (visibleloading)
         Game::LoadingScreen();
 
-#if !PLATFORM_MACOSX
-
     // for Windows, just use TGA loader for now
     char fileName[256];
     CopyPascalStringToC( filePath, fileName);
     return (LoadImage(fileName, texture));
-
-#else
-
-    OSStatus err;
-    ComponentResult cr;
-
-    //Boolean isdir;
-    FSSpec fsspec;
-    err = FSMakeFSSpec (0, 0, filePath, &fsspec);
-    if (err)
-        return;
-
-    GraphicsImportComponent gi;
-    err = GetGraphicsImporterForFile(&fsspec, &gi);
-    if (err)
-        return;
-
-    Rect natbounds;
-    cr = GraphicsImportGetNaturalBounds(gi, &natbounds);
-
-    texture.sizeX = natbounds.right;
-    texture.sizeY = natbounds.bottom;
-    texture.bpp = 32;
-
-    GWorldPtr gw;
-    err = QTNewGWorldFromPtr(&gw, k32ARGBPixelFormat, &natbounds, NULL, NULL,
-                             0, texture.data, 4 * natbounds.right);
-    if (err)
-        return;
-
-    cr = GraphicsImportSetGWorld(gi, gw, NULL);
-
-    natbounds.top = natbounds.bottom;
-    natbounds.bottom = 0;
-
-    cr = GraphicsImportSetBoundsRect(gi, &natbounds);
-
-    cr = GraphicsImportDraw(gi);
-
-    err = CloseComponent(gi);
-    if (err)
-        return;
-
-    DisposeGWorld(gw);
-
-    // Loop Through The Image Data
-    GLuint imageSize; // Used To Store The Image Size When Setting Aside Ram
-    GLuint temp; // Temporary Variable
-    GLuint bytesPerPixel; // Temporary Variable
-    bytesPerPixel = texture.bpp / 8;
-    imageSize = texture.sizeX * texture.sizeY * bytesPerPixel;
-
-    for ( GLuint i = 0; i < int( imageSize ); i += 4 ) {
-        // Swaps The 1st And 3rd Bytes ('R'ed and 'B'lue)
-        temp = texture.data[i]; // Temporarily Store The Value At Image Data 'i'
-        texture.data[i] = texture.data[i + 1]; // Set The 1st Byte To The Value Of The 3rd Byte
-        texture.data[i + 1] = texture.data[i + 2]; // Set The 3rd Byte To The Value In 'temp' (1st Byte Value)
-        texture.data[i + 2] = texture.data[i + 3];
-        texture.data[i + 3] = temp;
-    }
-
-    if (!hasalpha) {
-        for ( GLuint i = 0; i < int( imageSize ); i += 4 ) {
-            texture.data[i + 3] = 255;
-        }
-    }
-
-    if (texdetail > 1) {
-        int which = 0;
-        float temp;
-        float howmany;
-        for ( GLuint k = 0; k < int( imageSize); k += bytesPerPixel * texture.sizeX * texdetail ) {
-            for ( GLuint i = 0; i < int( imageSize / texture.sizeY ); i += bytesPerPixel * texdetail ) {
-                for ( GLuint b = 0; b < bytesPerPixel ; b ++ ) {
-                    temp = 0;
-                    howmany = 0;
-                    for ( GLuint l = 0; l < texdetail * texture.sizeX ; l += texture.sizeX ) {
-                        for ( GLuint j = 0; j < texdetail ; j ++ ) {
-                            temp += (int)texture.data[k + i + j * bytesPerPixel + l * bytesPerPixel + b]; // Set The 1st Byte To The Value Of The 3rd Byte
-                            howmany++;
-                        }
-                    }
-                    texture.data[which + b] = GLubyte(temp / howmany);
-                }
-                which += bytesPerPixel;
-            }
-        }
-        texture.sizeX /= texdetail;
-        texture.sizeY /= texdetail;
-    }
-
-    return true;
-
-#endif
 }