X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmain.cpp;h=08d3d86feab69adcd95695af19337e4c4cbf1673;hb=2504682b880c9bb19e14a52c41fe9d62d1858f4a;hp=8780ddca8ffd9c8958f99ea68d1f7ef02a8a7c2a;hpb=f171cfbf82ac235d60cc53d24bf9be6cc5365550;p=supertux.git diff --git a/src/main.cpp b/src/main.cpp index 8780ddca8..08d3d86fe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,7 +33,12 @@ #include #include #include -#include + +#ifdef MACOSX +namespace supertux_apple { +#include +} +#endif #include "gameconfig.hpp" #include "resources.hpp" @@ -41,6 +46,7 @@ #include "audio/sound_manager.hpp" #include "video/surface.hpp" #include "video/texture_manager.hpp" +#include "video/drawing_context.hpp" #include "video/glutil.hpp" #include "control/joystickkeyboardcontroller.hpp" #include "options_menu.hpp" @@ -55,7 +61,8 @@ #include "worldmap/worldmap.hpp" #include "binreloc/binreloc.h" -SDL_Surface* screen = 0; +namespace { DrawingContext *context_pointer; } +SDL_Surface *screen; JoystickKeyboardController* main_controller = 0; TinyGetText::DictionaryManager dictionary_manager; @@ -163,9 +170,22 @@ static void init_physfs(const char* argv0) } #ifdef MACOSX +{ + using namespace supertux_apple; + // when started from Application file on Mac OS X... - dir = PHYSFS_getBaseDir(); - dir += "SuperTux.app/Contents/Resources/data"; + char path[PATH_MAX]; + CFBundleRef mainBundle = CFBundleGetMainBundle(); + assert(mainBundle != 0); + CFURLRef mainBundleURL = CFBundleCopyBundleURL(mainBundle); + assert(mainBundleURL != 0); + CFStringRef pathStr = CFURLCopyFileSystemPath(mainBundleURL, kCFURLPOSIXPathStyle); + assert(pathStr != 0); + CFStringGetCString(pathStr, path, PATH_MAX, kCFStringEncodingUTF8); + CFRelease(mainBundleURL); + CFRelease(pathStr); + + dir = std::string(path) + "/Contents/Resources/data"; testfname = dir + "/credits.txt"; sourcedir = false; f = fopen(testfname.c_str(), "r"); @@ -177,6 +197,7 @@ static void init_physfs(const char* argv0) sourcedir = true; } } +} #endif #ifdef _WIN32 @@ -192,7 +213,6 @@ static void init_physfs(const char* argv0) br_init (NULL); dir = br_find_data_dir(APPDATADIR); datadir = dir; - datadir += "/" PACKAGE_NAME; free(dir); #else @@ -365,9 +385,6 @@ void init_video() static int desktop_width = 0; static int desktop_height = 0; - if(texture_manager != NULL) - texture_manager->save_textures(); - /* unfortunately only newer SDLs have these infos */ #if SDL_MAJOR_VERSION > 1 || SDL_MINOR_VERSION > 2 || (SDL_MINOR_VERSION == 2 && SDL_PATCHLEVEL >= 10) /* find which resolution the user normally uses */ @@ -376,59 +393,24 @@ void init_video() desktop_width = info->current_w; desktop_height = info->current_h; } - - if(config->try_vsync) { - /* we want vsync for smooth scrolling */ - SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1); - } -#endif - - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); - SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5); - SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5); - SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5); - - int flags = SDL_OPENGL; - if(config->use_fullscreen) - flags |= SDL_FULLSCREEN; - int width = config->screenwidth; - int height = config->screenheight; - int bpp = 0; - - screen = SDL_SetVideoMode(width, height, bpp, flags); - if(screen == 0) { - std::stringstream msg; - msg << "Couldn't set video mode (" << width << "x" << height - << "-" << bpp << "bpp): " << SDL_GetError(); - throw std::runtime_error(msg.str()); - } - - SDL_WM_SetCaption(PACKAGE_NAME " " PACKAGE_VERSION, 0); - - // set icon - SDL_Surface* icon = IMG_Load_RW( - get_physfs_SDLRWops("images/engine/icons/supertux.xpm"), true); - if(icon != 0) { - SDL_WM_SetIcon(icon, 0); - SDL_FreeSurface(icon); - } -#ifdef DEBUG - else { - log_warning << "Couldn't find icon 'images/engine/icons/supertux.xpm'" << std::endl; - } #endif - SDL_ShowCursor(0); - double aspect_ratio = config->aspect_ratio; // try to guess aspect ratio of monitor if needed if (aspect_ratio <= 0) { +// TODO: commented out because +// 1) it tends to guess wrong if widescreen-monitors don't stretch 800x600 to fit, but just display black borders +// 2) aspect ratios other than 4:3 are largely untested +/* if(config->use_fullscreen && desktop_width > 0) { aspect_ratio = static_cast(desktop_width) / static_cast(desktop_height); } else { +*/ aspect_ratio = 4.0 / 3.0; +/* } +*/ } // use aspect ratio to calculate logical resolution @@ -440,30 +422,31 @@ void init_video() SCREEN_HEIGHT = static_cast (600 * 1/aspect_ratio + 0.5); } - log_info << (config->use_fullscreen?"fullscreen ":"window ") << SCREEN_WIDTH << "x" << SCREEN_HEIGHT << " Ratio: " << aspect_ratio << "\n"; + context_pointer->init_renderer(); + screen = SDL_GetVideoSurface(); + + SDL_WM_SetCaption(PACKAGE_NAME " " PACKAGE_VERSION, 0); - // setup opengl state and transform - glDisable(GL_DEPTH_TEST); - glDisable(GL_CULL_FACE); - glEnable(GL_TEXTURE_2D); - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - glViewport(0, 0, screen->w, screen->h); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - // logical resolution here not real monitor resolution - glOrtho(0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, -1.0, 1.0); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - glTranslatef(0, 0, 0); - - check_gl_error("Setting up view matrices"); - - if(texture_manager != NULL) - texture_manager->reload_textures(); - else - texture_manager = new TextureManager(); + // set icon + #ifdef MACOSX + const char* icon_fname = "images/engine/icons/supertux-256x256.png"; + #else + const char* icon_fname = "images/engine/icons/supertux.xpm"; + #endif + SDL_Surface* icon = IMG_Load_RW(get_physfs_SDLRWops(icon_fname), true); + if(icon != 0) { + SDL_WM_SetIcon(icon, 0); + SDL_FreeSurface(icon); + } +#ifdef DEBUG + else { + log_warning << "Couldn't find icon '" << icon_fname << "'" << std::endl; + } +#endif + + SDL_ShowCursor(0); + + log_info << (config->use_fullscreen?"fullscreen ":"window ") << SCREEN_WIDTH << "x" << SCREEN_HEIGHT << " Ratio: " << aspect_ratio << "\n"; } static void init_audio() @@ -570,6 +553,8 @@ int main(int argc, char** argv) timelog("audio"); init_audio(); timelog("video"); + DrawingContext context; + context_pointer = &context; init_video(); Console::instance->init_graphics(); timelog("scripting"); @@ -612,7 +597,7 @@ int main(int argc, char** argv) } //init_rand(); PAK: this call might subsume the above 3, but I'm chicken! - main_loop->run(); + main_loop->run(context); #ifndef NO_CATCH } catch(std::exception& e) { log_fatal << "Unexpected exception: " << e.what() << std::endl; @@ -626,7 +611,6 @@ int main(int argc, char** argv) delete main_loop; main_loop = NULL; - free_options_menu(); unload_shared(); quit_audio();