X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap%2Fworldmap.cpp;h=cf48384e50194895673ecca1ae2a014ed1b87ac7;hb=accd4212a21bdce9ab9ad9e802d949a1828e2987;hp=137ffd842c429c7fabbb98e1b69a09d9f23fc770;hpb=0d4be1a5fadf30244c41188f114f83c818ece9bc;p=supertux.git diff --git a/src/worldmap/worldmap.cpp b/src/worldmap/worldmap.cpp index 137ffd842..cf48384e5 100644 --- a/src/worldmap/worldmap.cpp +++ b/src/worldmap/worldmap.cpp @@ -54,6 +54,7 @@ #include "main.hpp" #include "spawn_point.hpp" #include "file_system.hpp" +#include "physfs/physfs_stream.hpp" #include "tile_manager.hpp" #include "tile_set.hpp" #include "gui/menu.hpp" @@ -69,6 +70,8 @@ #include "worldmap/tux.hpp" #include "worldmap/sprite_change.hpp" +static const float CAMERA_PAN_SPEED = 5.0; + namespace WorldMapNS { enum WorldMapMenuIDs { @@ -138,7 +141,7 @@ string_to_direction(const std::string& directory) WorldMap::WorldMap(const std::string& filename, const std::string& force_spawnpoint) : tux(0), tileset(NULL), free_tileset(false), ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), force_spawnpoint(force_spawnpoint), - in_level(false) + in_level(false), panning(false) { tux = new Tux(this); add_object(tux); @@ -253,7 +256,7 @@ WorldMap::try_unexpose(GameObject* object) } void -WorldMap::move_to_spawnpoint(const std::string& spawnpoint) +WorldMap::move_to_spawnpoint(const std::string& spawnpoint, bool pan) { for(SpawnPoints::iterator i = spawn_points.begin(); i != spawn_points.end(); ++i) { SpawnPoint* sp = *i; @@ -261,6 +264,11 @@ WorldMap::move_to_spawnpoint(const std::string& spawnpoint) Vector p = sp->pos; tux->set_tile_pos(p); tux->set_direction(sp->auto_dir); + if(pan) { + panning = true; + pan_pos = get_camera_pos_for_tux(); + clamp_camera_position(pan_pos); + } return; } } @@ -536,6 +544,33 @@ WorldMap::finished_level(Level* gamelevel) } } +Vector +WorldMap::get_camera_pos_for_tux() { + Vector camera_offset; + Vector tux_pos = tux->get_pos(); + camera_offset.x = tux_pos.x - SCREEN_WIDTH/2; + camera_offset.y = tux_pos.y - SCREEN_HEIGHT/2; + return camera_offset; +} + +void +WorldMap::clamp_camera_position(Vector& c) { + if (c.x < 0) + c.x = 0; + if (c.y < 0) + c.y = 0; + + if (c.x > (int)get_width()*32 - SCREEN_WIDTH) + c.x = (int)get_width()*32 - SCREEN_WIDTH; + if (c.y > (int)get_height()*32 - SCREEN_HEIGHT) + c.y = (int)get_height()*32 - SCREEN_HEIGHT; + + if (int(get_width()*32) < SCREEN_WIDTH) + c.x = get_width()*16.0 - SCREEN_WIDTH/2.0; + if (int(get_height()*32) < SCREEN_HEIGHT) + c.y = get_height()*16.0 - SCREEN_HEIGHT/2.0; +} + void WorldMap::update(float delta) { @@ -562,7 +597,9 @@ WorldMap::update(float delta) // update GameObjects for(size_t i = 0; i < game_objects.size(); ++i) { GameObject* object = game_objects[i]; - object->update(delta); + if(!panning || object != tux) { + object->update(delta); + } } // remove old GameObjects @@ -589,25 +626,34 @@ WorldMap::update(float delta) if (tm->is_solid()) solid_tilemaps.push_back(tm); } - // position "camera" - Vector tux_pos = tux->get_pos(); - camera_offset.x = tux_pos.x - SCREEN_WIDTH/2; - camera_offset.y = tux_pos.y - SCREEN_HEIGHT/2; + Vector requested_pos; - if (camera_offset.x < 0) - camera_offset.x = 0; - if (camera_offset.y < 0) - camera_offset.y = 0; + // position "camera" + if(!panning) { + camera_offset = get_camera_pos_for_tux(); + } else { + Vector delta = pan_pos - camera_offset; + float mag = delta.norm(); + if(mag > CAMERA_PAN_SPEED) { + delta *= CAMERA_PAN_SPEED/mag; + } + camera_offset += delta; + if(camera_offset == pan_pos) { + panning = false; + } + } - if (camera_offset.x > (int)get_width()*32 - SCREEN_WIDTH) - camera_offset.x = (int)get_width()*32 - SCREEN_WIDTH; - if (camera_offset.y > (int)get_height()*32 - SCREEN_HEIGHT) - camera_offset.y = (int)get_height()*32 - SCREEN_HEIGHT; + requested_pos = camera_offset; + clamp_camera_position(camera_offset); - if (int(get_width()*32) < SCREEN_WIDTH) - camera_offset.x = get_width()*16.0 - SCREEN_WIDTH/2.0; - if (int(get_height()*32) < SCREEN_HEIGHT) - camera_offset.y = get_height()*16.0 - SCREEN_HEIGHT/2.0; + if(panning) { + if(requested_pos.x != camera_offset.x) { + pan_pos.x = camera_offset.x; + } + if(requested_pos.y != camera_offset.y) { + pan_pos.y = camera_offset.y; + } + } // handle input bool enter_level = false; @@ -631,7 +677,7 @@ WorldMap::update(float delta) // TODO: an animation, camera scrolling or a fading would be a nice touch sound_manager->play("sounds/warp.wav"); tux->back_direction = D_NONE; - move_to_spawnpoint(teleporter->spawnpoint); + move_to_spawnpoint(teleporter->spawnpoint, true); } } @@ -660,14 +706,14 @@ WorldMap::update(float delta) if (level->pos == tux->get_tile_pos()) { try { Vector shrinkpos = Vector(level->pos.x*32 + 16 - camera_offset.x, - level->pos.y*32 + 16 - camera_offset.y); + level->pos.y*32 + 8 - camera_offset.y); std::string levelfile = levels_path + level->get_name(); // update state and savegame save_state(); main_loop->push_screen(new GameSession(levelfile, &level->statistics), - new ShrinkFade(shrinkpos, 0.5)); + new ShrinkFade(shrinkpos, 1.0f)); in_level = true; } catch(std::exception& e) { log_fatal << "Couldn't load level: " << e.what() << std::endl; @@ -765,7 +811,9 @@ WorldMap::draw(DrawingContext& context) for(GameObjects::iterator i = game_objects.begin(); i != game_objects.end(); ++i) { GameObject* object = *i; - object->draw(context); + if(!panning || object != tux) { + object->draw(context); + } } /* @@ -892,6 +940,15 @@ WorldMap::setup() throw SquirrelError(global_vm, "Couldn't set worldmap in roottable"); sq_pop(global_vm, 1); + //Run default.nut just before init script + try { + IFileStream in(levels_path + "/default.nut"); + run_script(in, "WorldMap::default.nut"); + } catch(std::exception& ) { + // doesn't exist or erroneous; do nothing + } + + if(init_script != "") { std::istringstream in(init_script); run_script(in, "WorldMap::init");