X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=71aa8621a6f9853ec95303ae3862f8d224cbc39b;hb=07ddaed2a657e4d2a3d038fed223fc5827159caf;hp=acf4465ea627c81288626661ad42aea3222f4f68;hpb=7ae3aef67ad305cb9c6ed584cdac6117da9eba88;p=supertux.git diff --git a/src/main.cpp b/src/main.cpp index acf4465ea..71aa8621a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -12,7 +12,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -20,10 +20,10 @@ #include #include -#include "main.h" +#include "log.hpp" +#include "main.hpp" #include -#include #include #include #include @@ -34,21 +34,26 @@ #include #include #include -#include #include -#include - -#include "gameconfig.h" -#include "resources.h" -#include "gettext.h" -#include "audio/sound_manager.h" -#include "video/surface.h" -#include "control/joystickkeyboardcontroller.h" -#include "misc.h" -#include "title.h" -#include "game_session.h" -#include "file_system.h" -#include "physfs/physfs_sdl.h" +#include + +#include "gameconfig.hpp" +#include "resources.hpp" +#include "gettext.hpp" +#include "audio/sound_manager.hpp" +#include "video/surface.hpp" +#include "video/texture_manager.hpp" +#include "control/joystickkeyboardcontroller.hpp" +#include "misc.hpp" +#include "mainloop.hpp" +#include "title.hpp" +#include "game_session.hpp" +#include "script_manager.hpp" +#include "scripting/sound.hpp" +#include "scripting/level.hpp" +#include "scripting/wrapper_util.hpp" +#include "file_system.hpp" +#include "physfs/physfs_sdl.hpp" SDL_Surface* screen = 0; JoystickKeyboardController* main_controller = 0; @@ -60,9 +65,7 @@ static void init_config() try { config->load(); } catch(std::exception& e) { -#ifdef DEBUG - std::cerr << "Couldn't load config file: " << e.what() << "\n"; -#endif + log_info << "Couldn't load config file: " << e.what() << ", using default settings" << std::endl; } } @@ -140,52 +143,77 @@ static void init_physfs(const char* argv0) dir += "/data"; std::string testfname = dir; testfname += "/credits.txt"; + bool sourcedir = false; FILE* f = fopen(testfname.c_str(), "r"); if(f) { fclose(f); if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) { - std::cout << "Warning: Couldn't add '" << dir - << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n"; + log_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl; + } else { + sourcedir = true; } } +#ifdef MACOSX + // when started from Application file on Mac OS X... + dir = PHYSFS_getBaseDir(); + dir += "SuperTux.app/Contents/Resources/data"; + testfname = dir + "/credits.txt"; + sourcedir = false; + f = fopen(testfname.c_str(), "r"); + if(f) { + fclose(f); + if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) { + msg_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl; + } else { + sourcedir = true; + } + } +#endif + + if(!sourcedir) { #if defined(APPDATADIR) || defined(ENABLE_BINRELOC) - std::string datadir; + std::string datadir; #ifdef ENABLE_BINRELOC - char* brdatadir = br_strcat(DATADIR, "/" PACKAGE_NAME); - datadir = brdatadir; - free(brdatadir); + char* brdatadir = br_strcat(DATADIR, "/" PACKAGE_NAME); + datadir = brdatadir; + free(brdatadir); #else - datadir = APPDATADIR; + datadir = APPDATADIR; #endif - if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) { - std::cout << "Couldn't add '" << datadir - << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n"; - } + if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) { + log_warning << "Couldn't add '" << datadir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl; + } #endif + } // allow symbolic links PHYSFS_permitSymbolicLinks(1); //show search Path for(char** i = PHYSFS_getSearchPath(); *i != NULL; i++) - printf("[%s] is in the search path.\n", *i); + log_info << "[" << *i << "] is in the search path" << std::endl; } static void print_usage(const char* argv0) { - fprintf(stderr, _("Usage: %s [OPTIONS] LEVELFILE\n\n"), argv0); + fprintf(stderr, _("Usage: %s [OPTIONS] [LEVELFILE]\n\n"), argv0); fprintf(stderr, _("Options:\n" - " -f, --fullscreen Run in fullscreen mode.\n" - " -w, --window Run in window mode.\n" - " -g, --geometry WIDTHxHEIGHT Run SuperTux in give resolution\n" + " -f, --fullscreen Run in fullscreen mode\n" + " -w, --window Run in window mode\n" + " -g, --geometry WIDTHxHEIGHT Run SuperTux in given resolution\n" + " --disable-sfx Disable sound effects\n" + " --disable-music Disable music\n" " --help Show this help message\n" " --version Display SuperTux version and quit\n" + " --show-fps Display framerate in levels\n" + " --record-demo FILE LEVEL Record a demo to FILE\n" + " --play-demo FILE LEVEL Play a recorded demo\n" "\n")); } -static void parse_commandline(int argc, char** argv) +static bool parse_commandline(int argc, char** argv) { for(int i = 1; i < argc; ++i) { std::string arg = argv[i]; @@ -206,6 +234,10 @@ static void parse_commandline(int argc, char** argv) } } else if(arg == "--show-fps") { config->show_fps = true; + } else if(arg == "--disable-sfx") { + config->sound_enabled = false; + } else if(arg == "--disable-music") { + config->music_enabled = false; } else if(arg == "--play-demo") { if(i+1 >= argc) { print_usage(argv[0]); @@ -220,19 +252,18 @@ static void parse_commandline(int argc, char** argv) config->record_demo = argv[++i]; } else if(arg == "--help") { print_usage(argv[0]); - throw std::runtime_error(""); + return true; } else if(arg == "--version") { - std::cerr << PACKAGE_NAME << " " << PACKAGE_VERSION << "\n"; - throw std::runtime_error(""); + log_info << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl; + return true; } else if(arg[0] != '-') { config->start_level = arg; } else { - std::cerr << "Unknown option '" << arg << "'.\n"; - std::cerr << "Use --help to see a list of options.\n"; + log_warning << "Unknown option '" << arg << "'. Use --help to see a list of options" << std::endl; } } - // TODO joystick switchyes... + return false; } static void init_sdl() @@ -242,6 +273,8 @@ static void init_sdl() msg << "Couldn't initialize SDL: " << SDL_GetError(); throw std::runtime_error(msg.str()); } + // just to be sure + atexit(SDL_Quit); SDL_EnableUNICODE(1); @@ -293,6 +326,9 @@ static void check_gl_error() void init_video() { + if(texture_manager != NULL) + texture_manager->save_textures(); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5); SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5); @@ -324,13 +360,16 @@ void init_video() } #ifdef DEBUG else { - std::cerr << "Warning: Couldn't find icon 'images/engine/icons/supertux.xpm'.\n"; + log_warning << "Couldn't find icon 'images/engine/icons/supertux.xpm'" << std::endl; } #endif // 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); @@ -343,41 +382,36 @@ void init_video() check_gl_error(); - Surface::reload_all(); + if(texture_manager != NULL) + texture_manager->reload_textures(); + else + texture_manager = new TextureManager(); } static void init_audio() { sound_manager = new SoundManager(); - int format = MIX_DEFAULT_FORMAT; - if(Mix_OpenAudio(config->audio_frequency, format, config->audio_channels, - config->audio_chunksize) < 0) { - std::cerr << "Couldn't initialize audio (" - << config->audio_frequency << "HZ, " << config->audio_channels - << " Channels, Format " << format << ", ChunkSize " - << config->audio_chunksize << "): " << SDL_GetError() << "\n"; - return; - } - sound_manager->set_audio_device_available(true); sound_manager->enable_sound(config->sound_enabled); sound_manager->enable_music(config->music_enabled); - - if(Mix_AllocateChannels(config->audio_voices) < 0) { - std::cerr << "Couldn't allocate '" << config->audio_voices << "' audio voices: " - << SDL_GetError() << "\n"; - return; - } } -static void quit_audio() +static void init_scripting() { - if(sound_manager) { - if(sound_manager->audio_device_available()) - Mix_CloseAudio(); + ScriptManager::instance = new ScriptManager(); + + HSQUIRRELVM vm = ScriptManager::instance->get_vm(); + sq_pushroottable(vm); + expose_object(vm, -1, new Scripting::Sound(), "Sound", true); + expose_object(vm, -1, new Scripting::Level(), "Level", true); + sq_pop(vm, 1); +} +static void quit_audio() +{ + if(sound_manager != NULL) { delete sound_manager; - sound_manager = 0; + sound_manager = NULL; } } @@ -388,21 +422,26 @@ void wait_for_event(float min_delay, float max_delay) Uint32 min = (Uint32) (min_delay * 1000); Uint32 max = (Uint32) (max_delay * 1000); - SDL_Delay(min); + Uint32 ticks = SDL_GetTicks(); + while(SDL_GetTicks() - ticks < min) { + SDL_Delay(10); + sound_manager->update(); + } - // clear even queue + // clear event queue SDL_Event event; while (SDL_PollEvent(&event)) {} /* Handle events: */ bool running = false; - Uint32 ticks = SDL_GetTicks(); + ticks = SDL_GetTicks(); while(running) { while(SDL_PollEvent(&event)) { switch(event.type) { case SDL_QUIT: - throw std::runtime_error("received window close"); + main_loop->quit(); + break; case SDL_KEYDOWN: case SDL_JOYBUTTONDOWN: case SDL_MOUSEBUTTONDOWN: @@ -411,67 +450,111 @@ void wait_for_event(float min_delay, float max_delay) } if(SDL_GetTicks() - ticks >= (max - min)) running = false; + sound_manager->update(); SDL_Delay(10); } } +#ifdef DEBUG +static Uint32 last_timelog_ticks = 0; +static const char* last_timelog_component = 0; + +static inline void timelog(const char* component) +{ + Uint32 current_ticks = SDL_GetTicks(); + + if(last_timelog_component != 0) { + log_info << "Component '" << last_timelog_component << "' finished after " << (current_ticks - last_timelog_ticks) / 1000.0 << " seconds" << std::endl; + } + + last_timelog_ticks = current_ticks; + last_timelog_component = component; +} +#else +static inline void timelog(const char* ) +{ +} +#endif + int main(int argc, char** argv) { -#ifndef DEBUG // we want backtraces in debug mode so don't catch exceptions + int result = 0; + try { -#endif srand(time(0)); init_physfs(argv[0]); init_sdl(); + timelog("controller"); main_controller = new JoystickKeyboardController(); + timelog("config"); init_config(); + timelog("tinygettext"); init_tinygettext(); - parse_commandline(argc, argv); + timelog("commandline"); + if(parse_commandline(argc, argv)) + return 0; + timelog("audio"); init_audio(); + timelog("video"); init_video(); + Console::instance = new Console(); + timelog("scripting"); + init_scripting(); + timelog("menu"); setup_menu(); - load_shared(); + timelog("resources"); + load_shared(); + timelog(0); + + main_loop = new MainLoop(); if(config->start_level != "") { // we have a normal path specified at commandline not physfs paths. // So we simply mount that path here... std::string dir = FileSystem::dirname(config->start_level); PHYSFS_addToSearchPath(dir.c_str(), true); - GameSession session( + GameSession* session + = new GameSession( FileSystem::basename(config->start_level), ST_GL_LOAD_LEVEL_FILE); if(config->start_demo != "") - session.play_demo(config->start_demo); + session->play_demo(config->start_demo); if(config->record_demo != "") - session.record_demo(config->record_demo); - session.run(); + session->record_demo(config->record_demo); + main_loop->push_screen(session); } else { - // normal game - title(); - } - -#ifndef DEBUG + main_loop->push_screen(new TitleScreen()); + } + + main_loop->run(); } catch(std::exception& e) { - std::cerr << "Unexpected exception: " << e.what() << std::endl; - return 1; + log_fatal << "Unexpected exception: " << e.what() << std::endl; + result = 1; } catch(...) { - std::cerr << "Unexpected exception." << std::endl; - return 1; + log_fatal << "Unexpected exception" << std::endl; + result = 1; } -#endif + + delete main_loop; + main_loop = NULL; free_menu(); + delete ScriptManager::instance; + ScriptManager::instance = NULL; unload_shared(); -#ifdef DEBUG - Surface::debug_check(); -#endif quit_audio(); if(config) config->save(); delete config; + config = NULL; delete main_controller; + main_controller = NULL; + delete Console::instance; + Console::instance = NULL; + delete texture_manager; + texture_manager = NULL; SDL_Quit(); PHYSFS_deinit(); - return 0; + return result; }