X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsector.cpp;h=625a00b42bae6ff16756daf3f4d5c0f2bae26a6d;hb=20b1c27dacf592c4f82fa8772d135ca9b7375d45;hp=99e5eb9dbfe3f36ddbac1bc52f0702ec0e6d3071;hpb=9e6cdce36b9324a3fc8a8aaf3aa04edf7985c7b0;p=supertux.git diff --git a/src/sector.cpp b/src/sector.cpp index 99e5eb9db..625a00b42 100644 --- a/src/sector.cpp +++ b/src/sector.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include "sector.hpp" #include "object/player.hpp" @@ -66,6 +67,8 @@ #include "scripting/squirrel_util.hpp" #include "script_interface.hpp" #include "log.hpp" +#include "main.hpp" +#include "level.hpp" Sector* Sector::_current = 0; @@ -74,12 +77,14 @@ bool Sector::draw_solids_only = false; Sector::Sector(Level* parent) : level(parent), currentmusic(LEVEL_MUSIC), - ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), gravity(10), player(0), camera(0) + ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), gravity(10.0), player(0), camera(0) { add_object(new Player(player_status, "Tux")); add_object(new DisplayEffect("Effect")); add_object(new TextObject("Text")); + sound_manager->preload("sounds/shoot.wav"); + // create a new squirrel table for the sector using namespace Scripting; @@ -175,6 +180,7 @@ Sector::parse_object(const std::string& name, const lisp::Lisp& reader) void Sector::parse(const lisp::Lisp& sector) { + bool has_background = false; lisp::ListIterator iter(§or); while(iter.next()) { const std::string& token = iter.item(); @@ -200,11 +206,22 @@ Sector::parse(const lisp::Lisp& sector) } else { GameObject* object = parse_object(token, *(iter.lisp())); if(object) { + if(dynamic_cast(object)) { + has_background = true; + } else if(dynamic_cast(object)) { + has_background = true; + } add_object(object); } } } + if(!has_background) { + Gradient* gradient = new Gradient(); + gradient->set_gradient(Color(0.3, 0.4, 0.75), Color(1, 1, 1)); + add_object(gradient); + } + update_game_objects(); if(solid_tilemaps.size() < 1) log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl; @@ -226,8 +243,17 @@ Sector::parse_old_format(const lisp::Lisp& reader) reader.get("gravity", gravity); std::string backgroundimage; - reader.get("background", backgroundimage); - if (backgroundimage == "arctis2.jpg") backgroundimage = "arctis.jpg"; + if (reader.get("background", backgroundimage) && (backgroundimage != "")) { + if (backgroundimage == "arctis.png") backgroundimage = "arctis.jpg"; + if (backgroundimage == "arctis2.jpg") backgroundimage = "arctis.jpg"; + if (backgroundimage == "ocean.png") backgroundimage = "ocean.jpg"; + backgroundimage = "images/background/" + backgroundimage; + if (!PHYSFS_exists(backgroundimage.c_str())) { + log_warning << "Background image \"" << backgroundimage << "\" not found. Ignoring." << std::endl; + backgroundimage = ""; + } + } + float bgspeed = .5; reader.get("bkgd_speed", bgspeed); bgspeed /= 100; @@ -250,8 +276,7 @@ Sector::parse_old_format(const lisp::Lisp& reader) if(backgroundimage != "") { Background* background = new Background(); - background->set_image( - std::string("images/background/") + backgroundimage, bgspeed); + background->set_image(backgroundimage, bgspeed); add_object(background); } else { Gradient* gradient = new Gradient(); @@ -278,7 +303,10 @@ Sector::parse_old_format(const lisp::Lisp& reader) spawnpoints.push_back(spawn); music = "chipdisko.ogg"; + // skip reading music filename. It's all .ogg now, anyway + /* reader.get("music", music); + */ music = "music/" + music; int width = 30, height = 15; @@ -288,29 +316,36 @@ Sector::parse_old_format(const lisp::Lisp& reader) std::vector tiles; if(reader.get_vector("interactive-tm", tiles) || reader.get_vector("tilemap", tiles)) { - TileMap* tilemap = new TileMap(); + TileMap* tilemap = new TileMap(level->get_tileset()); tilemap->set(width, height, tiles, LAYER_TILES, true); // replace tile id 112 (old invisible tile) with 1311 (new invisible tile) for(size_t x=0; x < tilemap->get_width(); ++x) { for(size_t y=0; y < tilemap->get_height(); ++y) { - const Tile* tile = tilemap->get_tile(x, y); - if(tile->getID() == 112) tilemap->change(x, y, 1311); + uint32_t id = tilemap->get_tile_id(x, y); + if(id == 112) + tilemap->change(x, y, 1311); } } + if (height < 19) tilemap->resize(width, 19); add_object(tilemap); } if(reader.get_vector("background-tm", tiles)) { - TileMap* tilemap = new TileMap(); + TileMap* tilemap = new TileMap(level->get_tileset()); tilemap->set(width, height, tiles, LAYER_BACKGROUNDTILES, false); + if (height < 19) tilemap->resize(width, 19); add_object(tilemap); } if(reader.get_vector("foreground-tm", tiles)) { - TileMap* tilemap = new TileMap(); + TileMap* tilemap = new TileMap(level->get_tileset()); tilemap->set(width, height, tiles, LAYER_FOREGROUNDTILES, false); + + // fill additional space in foreground with tiles of ID 2035 (lightmap/black) + if (height < 19) tilemap->resize(width, 19, 2035); + add_object(tilemap); } @@ -365,13 +400,13 @@ Sector::fix_old_tiles() { for(std::list::iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) { TileMap* solids = *i; - for(size_t x=0; x < solids->get_width(); ++x) { for(size_t y=0; y < solids->get_height(); ++y) { - const Tile* tile = solids->get_tile(x, y); + uint32_t id = solids->get_tile_id(x, y); + const Tile *tile = solids->get_tile(x, y); Vector pos(solids->get_x_offset() + x*32, solids->get_y_offset() + y*32); - if(tile->getID() == 112) { + if(id == 112) { add_object(new InvisibleBlock(pos)); solids->change(x, y, 0); } else if(tile->getAttributes() & Tile::COIN) { @@ -398,23 +433,23 @@ Sector::fix_old_tiles() if (!tm) continue; for(size_t x=0; x < tm->get_width(); ++x) { for(size_t y=0; y < tm->get_height(); ++y) { - const Tile* tile = tm->get_tile(x, y); + uint32_t id = tm->get_tile_id(x, y); Vector pos(tm->get_x_offset() + x*32, tm->get_y_offset() + y*32); Vector center(pos.x + 16, pos.y + 16); // torch - if (tile->getID() == 1517) { + if (id == 1517) { float pseudo_rnd = (float)((int)pos.x % 10) / 10; - add_object(new PulsingLight(center, 1.0 + pseudo_rnd, 0.9, 1.0, Color(1.0, 1.0, 0.6, 1.0))); + add_object(new PulsingLight(center, 1.0f + pseudo_rnd, 0.9f, 1.0f, Color(1.0f, 1.0f, 0.6f, 1.0f))); } // lava or lavaflow - if ((tile->getID() == 173) || (tile->getID() == 1700) || (tile->getID() == 1705) || (tile->getID() == 1706)) { + if ((id == 173) || (id == 1700) || (id == 1705) || (id == 1706)) { // space lights a bit - if (((tm->get_tile(x-1, y)->getID() != tm->get_tile(x,y)->getID()) - && (tm->get_tile(x, y-1)->getID() != tm->get_tile(x,y)->getID())) + if ((((tm->get_tile_id(x-1, y)) != tm->get_tile_id(x,y)) + && (tm->get_tile_id(x, y-1) != tm->get_tile_id(x,y))) || ((x % 3 == 0) && (y % 3 == 0))) { float pseudo_rnd = (float)((int)pos.x % 10) / 10; - add_object(new PulsingLight(center, 1.0 + pseudo_rnd, 0.8, 1.0, Color(1.0, 0.3, 0.0, 1.0))); + add_object(new PulsingLight(center, 1.0f + pseudo_rnd, 0.8f, 1.0f, Color(1.0f, 0.3f, 0.0f, 1.0f))); } } @@ -572,7 +607,7 @@ Sector::activate(const Vector& player_pos) npos.y-=32; player->move(npos); } - + camera->reset(player->get_pos()); update_game_objects(); @@ -613,31 +648,7 @@ Sector::get_active_region() { return Rect( camera->get_translation() - Vector(1600, 1200), - camera->get_translation() + Vector(1600, 1200)); -} - -namespace { - bool is_tilemap_solid(const TileMap* tm) { return tm->is_solid(); } - bool is_tilemap_nonsolid(const TileMap* tm) { return !tm->is_solid(); } -} - -void -Sector::update_solid_tilemap_list() -{ - - // remove non-solid tilemaps from list - solid_tilemaps.erase(std::remove_if(solid_tilemaps.begin(), solid_tilemaps.end(), is_tilemap_nonsolid), solid_tilemaps.end()); - - // if tilemaps are to be added, create new list of solid tilemaps - if (solid_tilemaps.size() != (unsigned int)std::count_if(tilemaps.begin(), tilemaps.end(), is_tilemap_solid)) { - log_debug << "Found new solid tilemaps - this is eeevil! Re-creating list of solid tilemaps." << std::endl; - solid_tilemaps.clear(); - for(std::list::iterator i = tilemaps.begin(); i != tilemaps.end(); i++) { - TileMap* tm = *i; - if (tm->is_solid()) solid_tilemaps.push_back(tm); - } - } - + camera->get_translation() + Vector(1600, 1200) + Vector(SCREEN_WIDTH,SCREEN_HEIGHT)); } void @@ -645,9 +656,6 @@ Sector::update(float elapsed_time) { player->check_bounds(camera); - // update solid_tilemaps list - update_solid_tilemap_list(); - /* update objects */ for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) { @@ -693,6 +701,18 @@ Sector::update_game_objects() gameobjects.push_back(object); } gameobjects_new.clear(); + + /* update solid_tilemaps list */ + //FIXME: this could be more efficient + solid_tilemaps.clear(); + for(std::vector::iterator i = gameobjects.begin(); + i != gameobjects.end(); ++i) + { + TileMap* tm = dynamic_cast(*i); + if (!tm) continue; + if (tm->is_solid()) solid_tilemaps.push_back(tm); + } + } bool @@ -714,9 +734,8 @@ Sector::before_object_add(GameObject* object) } TileMap* tilemap = dynamic_cast (object); - if(tilemap != NULL) { - tilemaps.push_back(tilemap); - if (tilemap->is_solid()) solid_tilemaps.push_back(tilemap); + if(tilemap != NULL && tilemap->is_solid()) { + solid_tilemaps.push_back(tilemap); } Camera* camera = dynamic_cast (object); @@ -737,6 +756,13 @@ Sector::before_object_add(GameObject* object) this->player = player; } + UsesPhysic *physic_object = dynamic_cast(object); + if(physic_object) + { + physic_object->physic.set_gravity(gravity); + } + + if(_current == this) { try_expose(object); } @@ -773,11 +799,6 @@ Sector::before_object_remove(GameObject* object) if(portable != NULL) { portables.erase(std::find(portables.begin(), portables.end(), portable)); } - TileMap* tilemap = dynamic_cast (object); - if(tilemap != NULL) { - tilemaps.erase(std::find(tilemaps.begin(), tilemaps.end(), tilemap)); - if (tilemap->is_solid()) solid_tilemaps.erase(std::find(solid_tilemaps.begin(), solid_tilemaps.end(), tilemap)); - } Bullet* bullet = dynamic_cast (object); if(bullet != NULL) { bullets.erase(std::find(bullets.begin(), bullets.end(), bullet)); @@ -787,7 +808,7 @@ Sector::before_object_remove(GameObject* object) moving_objects.erase( std::find(moving_objects.begin(), moving_objects.end(), moving_object)); } - + if(_current == this) try_unexpose(object); } @@ -846,7 +867,7 @@ Sector::draw(DrawingContext& context) } if(show_collrects) { - Color col(0.2, 0.2, 0.2, 0.7); + Color col(0.2f, 0.2f, 0.2f, 0.7f); for(MovingObjects::iterator i = moving_objects.begin(); i != moving_objects.end(); ++i) { MovingObject* object = *i; @@ -868,16 +889,23 @@ static const float SHIFT_DELTA = 7.0f; /** r1 is supposed to be moving, r2 a solid object */ void check_collisions(collision::Constraints* constraints, const Vector& movement, const Rect& r1, const Rect& r2, - GameObject* object = NULL, MovingObject* other = NULL) + GameObject* object = NULL, MovingObject* other = NULL, const Vector& addl_ground_movement = Vector(0,0)) { if(!collision::intersects(r1, r2)) return; + MovingObject *moving_object = dynamic_cast (object); + CollisionHit dummy; + if(other != NULL && !other->collides(*object, dummy)) + return; + if(moving_object != NULL && !moving_object->collides(*other, dummy)) + return; + // calculate intersection - float itop = r1.get_bottom() - r2.get_top(); + float itop = r1.get_bottom() - r2.get_top(); float ibottom = r2.get_bottom() - r1.get_top(); - float ileft = r1.get_right() - r2.get_left(); - float iright = r2.get_right() - r1.get_left(); + float ileft = r1.get_right() - r2.get_left(); + float iright = r2.get_right() - r1.get_left(); if(fabsf(movement.y) > fabsf(movement.x)) { if(ileft < SHIFT_DELTA) { @@ -898,14 +926,15 @@ void check_collisions(collision::Constraints* constraints, } } + constraints->ground_movement += addl_ground_movement; if(other != NULL) { - CollisionHit dummy; HitResponse response = other->collision(*object, dummy); if(response == PASSTHROUGH) return; + if(other->get_movement() != Vector(0, 0)) { // TODO what todo when we collide with 2 moving objects?!? - constraints->ground_movement = other->get_movement(); + constraints->ground_movement += other->get_movement(); } } @@ -930,7 +959,7 @@ void check_collisions(collision::Constraints* constraints, } } -static const float DELTA = .001; +static const float DELTA = .001f; void Sector::collision_tilemap(collision::Constraints* constraints, @@ -972,10 +1001,10 @@ Sector::collision_tilemap(collision::Constraints* constraints, Vector p2((x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset()); triangle = AATriangle(p1, p2, tile->getData()); - collision::rectangle_aatriangle(constraints, dest, triangle); + collision::rectangle_aatriangle(constraints, dest, triangle, solids->get_movement()); } else { // normal rectangular tile Rect rect(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset(), (x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset()); - check_collisions(constraints, movement, dest, rect); + check_collisions(constraints, movement, dest, rect, NULL, NULL, solids->get_movement()); } } } @@ -1056,12 +1085,19 @@ Sector::collision_object(MovingObject* object1, MovingObject* object2) const Vector normal; get_hit_normal(r1, r2, hit, normal); + if(!object1->collides(*object2, hit)) + return; + std::swap(hit.left, hit.right); + std::swap(hit.top, hit.bottom); + if(!object2->collides(*object1, hit)) + return; + std::swap(hit.left, hit.right); + std::swap(hit.top, hit.bottom); + HitResponse response1 = object1->collision(*object2, hit); std::swap(hit.left, hit.right); std::swap(hit.top, hit.bottom); HitResponse response2 = object2->collision(*object1, hit); - assert( response1 != SOLID && response1 != PASSTHROUGH ); - assert( response2 != SOLID && response2 != PASSTHROUGH ); if(response1 == CONTINUE && response2 == CONTINUE) { normal *= (0.5 + DELTA); object1->dest.move(-normal); @@ -1152,8 +1188,10 @@ Sector::collision_static_constrains(MovingObject& object) if(constraints.right < infinity) { float width = constraints.right - constraints.left; if(width + SHIFT_DELTA < owidth) { +#if 0 printf("Object %p crushed horizontally... L:%f R:%f\n", &object, constraints.left, constraints.right); +#endif CollisionHit h; h.left = true; h.right = true; @@ -1182,7 +1220,9 @@ Sector::collision_static_constrains(MovingObject& object) if(constraints.bottom < infinity) { float height = constraints.bottom - constraints.top; if(height + SHIFT_DELTA < oheight) { +#if 0 printf("Object %p crushed vertically...\n", &object); +#endif CollisionHit h; h.top = true; h.bottom = true; @@ -1192,6 +1232,10 @@ Sector::collision_static_constrains(MovingObject& object) } } +namespace { + const float MAX_SPEED = 16.0f; +} + void Sector::handle_collisions() { @@ -1201,6 +1245,13 @@ Sector::handle_collisions() for(MovingObjects::iterator i = moving_objects.begin(); i != moving_objects.end(); ++i) { MovingObject* moving_object = *i; + Vector mov = moving_object->get_movement(); + + // make sure movement is never faster than MAX_SPEED. Norm is pretty fat, so two addl. checks are done before. + if (((mov.x > MAX_SPEED * M_SQRT1_2) || (mov.y > MAX_SPEED * M_SQRT1_2)) && (mov.norm() > MAX_SPEED)) { + moving_object->movement = mov.unit() * MAX_SPEED; + //log_debug << "Temporarily reduced object's speed of " << mov.norm() << " to " << moving_object->movement.norm() << "." << std::endl; + } moving_object->dest = moving_object->get_bbox(); moving_object->dest.move(moving_object->get_movement()); @@ -1257,6 +1308,11 @@ Sector::handle_collisions() CollisionHit hit; get_hit_normal(moving_object->dest, moving_object_2->dest, hit, normal); + if(!moving_object->collides(*moving_object_2, hit)) + continue; + if(!moving_object_2->collides(*moving_object, hit)) + continue; + moving_object->collision(*moving_object_2, hit); moving_object_2->collision(*moving_object, hit); } @@ -1296,7 +1352,7 @@ Sector::handle_collisions() } bool -Sector::is_free_of_tiles(const Rect& rect) const +Sector::is_free_of_tiles(const Rect& rect, const bool ignoreUnisolid) const { using namespace collision; @@ -1321,7 +1377,8 @@ Sector::is_free_of_tiles(const Rect& rect) const Constraints constraints; return collision::rectangle_aatriangle(&constraints, rect, triangle); } - if(tile->getAttributes() & Tile::SOLID) return false; + if((tile->getAttributes() & Tile::SOLID) && !ignoreUnisolid) return false; + if((tile->getAttributes() & Tile::SOLID) && !(tile->getAttributes() & Tile::UNISOLID)) return false; } } } @@ -1330,11 +1387,11 @@ Sector::is_free_of_tiles(const Rect& rect) const } bool -Sector::is_free_of_statics(const Rect& rect, const MovingObject* ignore_object) const +Sector::is_free_of_statics(const Rect& rect, const MovingObject* ignore_object, const bool ignoreUnisolid) const { using namespace collision; - if (!is_free_of_tiles(rect)) return false; + if (!is_free_of_tiles(rect, ignoreUnisolid)) return false; for(MovingObjects::const_iterator i = moving_objects.begin(); i != moving_objects.end(); ++i) { @@ -1361,7 +1418,7 @@ Sector::is_free_of_movingstatics(const Rect& rect, const MovingObject* ignore_ob const MovingObject* moving_object = *i; if (moving_object == ignore_object) continue; if (!moving_object->is_valid()) continue; - if ((moving_object->get_group() == COLGROUP_MOVING) + if ((moving_object->get_group() == COLGROUP_MOVING) || (moving_object->get_group() == COLGROUP_MOVING_STATIC) || (moving_object->get_group() == COLGROUP_STATIC)) { if(intersects(rect, moving_object->get_bbox())) return false; @@ -1406,7 +1463,7 @@ Sector::play_music(MusicType type) sound_manager->play_music(music); break; case HERRING_MUSIC: - sound_manager->play_music("music/salcon.ogg"); + sound_manager->play_music("music/invincible.ogg"); break; case HERRING_WARNING_MUSIC: sound_manager->stop_music(TUX_INVINCIBLE_TIME_WARNING); @@ -1442,10 +1499,11 @@ Sector::inside(const Rect& rect) const { for(std::list::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) { TileMap* solids = *i; - bool horizontally = ((rect.p2.x >= 0 + solids->get_x_offset()) && (rect.p1.x <= solids->get_width() * 32 + solids->get_x_offset())); bool vertically = (rect.p1.y <= solids->get_height() * 32 + solids->get_y_offset()); - if (horizontally && vertically) return true; + + if (horizontally && vertically) + return true; } return false; } @@ -1454,11 +1512,14 @@ float Sector::get_width() const { float width = 0; - for(std::list::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) { + for(std::list::const_iterator i = solid_tilemaps.begin(); + i != solid_tilemaps.end(); i++) { TileMap* solids = *i; - - if ((solids->get_width() * 32 + solids->get_x_offset()) > width) width = (solids->get_width() * 32 + solids->get_x_offset()); + if ((solids->get_width() * 32 + solids->get_x_offset()) > width) { + width = solids->get_width() * 32 + solids->get_x_offset(); + } } + return width; } @@ -1466,11 +1527,14 @@ float Sector::get_height() const { float height = 0; - for(std::list::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) { + for(std::list::const_iterator i = solid_tilemaps.begin(); + i != solid_tilemaps.end(); i++) { TileMap* solids = *i; - - if ((solids->get_height() * 32 + solids->get_y_offset()) > height) height = (solids->get_height() * 32 + solids->get_y_offset()); + if ((solids->get_height() * 32 + solids->get_y_offset()) > height) { + height = solids->get_height() * 32 + solids->get_y_offset(); + } } + return height; } @@ -1479,7 +1543,6 @@ Sector::change_solid_tiles(uint32_t old_tile_id, uint32_t new_tile_id) { for(std::list::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) { TileMap* solids = *i; - solids->change_all(old_tile_id, new_tile_id); } } @@ -1510,3 +1573,22 @@ Sector::get_ambient_blue() { return ambient_light.blue; } + +void +Sector::set_gravity(float gravity) +{ + log_warning << "Changing a Sector's gravitational constant might have unforseen side-effects" << std::endl; + + this->gravity = gravity; + + for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) { + GameObject* game_object = *i; + if(!game_object) continue; + if(!game_object->is_valid()) continue; + UsesPhysic *physics_object = dynamic_cast(game_object); + if (!physics_object) continue; + + physics_object->physic.set_gravity(gravity); + } +} +