README.MACOSX.txt rts/System/Platform/Mac/BackgroundReader.mm rts/System/Platform/Mac/SDLMain.h rts/System/Platform/Mac/SDLMain.m rts/System/Platform/Mac/UserDefsHandler.h rts/System/Platform/Mac/UserDefsHandler.mm rts/build/xcode/IncludeLinks/AL rts/build/xcode/IncludeLinks/GL rts/build/xcode/Info-SpringRTS.plist rts/build/xcode/README.MACOSX.txt rts/build/xcode/README.SRCFILES.txt rts/build/xcode/SpringRTS.xcodeproj/Krysole.mode1 rts/build/xcode/SpringRTS.xcodeproj/Krysole.pbxuser rts/build/xcode/SpringRTS.xcodeproj/project.pbxproj rts/build/xcode/SpringRTS_Prefix.pch @@ -123,6 +123,8 @@ void CGroupHandler::FindDlls(void) fs::path dir("aidll",fs::native); #ifdef _WIN32 match = find_files(dir,"*.dll"); +#elif defined(__APPLE__) + match = find_files(dir,"*.dylib"); #else match = find_files(dir,"*.so"); #endif rts/ExternalAI/GroupHandler.cpp @@ -20,6 +20,8 @@ public: { #ifdef WIN32 std::vector<std::string> f=CFileHandler::FindFiles("aidll\\globalai\\*.dll"); +#elif defined(__APPLE__) + std::vector<std::string> f=CFileHandler::FindFiles("aidll/globalai/*.dylib"); #else std::vector<std::string> f=CFileHandler::FindFiles("aidll/globalai/*.so"); #endif rts/Game/StartScripts/GlobalAITestScript.cpp @@ -29,6 +29,8 @@ public: #include "FBO.h" #ifdef _WIN32 #include "WinPBuffer.h" +#elif defined(__APPLE__) +// No native apple PBuffer support yet...just stick with the FBOs for now. #else #include "GLXPBuffer.h" #endif @@ -44,6 +46,8 @@ static inline IFramebuffer* instantiate_fb(const int shadowMapSize) info->AddLine("Using WGLEW_ARB_pbuffer"); return new WinPBuffer(shadowMapSize); } +#elif defined(__APPLE__) + // No native apple PBuffer support yet...just stick with the FBOs for now. #else else if (GLX_SGIX_pbuffer) { info->AddLine("Using GLX_SGIX_pbuffer"); rts/Rendering/GL/IFramebuffer.h @@ -191,7 +191,7 @@ using namespace nv_dds; /////////////////////////////////////////////////////////////////////////////// // static function pointers for uploading 3D textures and compressed 1D, 2D // and 3D textures. -#ifndef MACOS +#ifndef __APPLE__ PFNGLTEXIMAGE3DEXTPROC CDDSImage::glTexImage3D = NULL; PFNGLCOMPRESSEDTEXIMAGE1DARBPROC CDDSImage::glCompressedTexImage1DARB = NULL; PFNGLCOMPRESSEDTEXIMAGE2DARBPROC CDDSImage::glCompressedTexImage2DARB = NULL; rts/Rendering/Textures/nv_dds.cpp @@ -12,14 +12,14 @@ #include <deque> #include <assert.h> -/*#if defined(MACOS) +#include "Rendering/GL/myGL.h" +#if defined(__APPLE__) #include <OpenGL/gl.h> #include <OpenGL/glext.h> -#else*/ -#include "Rendering/GL/myGL.h" -//#include <GL/gl.h> -//#include <GL/glext.h> -//#endif +#else +#include <GL/gl.h> +#include <GL/glext.h> +#endif namespace nv_dds { @@ -336,7 +336,7 @@ namespace nv_dds std::deque<CTexture> m_images; -#ifndef MACOS +#ifndef __APPLE__ static PFNGLTEXIMAGE3DEXTPROC glTexImage3D; static PFNGLCOMPRESSEDTEXIMAGE1DARBPROC glCompressedTexImage1DARB; static PFNGLCOMPRESSEDTEXIMAGE2DARBPROC glCompressedTexImage2DARB; rts/Rendering/Textures/nv_dds.h @@ -1,575 +1,575 @@ - -#include "StdAfx.h" -#include "Rendering/GL/myGL.h" -#include <GL/glu.h> // Header File For The GLu32 Library -#include <time.h> -#include <string> -#include <algorithm> -#include <math.h> -#include "Game/PreGame.h" -#include "Game/Game.h" -#include <float.h> -#include "Rendering/glFont.h" -#include "Rendering/Textures/TAPalette.h" -#include "Game/UI/MouseHandler.h" -#include "Platform/ConfigHandler.h" -#include "Game/UI/InfoConsole.h" -#include "Game/GameSetup.h" -#include "Game/CameraController.h" -#include "Net.h" -#include "FileSystem/ArchiveScanner.h" -#include "FileSystem/VFSHandler.h" -#include "Platform/BaseCmd.h" -#include "Game/GameVersion.h" -#include "Platform/errorhandler.h" -#include "creg/creg.h" -#include "bitops.h" -#ifndef NO_LUA -#include "Script/LuaBinder.h" -#endif -#include <SDL.h> -#include <SDL_main.h> -#include "mmgr.h" -#include "Game/UI/NewGuiDefine.h" -#ifdef NEW_GUI -#include "Game/UI/GUI/GUIcontroller.h" -#endif - -#ifdef _WIN32 -#include "CrashRpt.h" -#include "Platform/Win/win32.h" -#include <winreg.h> -#include <direct.h> -#include <SDL_syswm.h> -#endif - -CGameController* activeController=0; -bool globalQuit = false; -Uint8 *keys; // Uint8[SDLK_LAST] -bool fullscreen; - -#define XRES_DEFAULT 1024 -#define YRES_DEFAULT 768 - -class SpringApp -{ -public: - SpringApp (); - ~SpringApp (); - - int Run(int argc, char *argv[]); - -protected: - bool Initialize (); - void CheckCmdLineFile (int argc,char *argv[]); - bool ParseCmdLine(); - void InitVFS (); - void CreateGameSetup (); - bool InitWindow (const char* title); - void InitOpenGL (); - bool SetSDLVideoMode(); - void Shutdown (); - int Draw (); - void UpdateSDLKeys (); - - BaseCmd *cmdline; - string demofile,startscript; - int screenWidth, screenHeight; - int screenFreq; - - bool active; - bool FSAA; -}; - -SpringApp::SpringApp () -{ - cmdline = 0; - screenWidth = screenHeight = 0; - screenFreq = 0; - keys = 0; - - active = true; - fullscreen = true; - FSAA = false; -} - -SpringApp::~SpringApp() -{ - if (cmdline) delete cmdline; - if (keys) delete[] keys; - - creg::ClassBinder::FreeClasses (); -} - - -#ifdef _WIN32 -// Called when spring crashes -bool crashCallback(void* crState) -{ - info->AddLine("Spring has crashed"); - - // Since we are going down, it's ok to delete the info console (it can't be mailed otherwise) - delete info; - bool wasRecording = false; - if (net->recordDemo) { - delete net->recordDemo; - wasRecording = true; - } - - AddFile("infolog.txt", "Spring information log"); - AddFile("test.sdf", "Spring game demo"); - - if (wasRecording) - AddFile(net->demoName.c_str(), "Spring game demo"); - - return true; -} -#endif - -bool SpringApp::Initialize () -{ - ParseCmdLine (); - -#ifdef WIN32 - // Initialize crash reporting - Install( (LPGETLOGFILE) crashCallback, "taspringcrash@clan-sy.com", "TA Spring Crashreport"); -#endif - - // Initialize class system - creg::ClassBinder::InitializeClasses (); - -#ifndef NO_LUA - // Initialize lua bindings - CLuaBinder lua; - if (!lua.LoadScript("testscript.lua")) - handleerror(NULL, lua.lastError.c_str(), "lua",MBF_OK|MBF_EXCL); -#endif - - InitVFS (); - - if (!InitWindow ("RtsSpring")) - { - SDL_Quit (); - return false; - } - // Global structures - ENTER_SYNCED; - gs=new CGlobalSyncedStuff(); - ENTER_UNSYNCED; - gu=new CGlobalUnsyncedStuff(); - - InitOpenGL(); - - palette.Init(); - - // Initialize keyboard - SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); - SDL_SetModState (KMOD_NONE); - - keys = new Uint8[SDLK_LAST]; - memset (keys,0,sizeof(Uint8)*SDLK_LAST); - - // Initialize font - font = new CglFont(32,223); - LoadExtensions(); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - SDL_GL_SwapBuffers(); - - CreateGameSetup (); - - return true; -} - - -static bool MultisampleTest(void) -{ - if (!GL_ARB_multisample) - return false; - GLuint fsaa = configHandler.GetInt("FSAA",0); - if (!fsaa) - return false; - SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS,1); - GLuint fsaalevel = min(configHandler.GetInt("FSAALevel",2),(unsigned int)8); - - make_even_number(fsaalevel); - - SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES,fsaalevel); - return true; -} - -static bool MultisampleVerify(void) -{ - GLint buffers, samples; - glGetIntegerv(GL_SAMPLE_BUFFERS_ARB, &buffers); - glGetIntegerv(GL_SAMPLES_ARB, &samples); - if (buffers && samples) { -#ifdef DEBUG - char t[22]; - SNPRINTF(t,22, "FSAA level %d enabled",samples); - handleerror(0,t,"SDL_GL",MBF_OK|MBF_INFO); -#endif - return true; - } - return false; -} - - -bool SpringApp::InitWindow (const char* title) -{ - if ((SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) == -1)) { - handleerror(NULL,"Could not initialize SDL.","ERROR",MBF_OK|MBF_EXCL); - return false; - } - - // Sets window manager properties - SDL_WM_SetIcon(SDL_LoadBMP("spring.bmp"),NULL); - SDL_WM_SetCaption(title, title); - - SetSDLVideoMode (); - return true; -} - -bool SpringApp::SetSDLVideoMode () -{ - int sdlflags = SDL_OPENGL | SDL_RESIZABLE; - - conditionally_set_flag(sdlflags, SDL_FULLSCREEN, fullscreen); - - SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5); - SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5); - SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5); -#ifdef __APPLE__ - SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 32); -#else - SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16); -#endif - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER,1); - - FSAA = MultisampleTest(); - - SDL_Surface *screen = SDL_SetVideoMode(screenWidth,screenHeight,0,sdlflags); - if (!screen) { - handleerror(NULL,"Could not set video mode","ERROR",MBF_OK|MBF_EXCL); - return false; - } - if (FSAA) - FSAA = MultisampleVerify(); - - return true; -} - - -void SpringApp::InitOpenGL () -{ - // Setup viewport - glViewport (0, 0, screenWidth, screenHeight); - gluPerspective(45.0f,(GLfloat)screenWidth/(GLfloat)screenHeight,2.8f,MAX_VIEW_RANGE); - - // Initialize some GL states - glShadeModel(GL_SMOOTH); - glClearDepth(1.0f); - glEnable(GL_DEPTH_TEST); - glDepthFunc(GL_LEQUAL); - - gu->screenx = screenWidth; - gu->screeny = screenHeight; -} - - -// Initialize the virtual file system -void SpringApp::InitVFS() -{ - // Create the archive scanner and vfs handler - archiveScanner = new CArchiveScanner(); - archiveScanner->ReadCacheData(); - archiveScanner->Scan("./maps"); - archiveScanner->Scan("./base"); - archiveScanner->Scan("./mods"); - archiveScanner->WriteCacheData(); - hpiHandler = new CVFSHandler(); -} - - -bool SpringApp::ParseCmdLine() -{ - cmdline->addoption('f',"fullscreen",OPTPARM_NONE,"","Run in fullscreen mode"); - cmdline->addoption('w',"window",OPTPARM_NONE,"","Run in windowed mode"); - cmdline->addoption('s',"server",OPTPARM_NONE,"","Run as a server"); - cmdline->addoption('c',"client",OPTPARM_NONE,"","Run as a client"); -// cmdline->addoption('g',"runscript",OPTPARM_STRING,"script.txt", "Run with a game setup script"); - cmdline->parse(); - -#ifdef _DEBUG - fullscreen = false; -#else - fullscreen = configHandler.GetInt("Fullscreen",1)!=0; -#endif - Uint8 scrollWheelSpeed = configHandler.GetInt("ScrollWheelSpeed",25); - - if (cmdline->result("help")) { - cmdline->usage("TA:Spring",VERSION_STRING); - return false; - } else if (cmdline->result("version")) { - std::cout << "TA:Spring " << VERSION_STRING << std::endl; - return false; - } else if (cmdline->result("window")) - fullscreen = false; - else if (cmdline->result("fullscreen")) - fullscreen = true; - - screenWidth = configHandler.GetInt("XResolution",XRES_DEFAULT); - screenHeight = configHandler.GetInt("YResolution",YRES_DEFAULT); - screenFreq = configHandler.GetInt("DisplayFrequency",0); - - return true; -} - -// See if a demo SDF file or a startscript is specified on the command line -void SpringApp::CheckCmdLineFile(int argc, char *argv[]) -{ - // Check if the commandline parameter is specifying a demo file -#ifdef _WIN32 - // find the correct dir - const char *arg0=argv[0]; - int a,s = strlen(arg0); - for (a=s-1;a>0;a--) - if (arg0[a] == '\\') break; - if (a > 0) { - string path(arg0, arg0+a); - if (path.at(0) == '"') - path.append(1,'"'); - _chdir(path.c_str()); - } -#endif - - for (int i = 1; i < argc; i++) { - if (argv[i][0] != '-') { - string command(argv[i]); - int idx = command.rfind("sdf"); - if (idx == command.size()-3) { - demofile = command; - } else { - startscript = command; - } - } - } -} - -void SpringApp::CreateGameSetup () -{ - ENTER_SYNCED; - if (!startscript.empty()) { - gameSetup=new CGameSetup(); - if(!gameSetup->Init(startscript)){ - delete gameSetup; - gameSetup=0; - } - } - - ENTER_MIXED; - - bool server = true; - if (!demofile.empty()) - server = false; - else if(gameSetup) - server=gameSetup->myPlayer-gameSetup->numDemoPlayers == 0; - else - server=!cmdline->result("client") || cmdline->result("server"); - - if (!demofile.empty()) - pregame = new CPreGame(false, demofile); - else - pregame = new CPreGame(server, ""); -} - -int SpringApp::Draw () -{ - if (FSAA) - glEnable(GL_MULTISAMPLE_ARB); - - int ret = 1; - if(activeController) { - if(activeController->Update()==0) ret = 0; - else ret = activeController->Draw(); - } - - SDL_GL_SwapBuffers(); - if (FSAA) - glDisable(GL_MULTISAMPLE_ARB); - - return ret; -} - -void SpringApp::UpdateSDLKeys () -{ - int numkeys; - Uint8 *state; - state = SDL_GetKeyState(&numkeys); - memcpy(keys, state, sizeof(Uint8) * numkeys); - - SDLMod mods = SDL_GetModState(); - keys[SDLK_LSHIFT] = mods&KMOD_SHIFT?1:0; - keys[SDLK_LCTRL] = mods&KMOD_CTRL?1:0; - keys[SDLK_LALT] = mods&KMOD_ALT?1:0; - keys[SDLK_LMETA] = mods&KMOD_META?1:0; -} - - -int SpringApp::Run (int argc, char *argv[]) -{ - INIT_SYNCIFY; - CheckCmdLineFile (argc, argv); - cmdline = BaseCmd::initialize(argc,argv); - - if (!Initialize ()) - return -1; - -#ifdef WIN32 - SDL_EventState (SDL_SYSWMEVENT, SDL_ENABLE); -#endif - - SDL_Event event; - bool done=false; - - Uint8 scrollWheelSpeed = configHandler.GetInt("ScrollWheelSpeed",25); - - while (!done) { - ENTER_UNSYNCED; - while (SDL_PollEvent(&event)) { - switch (event.type) { - case SDL_VIDEORESIZE: - screenWidth = event.resize.w; - screenHeight = event.resize.h; - InitOpenGL(); - break; - case SDL_QUIT: - done = true; - break; - case SDL_MOUSEMOTION: - if(mouse) - mouse->MouseMove(event.motion.x,event.motion.y); - break; - case SDL_MOUSEBUTTONDOWN: - if (mouse) { - if (event.button.button == SDL_BUTTON_WHEELUP) - mouse->currentCamController->MouseWheelMove(scrollWheelSpeed); - else if (event.button.button == SDL_BUTTON_WHEELDOWN) - mouse->currentCamController->MouseWheelMove(-scrollWheelSpeed); - else - mouse->MousePress(event.button.x,event.button.y,event.button.button); - } - break; - case SDL_MOUSEBUTTONUP: - if (mouse) - mouse->MouseRelease(event.button.x,event.button.y,event.button.button); - break; - case SDL_KEYDOWN: - { - int i = event.key.keysym.sym; - - UpdateSDLKeys (); - - if(activeController) { - activeController->KeyPressed(i,1); -#ifndef NEW_GUI - if(activeController->userWriting){ - i = event.key.keysym.unicode; - if (i >= SDLK_SPACE && i <= SDLK_DELETE) - if(activeController->ignoreNextChar || activeController->ignoreChar==char(i)) - activeController->ignoreNextChar=false; - else - activeController->userInput+=char(i); - } -#endif - } -#ifdef NEW_GUI - i = event.key.keysym.unicode; - if (i > SDLK_FIRST && i <= SDLK_DELETE) /* HACK */ - GUIcontroller::Character(char(i)); -#endif - break; - } - case SDL_KEYUP: - { - int i = event.key.keysym.sym; - - UpdateSDLKeys(); - - if (activeController) - activeController->KeyReleased(i); - break; - } -#ifdef WIN32 - case SDL_SYSWMEVENT: - { - SDL_SysWMmsg *msg = event.syswm.msg; - if (msg->msg == 0x020B) { // WM_XBUTTONDOWN, beats me why it isn't defined by default - if (msg->wParam & 0x20) // MK_XBUTTON1 - mouse->MousePress (LOWORD(msg->lParam),HIWORD(msg->lParam), 4); - if (msg->wParam & 0x40) // MK_XBUTTON2 - mouse->MousePress (LOWORD(msg->lParam),HIWORD(msg->lParam), 5); - } - break; - } -#endif - } - } - int ret = Draw(); - if (globalQuit || (active && !ret)) - done=true; - } - ENTER_MIXED; - - // Shutdown - Shutdown(); - return 0; -} - -void SpringApp::Shutdown() -{ - if (pregame) - delete pregame; //in case we exit during init - if (game) - delete game; - if (gameSetup) - delete gameSetup; - delete font; - ConfigHandler::Deallocate(); - UnloadExtensions(); -#ifndef DEBUG - SDL_WM_GrabInput(SDL_GRAB_OFF); -#endif - SDL_Quit(); - delete gs; - delete gu; - END_SYNCIFY; -#ifdef USE_MMGR - m_dumpMemoryReport(); -#endif -} - -// Application entry point - -#ifdef WIN32 /* SDL_main can't use envp in the main function */ -int main( int argc, char *argv[] ) -#else -int main( int argc, char *argv[ ], char *envp[ ] ) -#endif -{ -#ifndef _WIN32 - chdir(SPRING_DATADIR); -#endif - -// It's nice to be able to disable catching when you're debugging -#ifndef NO_CATCH_EXCEPTIONS - try { - SpringApp app; - return app.Run (argc,argv); - } catch (const std::exception& e) { - handleerror(NULL, e.what(), "Fatal Error", MBF_OK | MBF_EXCL); - return 1; - } -#else - return app.Run (argv, argv); -#endif -} + +#include "StdAfx.h" +#include "Rendering/GL/myGL.h" +#include <GL/glu.h> // Header File For The GLu32 Library +#include <time.h> +#include <string> +#include <algorithm> +#include <math.h> +#include "Game/PreGame.h" +#include "Game/Game.h" +#include <float.h> +#include "Rendering/glFont.h" +#include "Rendering/Textures/TAPalette.h" +#include "Game/UI/MouseHandler.h" +#include "Platform/ConfigHandler.h" +#include "Game/UI/InfoConsole.h" +#include "Game/GameSetup.h" +#include "Game/CameraController.h" +#include "Net.h" +#include "FileSystem/ArchiveScanner.h" +#include "FileSystem/VFSHandler.h" +#include "Platform/BaseCmd.h" +#include "Game/GameVersion.h" +#include "Platform/errorhandler.h" +#include "creg/creg.h" +#include "bitops.h" +#ifndef NO_LUA +#include "Script/LuaBinder.h" +#endif +#include <SDL.h> +#include <SDL_main.h> +#include "mmgr.h" +#include "Game/UI/NewGuiDefine.h" +#ifdef NEW_GUI +#include "Game/UI/GUI/GUIcontroller.h" +#endif + +#ifdef _WIN32 +#include "CrashRpt.h" +#include "Platform/Win/win32.h" +#include <winreg.h> +#include <direct.h> +#include <SDL_syswm.h> +#endif + +CGameController* activeController=0; +bool globalQuit = false; +Uint8 *keys; // Uint8[SDLK_LAST] +bool fullscreen; + +#define XRES_DEFAULT 1024 +#define YRES_DEFAULT 768 + +class SpringApp +{ +public: + SpringApp (); + ~SpringApp (); + + int Run(int argc, char *argv[]); + +protected: + bool Initialize (); + void CheckCmdLineFile (int argc,char *argv[]); + bool ParseCmdLine(); + void InitVFS (); + void CreateGameSetup (); + bool InitWindow (const char* title); + void InitOpenGL (); + bool SetSDLVideoMode(); + void Shutdown (); + int Draw (); + void UpdateSDLKeys (); + + BaseCmd *cmdline; + string demofile,startscript; + int screenWidth, screenHeight; + int screenFreq; + + bool active; + bool FSAA; +}; + +SpringApp::SpringApp () +{ + cmdline = 0; + screenWidth = screenHeight = 0; + screenFreq = 0; + keys = 0; + + active = true; + fullscreen = true; + FSAA = false; +} + +SpringApp::~SpringApp() +{ + if (cmdline) delete cmdline; + if (keys) delete[] keys; + + creg::ClassBinder::FreeClasses (); +} + + +#ifdef _WIN32 +// Called when spring crashes +bool crashCallback(void* crState) +{ + info->AddLine("Spring has crashed"); + + // Since we are going down, it's ok to delete the info console (it can't be mailed otherwise) + delete info; + bool wasRecording = false; + if (net->recordDemo) { + delete net->recordDemo; + wasRecording = true; + } + + AddFile("infolog.txt", "Spring information log"); + AddFile("test.sdf", "Spring game demo"); + + if (wasRecording) + AddFile(net->demoName.c_str(), "Spring game demo"); + + return true; +} +#endif + +bool SpringApp::Initialize () +{ + ParseCmdLine (); + +#ifdef WIN32 + // Initialize crash reporting + Install( (LPGETLOGFILE) crashCallback, "taspringcrash@clan-sy.com", "TA Spring Crashreport"); +#endif + + // Initialize class system + creg::ClassBinder::InitializeClasses (); + +#ifndef NO_LUA + // Initialize lua bindings + CLuaBinder lua; + if (!lua.LoadScript("testscript.lua")) + handleerror(NULL, lua.lastError.c_str(), "lua",MBF_OK|MBF_EXCL); +#endif + + InitVFS (); + + if (!InitWindow ("RtsSpring")) + { + SDL_Quit (); + return false; + } + // Global structures + ENTER_SYNCED; + gs=new CGlobalSyncedStuff(); + ENTER_UNSYNCED; + gu=new CGlobalUnsyncedStuff(); + + InitOpenGL(); + + palette.Init(); + + // Initialize keyboard + SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); + SDL_SetModState (KMOD_NONE); + + keys = new Uint8[SDLK_LAST]; + memset (keys,0,sizeof(Uint8)*SDLK_LAST); + + // Initialize font + font = new CglFont(32,223); + LoadExtensions(); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + SDL_GL_SwapBuffers(); + + CreateGameSetup (); + + return true; +} + + +static bool MultisampleTest(void) +{ + if (!GL_ARB_multisample) + return false; + GLuint fsaa = configHandler.GetInt("FSAA",0); + if (!fsaa) + return false; + SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS,1); + GLuint fsaalevel = min(configHandler.GetInt("FSAALevel",2),(unsigned int)8); + + make_even_number(fsaalevel); + + SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES,fsaalevel); + return true; +} + +static bool MultisampleVerify(void) +{ + GLint buffers, samples; + glGetIntegerv(GL_SAMPLE_BUFFERS_ARB, &buffers); + glGetIntegerv(GL_SAMPLES_ARB, &samples); + if (buffers && samples) { +#ifdef DEBUG + char t[22]; + SNPRINTF(t,22, "FSAA level %d enabled",samples); + handleerror(0,t,"SDL_GL",MBF_OK|MBF_INFO); +#endif + return true; + } + return false; +} + + +bool SpringApp::InitWindow (const char* title) +{ + if ((SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) == -1)) { + handleerror(NULL,"Could not initialize SDL.","ERROR",MBF_OK|MBF_EXCL); + return false; + } + + // Sets window manager properties + SDL_WM_SetIcon(SDL_LoadBMP("spring.bmp"),NULL); + SDL_WM_SetCaption(title, title); + + SetSDLVideoMode (); + return true; +} + +bool SpringApp::SetSDLVideoMode () +{ + int sdlflags = SDL_OPENGL | SDL_RESIZABLE; + + conditionally_set_flag(sdlflags, SDL_FULLSCREEN, fullscreen); + + SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5); + SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5); + SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5); +#ifdef __APPLE__ + SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 32); +#else + SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16); +#endif + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER,1); + + FSAA = MultisampleTest(); + + SDL_Surface *screen = SDL_SetVideoMode(screenWidth,screenHeight,0,sdlflags); + if (!screen) { + handleerror(NULL,"Could not set video mode","ERROR",MBF_OK|MBF_EXCL); + return false; + } + if (FSAA) + FSAA = MultisampleVerify(); + + return true; +} + + +void SpringApp::InitOpenGL () +{ + // Setup viewport + glViewport (0, 0, screenWidth, screenHeight); + gluPerspective(45.0f,(GLfloat)screenWidth/(GLfloat)screenHeight,2.8f,MAX_VIEW_RANGE); + + // Initialize some GL states + glShadeModel(GL_SMOOTH); + glClearDepth(1.0f); + glEnable(GL_DEPTH_TEST); + glDepthFunc(GL_LEQUAL); + + gu->screenx = screenWidth; + gu->screeny = screenHeight; +} + + +// Initialize the virtual file system +void SpringApp::InitVFS() +{ + // Create the archive scanner and vfs handler + archiveScanner = new CArchiveScanner(); + archiveScanner->ReadCacheData(); + archiveScanner->Scan("./maps"); + archiveScanner->Scan("./base"); + archiveScanner->Scan("./mods"); + archiveScanner->WriteCacheData(); + hpiHandler = new CVFSHandler(); +} + + +bool SpringApp::ParseCmdLine() +{ + cmdline->addoption('f',"fullscreen",OPTPARM_NONE,"","Run in fullscreen mode"); + cmdline->addoption('w',"window",OPTPARM_NONE,"","Run in windowed mode"); + cmdline->addoption('s',"server",OPTPARM_NONE,"","Run as a server"); + cmdline->addoption('c',"client",OPTPARM_NONE,"","Run as a client"); +// cmdline->addoption('g',"runscript",OPTPARM_STRING,"script.txt", "Run with a game setup script"); + cmdline->parse(); + +#ifdef _DEBUG + fullscreen = false; +#else + fullscreen = configHandler.GetInt("Fullscreen",1)!=0; +#endif + Uint8 scrollWheelSpeed = configHandler.GetInt("ScrollWheelSpeed",25); + + if (cmdline->result("help")) { + cmdline->usage("TA:Spring",VERSION_STRING); + return false; + } else if (cmdline->result("version")) { + std::cout << "TA:Spring " << VERSION_STRING << std::endl; + return false; + } else if (cmdline->result("window")) + fullscreen = false; + else if (cmdline->result("fullscreen")) + fullscreen = true; + + screenWidth = configHandler.GetInt("XResolution",XRES_DEFAULT); + screenHeight = configHandler.GetInt("YResolution",YRES_DEFAULT); + screenFreq = configHandler.GetInt("DisplayFrequency",0); + + return true; +} + +// See if a demo SDF file or a startscript is specified on the command line +void SpringApp::CheckCmdLineFile(int argc, char *argv[]) +{ + // Check if the commandline parameter is specifying a demo file +#ifdef _WIN32 + // find the correct dir + const char *arg0=argv[0]; + int a,s = strlen(arg0); + for (a=s-1;a>0;a--) + if (arg0[a] == '\\') break; + if (a > 0) { + string path(arg0, arg0+a); + if (path.at(0) == '"') + path.append(1,'"'); + _chdir(path.c_str()); + } +#endif + + for (int i = 1; i < argc; i++) { + if (argv[i][0] != '-') { + string command(argv[i]); + int idx = command.rfind("sdf"); + if (idx == command.size()-3) { + demofile = command; + } else { + startscript = command; + } + } + } +} + +void SpringApp::CreateGameSetup () +{ + ENTER_SYNCED; + if (!startscript.empty()) { + gameSetup=new CGameSetup(); + if(!gameSetup->Init(startscript)){ + delete gameSetup; + gameSetup=0; + } + } + + ENTER_MIXED; + + bool server = true; + if (!demofile.empty()) + server = false; + else if(gameSetup) + server=gameSetup->myPlayer-gameSetup->numDemoPlayers == 0; + else + server=!cmdline->result("client") || cmdline->result("server"); + + if (!demofile.empty()) + pregame = new CPreGame(false, demofile); + else + pregame = new CPreGame(server, ""); +} + +int SpringApp::Draw () +{ + if (FSAA) + glEnable(GL_MULTISAMPLE_ARB); + + int ret = 1; + if(activeController) { + if(activeController->Update()==0) ret = 0; + else ret = activeController->Draw(); + } + + SDL_GL_SwapBuffers(); + if (FSAA) + glDisable(GL_MULTISAMPLE_ARB); + + return ret; +} + +void SpringApp::UpdateSDLKeys () +{ + int numkeys; + Uint8 *state; + state = SDL_GetKeyState(&numkeys); + memcpy(keys, state, sizeof(Uint8) * numkeys); + + SDLMod mods = SDL_GetModState(); + keys[SDLK_LSHIFT] = mods&KMOD_SHIFT?1:0; + keys[SDLK_LCTRL] = mods&KMOD_CTRL?1:0; + keys[SDLK_LALT] = mods&KMOD_ALT?1:0; + keys[SDLK_LMETA] = mods&KMOD_META?1:0; +} + + +int SpringApp::Run (int argc, char *argv[]) +{ + INIT_SYNCIFY; + CheckCmdLineFile (argc, argv); + cmdline = BaseCmd::initialize(argc,argv); + + if (!Initialize ()) + return -1; + +#ifdef WIN32 + SDL_EventState (SDL_SYSWMEVENT, SDL_ENABLE); +#endif + + SDL_Event event; + bool done=false; + + Uint8 scrollWheelSpeed = configHandler.GetInt("ScrollWheelSpeed",25); + + while (!done) { + ENTER_UNSYNCED; + while (SDL_PollEvent(&event)) { + switch (event.type) { + case SDL_VIDEORESIZE: + screenWidth = event.resize.w; + screenHeight = event.resize.h; + InitOpenGL(); + break; + case SDL_QUIT: + done = true; + break; + case SDL_MOUSEMOTION: + if(mouse) + mouse->MouseMove(event.motion.x,event.motion.y); + break; + case SDL_MOUSEBUTTONDOWN: + if (mouse) { + if (event.button.button == SDL_BUTTON_WHEELUP) + mouse->currentCamController->MouseWheelMove(scrollWheelSpeed); + else if (event.button.button == SDL_BUTTON_WHEELDOWN) + mouse->currentCamController->MouseWheelMove(-scrollWheelSpeed); + else + mouse->MousePress(event.button.x,event.button.y,event.button.button); + } + break; + case SDL_MOUSEBUTTONUP: + if (mouse) + mouse->MouseRelease(event.button.x,event.button.y,event.button.button); + break; + case SDL_KEYDOWN: + { + int i = event.key.keysym.sym; + + UpdateSDLKeys (); + + if(activeController) { + activeController->KeyPressed(i,1); +#ifndef NEW_GUI + if(activeController->userWriting){ + i = event.key.keysym.unicode; + if (i >= SDLK_SPACE && i <= SDLK_DELETE) + if(activeController->ignoreNextChar || activeController->ignoreChar==char(i)) + activeController->ignoreNextChar=false; + else + activeController->userInput+=char(i); + } +#endif + } +#ifdef NEW_GUI + i = event.key.keysym.unicode; + if (i > SDLK_FIRST && i <= SDLK_DELETE) /* HACK */ + GUIcontroller::Character(char(i)); +#endif + break; + } + case SDL_KEYUP: + { + int i = event.key.keysym.sym; + + UpdateSDLKeys(); + + if (activeController) + activeController->KeyReleased(i); + break; + } +#ifdef WIN32 + case SDL_SYSWMEVENT: + { + SDL_SysWMmsg *msg = event.syswm.msg; + if (msg->msg == 0x020B) { // WM_XBUTTONDOWN, beats me why it isn't defined by default + if (msg->wParam & 0x20) // MK_XBUTTON1 + mouse->MousePress (LOWORD(msg->lParam),HIWORD(msg->lParam), 4); + if (msg->wParam & 0x40) // MK_XBUTTON2 + mouse->MousePress (LOWORD(msg->lParam),HIWORD(msg->lParam), 5); + } + break; + } +#endif + } + } + int ret = Draw(); + if (globalQuit || (active && !ret)) + done=true; + } + ENTER_MIXED; + + // Shutdown + Shutdown(); + return 0; +} + +void SpringApp::Shutdown() +{ + if (pregame) + delete pregame; //in case we exit during init + if (game) + delete game; + if (gameSetup) + delete gameSetup; + delete font; + ConfigHandler::Deallocate(); + UnloadExtensions(); +#ifndef DEBUG + SDL_WM_GrabInput(SDL_GRAB_OFF); +#endif + SDL_Quit(); + delete gs; + delete gu; + END_SYNCIFY; +#ifdef USE_MMGR + m_dumpMemoryReport(); +#endif +} + +// Application entry point + +#if defined(WIN32) || defined(__APPLE__) +int main( int argc, char *argv[] ) +#else +int main( int argc, char *argv[ ], char *envp[ ] ) /* envp only on linux/bsd */ +#endif +{ +#if !defined(_WIN32) && !defined(__APPLE__) + chdir(SPRING_DATADIR); +#endif + +// It's nice to be able to disable catching when you're debugging +#ifndef NO_CATCH_EXCEPTIONS + try { + SpringApp app; + return app.Run (argc,argv); + } catch (const std::exception& e) { + handleerror(NULL, e.what(), "Fatal Error", MBF_OK | MBF_EXCL); + return 1; + } +#else + return app.Run (argv, argv); +#endif +} rts/System/Main.cpp @@ -8,6 +8,8 @@ #include <string> #ifdef _WIN32 #include "Win/win32.h" +#elif defined(__APPLE__) +class MacBackgroundReader; #elif defined(HAS_LIBAIO) #include <libaio.h> #endif @@ -26,11 +28,16 @@ public: int* reportReady; }; +#if !defined(__APPLE) std::deque<FileToRead> quedFiles; FileToRead curFile; +#endif /* !defined(__APPLE__) */ + #ifdef _WIN32 OVERLAPPED curReadInfo; HANDLE curHandle; +#elif defined(__APPLE__) + MacBackgroundReader *reader; #elif defined(HAS_LIBAIO) io_context_t io_ctx; int srcfd; rts/System/Platform/BackgroundReader.h @@ -7,6 +7,9 @@ #include "ConfigHandler.h" #ifdef _WIN32 #include "Win/RegHandler.h" +#elif defined(__APPLE__) +extern "C" void PreInitMac(); +#include "Mac/UserDefsHandler.h" #else #include "Linux/DotfileHandler.h" #endif @@ -18,6 +21,9 @@ ConfigHandler& ConfigHandler::GetInstance() if (!instance) { #ifdef _WIN32 instance = new RegHandler("Software\\SJ\\spring"); +#elif defined(__APPLE__) + PreInitMac(); + instance = new UserDefsHandler(); // Config path is based on bundle id #else instance = new DotfileHandler(DOTCONFIGPATH); #endif rts/System/Platform/ConfigHandler.cpp @@ -2,6 +2,14 @@ * byteorder.h * Handling of endian byte orders * Copyright (C) 2005 Christopher Han + * + * Mac PPC: BIG Endian + * Mac X86: little Endian + * + * Win X86: little Endian + * + * BSD X86: BIG Endian + * Linux X86: BIG Endian */ #ifndef BYTEORDER_H #define BYTEORDER_H @@ -59,6 +67,18 @@ static inline float swabfloat(float w) { return *(float*)&l; } +#elif defined(__APPLE__) +// Should work for both x86 and ppc + +#include "CoreFoundation/CFByteOrder.h" + +#define swabword(w) (CFSwapInt16LittleToHost((uint32_t)w)) +#define swabdword(w) (CFSwapInt32LittleToHost((uint32_t)w)) +static inline float swabfloat(float w) { + int i = swabdword(*(int*)&w); + return *(float*)&i; +} + #else // empty versions for win32 rts/System/Platform/byteorder.h @@ -24,6 +24,7 @@ def platform(): print "Detected platform : darwin" print "WARNING: support is incomplete" detected_platform='darwin' + print "NOTE: xcode files are available in /trunk/rts/build/xcode" else: print "Platform not supported yet, please edit SConstruct file" detected_platform='unknown' rts/build/scons/detect.py 18d666b686f0940f85b6de0e2d04ba6de7ef98d9 krysole krysole@37977431-3df6-0310-b722-df95706aa16b http://github.com/spring/spring/commit/001ece829f37e0063b5031aa76a0a2266b4f3ff1 001ece829f37e0063b5031aa76a0a2266b4f3ff1 2006-02-25T22:08:48-08:00 2006-02-25T22:08:48-08:00 Initial Mac Build, XCode files (no scons yet, also only gets to menu, hangs if you try to go further) git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@888 37977431-3df6-0310-b722-df95706aa16b 5dc372c8bb1a8b65c1f01d7d7171086ba374a9d9 krysole krysole@37977431-3df6-0310-b722-df95706aa16b