X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsector.cpp;h=75cede4625843669c5d2bbf9ea5b371894025f74;hb=7e15c4f871809033278711a6e9327616da00c4c9;hp=f9aaf7cd122d30b2f66b2768451c6d7a4be3d765;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git diff --git a/src/sector.cpp b/src/sector.cpp index f9aaf7cd1..75cede462 100644 --- a/src/sector.cpp +++ b/src/sector.cpp @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include "sector.hpp" #include "object/player.hpp" @@ -42,8 +44,11 @@ #include "lisp/writer.hpp" #include "lisp/list_iterator.hpp" #include "tile.hpp" +#include "file_system.hpp" +#include "physfs/physfs_stream.hpp" #include "audio/sound_manager.hpp" #include "game_session.hpp" +#include "constants.hpp" #include "resources.hpp" #include "statistics.hpp" #include "object_factory.hpp" @@ -54,14 +59,20 @@ #include "object/coin.hpp" #include "object/block.hpp" #include "object/invisible_block.hpp" +#include "object/light.hpp" +#include "object/pulsing_light.hpp" #include "object/bullet.hpp" #include "object/text_object.hpp" +#include "object/portable.hpp" +#include "object/display_effect.hpp" #include "badguy/jumpy.hpp" #include "trigger/sequence_trigger.hpp" #include "player_status.hpp" #include "scripting/squirrel_util.hpp" #include "script_interface.hpp" #include "log.hpp" +#include "main.hpp" +#include "level.hpp" Sector* Sector::_current = 0; @@ -69,12 +80,14 @@ bool Sector::show_collrects = false; bool Sector::draw_solids_only = false; Sector::Sector(Level* parent) - : level(parent), currentmusic(LEVEL_MUSIC), gravity(10), - player(0), camera(0) + : level(parent), currentmusic(LEVEL_MUSIC), + ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), gravity(10.0), player(0), camera(0), effect(0) { - add_object(new Player(player_status)); - add_object(new DisplayEffect()); - add_object(new TextObject()); + 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; @@ -132,7 +145,7 @@ GameObject* Sector::parse_object(const std::string& name, const lisp::Lisp& reader) { if(name == "camera") { - Camera* camera = new Camera(this); + Camera* camera = new Camera(this, "Camera"); camera->parse(reader); return camera; } else if(name == "particles-snow") { @@ -171,6 +184,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(); @@ -185,14 +199,33 @@ Sector::parse(const lisp::Lisp& sector) spawnpoints.push_back(sp); } else if(token == "init-script") { iter.value()->get(init_script); + } else if(token == "ambient-light") { + std::vector vColor; + sector.get( "ambient-light", vColor ); + if(vColor.size() < 3) { + log_warning << "(ambient-light) requires a color as argument" << std::endl; + } else { + ambient_light = Color( vColor ); + } } 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; @@ -201,7 +234,7 @@ Sector::parse(const lisp::Lisp& sector) if(!camera) { log_warning << "sector '" << name << "' does not contain a camera." << std::endl; update_game_objects(); - add_object(new Camera(this)); + add_object(new Camera(this, "Camera")); } update_game_objects(); @@ -214,7 +247,17 @@ Sector::parse_old_format(const lisp::Lisp& reader) reader.get("gravity", gravity); std::string backgroundimage; - reader.get("background", backgroundimage); + 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; @@ -237,8 +280,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(); @@ -265,7 +307,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; @@ -273,22 +318,38 @@ Sector::parse_old_format(const lisp::Lisp& reader) reader.get("height", height); std::vector tiles; - if(reader.get_vector("interactive-tm", tiles) - || reader.get_vector("tilemap", tiles)) { - TileMap* tilemap = new TileMap(); + if(reader.get("interactive-tm", tiles) + || reader.get("tilemap", tiles)) { + 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) { + 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(); + if(reader.get("background-tm", tiles)) { + 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(); + if(reader.get("foreground-tm", tiles)) { + 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); } @@ -327,7 +388,7 @@ Sector::parse_old_format(const lisp::Lisp& reader) } // add a camera - Camera* camera = new Camera(this); + Camera* camera = new Camera(this, "Camera"); add_object(camera); update_game_objects(); @@ -341,51 +402,83 @@ Sector::parse_old_format(const lisp::Lisp& reader) void Sector::fix_old_tiles() { - // hack for now... 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); - Vector pos(solids->get_x_offset() + x*32, solids->get_y_offset() + y*32); - - if(tile->getID() == 112) { - add_object(new InvisibleBlock(pos)); - solids->change(x, y, 0); - } else if(tile->getAttributes() & Tile::COIN) { - add_object(new Coin(pos)); - solids->change(x, y, 0); - } else if(tile->getAttributes() & Tile::FULLBOX) { - add_object(new BonusBlock(pos, tile->getData())); - solids->change(x, y, 0); - } else if(tile->getAttributes() & Tile::BRICK) { - add_object(new Brick(pos, tile->getData())); - solids->change(x, y, 0); - } else if(tile->getAttributes() & Tile::GOAL) { - std::string sequence = tile->getData() == 0 ? "endsequence" : "stoptux"; - add_object(new SequenceTrigger(pos, sequence)); - solids->change(x, y, 0); - } + 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(id == 112) { + add_object(new InvisibleBlock(pos)); + solids->change(x, y, 0); + } else if(tile->getAttributes() & Tile::COIN) { + add_object(new Coin(pos)); + solids->change(x, y, 0); + } else if(tile->getAttributes() & Tile::FULLBOX) { + add_object(new BonusBlock(pos, tile->getData())); + solids->change(x, y, 0); + } else if(tile->getAttributes() & Tile::BRICK) { + add_object(new Brick(pos, tile->getData())); + solids->change(x, y, 0); + } else if(tile->getAttributes() & Tile::GOAL) { + std::string sequence = tile->getData() == 0 ? "endsequence" : "stoptux"; + add_object(new SequenceTrigger(pos, sequence)); + solids->change(x, y, 0); + } + } + } + } + + // add lights for special tiles + for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); i++) { + TileMap* tm = dynamic_cast(*i); + if (!tm) continue; + for(size_t x=0; x < tm->get_width(); ++x) { + for(size_t y=0; y < tm->get_height(); ++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 (id == 1517) { + float pseudo_rnd = (float)((int)pos.x % 10) / 10; + 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 ((id == 173) || (id == 1700) || (id == 1705) || (id == 1706)) { + // space lights a bit + 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.0f + pseudo_rnd, 0.8f, 1.0f, Color(1.0f, 0.3f, 0.0f, 1.0f))); + } + } + } } } + + } void Sector::write(lisp::Writer& writer) { - writer.write_string("name", name); - writer.write_float("gravity", gravity); - writer.write_string("music", music); + writer.write("name", name); + writer.write("gravity", gravity); + writer.write("music", music); // write spawnpoints for(SpawnPoints::iterator i = spawnpoints.begin(); i != spawnpoints.end(); ++i) { SpawnPoint* spawn = *i; writer.start_list("spawn-points"); - writer.write_string("name", spawn->name); - writer.write_float("x", spawn->pos.x); - writer.write_float("y", spawn->pos.y); + writer.write("name", spawn->name); + writer.write("x", spawn->pos.x); + writer.write("y", spawn->pos.y); writer.end_list("spawn-points"); } @@ -427,7 +520,11 @@ Sector::run_script(std::istream& in, const std::string& sourcename) sq_pushobject(vm, sector_table); sq_setroottable(vm); - compile_and_run(vm, in, sourcename); + try { + compile_and_run(vm, in, "Sector " + name + " - " + sourcename); + } catch(std::exception& e) { + log_warning << "Error running script: " << e.what() << std::endl; + } return vm; } @@ -502,15 +599,42 @@ Sector::activate(const Vector& player_pos) try_expose(object); } } + try_expose_me(); + + // spawn smalltux below spawnpoint + if (!player->is_big()) { + player->move(player_pos + Vector(0,32)); + } else { + player->move(player_pos); + } + + // spawning tux in the ground would kill him + if(!is_free_of_tiles(player->get_bbox())) { + log_warning << "Tried spawning Tux in solid matter. Compensating." << std::endl; + Vector npos = player->get_bbox().p1; + npos.y-=32; + player->move(npos); + } - player->move(player_pos); camera->reset(player->get_pos()); update_game_objects(); + //Run default.nut just before init script + //Check to see if it's in a levelset (info file) + std::string basedir = FileSystem::dirname(get_level()->filename); + if(PHYSFS_exists((basedir + "/info").c_str())) { + try { + IFileStream in(basedir + "/default.nut"); + run_script(in, "default.nut"); + } catch(std::exception& ) { + // doesn't exist or erroneous; do nothing + } + } + // Run init script if(init_script != "") { std::istringstream in(init_script); - run_script(in, std::string("Sector(") + name + ") - init"); + run_script(in, "init-script"); } } @@ -535,6 +659,7 @@ Sector::deactivate() try_unexpose(object); } + try_unexpose_me(); _current = NULL; } @@ -543,7 +668,7 @@ Sector::get_active_region() { return Rect( camera->get_translation() - Vector(1600, 1200), - camera->get_translation() + Vector(1600, 1200)); + camera->get_translation() + Vector(1600, 1200) + Vector(SCREEN_WIDTH,SCREEN_HEIGHT)); } void @@ -570,26 +695,6 @@ void Sector::update_game_objects() { /** cleanup marked objects */ - for(std::vector::iterator i = bullets.begin(); - i != bullets.end(); /* nothing */) { - Bullet* bullet = *i; - if(bullet->is_valid()) { - ++i; - continue; - } - - i = bullets.erase(i); - } - for(MovingObjects::iterator i = moving_objects.begin(); - i != moving_objects.end(); /* nothing */) { - MovingObject* moving_object = *i; - if(moving_object->is_valid()) { - ++i; - continue; - } - - i = moving_objects.erase(i); - } for(std::vector::iterator i = gameobjects.begin(); i != gameobjects.end(); /* nothing */) { GameObject* object = *i; @@ -616,25 +721,45 @@ 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 Sector::before_object_add(GameObject* object) { Bullet* bullet = dynamic_cast (object); - if(bullet) + if(bullet != NULL) { bullets.push_back(bullet); + } MovingObject* movingobject = dynamic_cast (object); - if(movingobject) { + if(movingobject != NULL) { moving_objects.push_back(movingobject); } + Portable* portable = dynamic_cast (object); + if(portable != NULL) { + portables.push_back(portable); + } + TileMap* tilemap = dynamic_cast (object); - if(tilemap && tilemap->is_solid()) solid_tilemaps.push_back(tilemap); + if(tilemap != NULL && tilemap->is_solid()) { + solid_tilemaps.push_back(tilemap); + } Camera* camera = dynamic_cast (object); - if(camera) { + if(camera != NULL) { if(this->camera != 0) { log_warning << "Multiple cameras added. Ignoring" << std::endl; return false; @@ -643,7 +768,7 @@ Sector::before_object_add(GameObject* object) } Player* player = dynamic_cast (object); - if(player) { + if(player != NULL) { if(this->player != 0) { log_warning << "Multiple players added. Ignoring" << std::endl; return false; @@ -651,6 +776,22 @@ Sector::before_object_add(GameObject* object) this->player = player; } + DisplayEffect* effect = dynamic_cast (object); + if(effect != NULL) { + if(this->effect != 0) { + log_warning << "Multiple DisplayEffects added. Ignoring" << std::endl; + return false; + } + this->effect = effect; + } + + UsesPhysic *physic_object = dynamic_cast(object); + if(physic_object) + { + physic_object->physic.set_gravity(gravity); + } + + if(_current == this) { try_expose(object); } @@ -671,8 +812,32 @@ Sector::try_expose(GameObject* object) } void +Sector::try_expose_me() +{ + HSQUIRRELVM vm = Scripting::global_vm; + sq_pushobject(vm, sector_table); + Scripting::SSector* interface = static_cast (this); + expose_object(vm, -1, interface, "settings", false); + sq_pop(vm, 1); +} + +void Sector::before_object_remove(GameObject* object) { + Portable* portable = dynamic_cast (object); + if(portable != NULL) { + portables.erase(std::find(portables.begin(), portables.end(), portable)); + } + Bullet* bullet = dynamic_cast (object); + if(bullet != NULL) { + bullets.erase(std::find(bullets.begin(), bullets.end(), bullet)); + } + MovingObject* moving_object = dynamic_cast (object); + if(moving_object != NULL) { + moving_objects.erase( + std::find(moving_objects.begin(), moving_objects.end(), moving_object)); + } + if(_current == this) try_unexpose(object); } @@ -695,8 +860,22 @@ Sector::try_unexpose(GameObject* object) } void +Sector::try_unexpose_me() +{ + HSQUIRRELVM vm = Scripting::global_vm; + SQInteger oldtop = sq_gettop(vm); + sq_pushobject(vm, sector_table); + try { + Scripting::unexpose_object(vm, -1, "settings"); + } catch(std::exception& e) { + log_warning << "Couldn't unregister object: " << e.what() << std::endl; + } + sq_settop(vm, oldtop); +} +void Sector::draw(DrawingContext& context) { + context.set_ambient_color( ambient_light ); context.push_transform(); context.set_translation(camera->get_translation()); @@ -717,7 +896,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; @@ -734,21 +913,26 @@ Sector::draw(DrawingContext& context) * Collision Detection *-------------------------------------------------------------------------*/ -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) { @@ -769,11 +953,12 @@ 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(); @@ -801,8 +986,6 @@ void check_collisions(collision::Constraints* constraints, } } -static const float DELTA = .001; - void Sector::collision_tilemap(collision::Constraints* constraints, const Vector& movement, const Rect& dest) const @@ -824,30 +1007,30 @@ Sector::collision_tilemap(collision::Constraints* constraints, for(int x = starttilex; x*32 < max_x; ++x) { for(int y = starttiley; y*32 < max_y; ++y) { - const Tile* tile = solids->get_tile(x, y); - if(!tile) - continue; - // skip non-solid tiles - if((tile->getAttributes() & Tile::SOLID) == 0) - continue; - // only handle unisolid when the player is falling down and when he was - // above the tile before - if(tile->getAttributes() & Tile::UNISOLID) { - if(movement.y <= 0 || dest.get_bottom() - movement.y - SHIFT_DELTA > y*32) - continue; - } - - if(tile->getAttributes() & Tile::SLOPE) { // slope tile - AATriangle triangle; - Vector p1(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset()); - 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); - } 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); - } + const Tile* tile = solids->get_tile(x, y); + if(!tile) + continue; + // skip non-solid tiles + if((tile->getAttributes() & Tile::SOLID) == 0) + continue; + // only handle unisolid when the player is falling down and when he was + // above the tile before + if(tile->getAttributes() & Tile::UNISOLID) { + if(movement.y <= 0 || dest.get_bottom() - movement.y - SHIFT_DELTA > y*32) + continue; + } + + if(tile->getAttributes() & Tile::SLOPE) { // slope tile + AATriangle triangle; + Vector p1(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset()); + 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, 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, NULL, NULL, solids->get_movement()); + } } } } @@ -859,7 +1042,7 @@ Sector::collision_tile_attributes(const Rect& dest) const float x1 = dest.p1.x; float y1 = dest.p1.y; float x2 = dest.p2.x; - float y2 = dest.p2.y; + float y2 = dest.p2.y + SHIFT_DELTA; uint32_t result = 0; for(std::list::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) { @@ -873,10 +1056,10 @@ Sector::collision_tile_attributes(const Rect& dest) const for(int x = starttilex; x*32 < max_x; ++x) { for(int y = starttiley; y*32 < max_y; ++y) { - const Tile* tile = solids->get_tile(x, y); - if(!tile) - continue; - result |= tile->getAttributes(); + const Tile* tile = solids->get_tile(x, y); + if(!tile) + continue; + result |= tile->getAttributes(); } } } @@ -927,12 +1110,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); @@ -959,11 +1149,14 @@ Sector::collision_static(collision::Constraints* constraints, i != moving_objects.end(); ++i) { MovingObject* moving_object = *i; if(moving_object->get_group() != COLGROUP_STATIC - || !moving_object->is_valid()) + && moving_object->get_group() != COLGROUP_MOVING_STATIC) + continue; + if(!moving_object->is_valid()) continue; - check_collisions(constraints, movement, dest, moving_object->dest, - &object, moving_object); + if(moving_object != &object) + check_collisions(constraints, movement, dest, moving_object->bbox, + &object, moving_object); } } @@ -971,6 +1164,7 @@ void Sector::collision_static_constrains(MovingObject& object) { using namespace collision; + float infinity = (std::numeric_limits::has_infinity ? std::numeric_limits::infinity() : std::numeric_limits::max()); Constraints constraints; Vector movement = object.get_movement(); @@ -984,7 +1178,7 @@ Sector::collision_static_constrains(MovingObject& object) break; // apply calculated horizontal constraints - if(constraints.bottom < INFINITY) { + if(constraints.bottom < infinity) { float height = constraints.bottom - constraints.top; if(height < oheight) { // we're crushed, but ignore this for now, we'll get this again @@ -993,7 +1187,7 @@ Sector::collision_static_constrains(MovingObject& object) } dest.p2.y = constraints.bottom - DELTA; dest.p1.y = dest.p2.y - oheight; - } else if(constraints.top > -INFINITY) { + } else if(constraints.top > -infinity) { dest.p1.y = constraints.top + DELTA; dest.p2.y = dest.p1.y + oheight; } @@ -1016,11 +1210,13 @@ Sector::collision_static_constrains(MovingObject& object) break; // apply calculated vertical constraints - if(constraints.right < INFINITY) { + 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; @@ -1030,7 +1226,7 @@ Sector::collision_static_constrains(MovingObject& object) dest.p2.x = constraints.right - DELTA; dest.p1.x = dest.p2.x - owidth; } - } else if(constraints.left > -INFINITY) { + } else if(constraints.left > -infinity) { dest.p1.x = constraints.left + DELTA; dest.p2.x = dest.p1.x + owidth; } @@ -1046,10 +1242,12 @@ Sector::collision_static_constrains(MovingObject& object) // an extra pass to make sure we're not crushed horizontally constraints = Constraints(); collision_static(&constraints, movement, dest, object); - if(constraints.bottom < INFINITY) { + 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; @@ -1059,6 +1257,10 @@ Sector::collision_static_constrains(MovingObject& object) } } +namespace { + const float MAX_SPEED = 16.0f; +} + void Sector::handle_collisions() { @@ -1068,6 +1270,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()); @@ -1078,6 +1287,7 @@ Sector::handle_collisions() i != moving_objects.end(); ++i) { MovingObject* moving_object = *i; if((moving_object->get_group() != COLGROUP_MOVING + && moving_object->get_group() != COLGROUP_MOVING_STATIC && moving_object->get_group() != COLGROUP_MOVING_ONLY_STATIC) || !moving_object->is_valid()) continue; @@ -1091,6 +1301,7 @@ Sector::handle_collisions() i != moving_objects.end(); ++i) { MovingObject* moving_object = *i; if((moving_object->get_group() != COLGROUP_MOVING + && moving_object->get_group() != COLGROUP_MOVING_STATIC && moving_object->get_group() != COLGROUP_MOVING_ONLY_STATIC) || !moving_object->is_valid()) continue; @@ -1105,7 +1316,8 @@ Sector::handle_collisions() for(MovingObjects::iterator i = moving_objects.begin(); i != moving_objects.end(); ++i) { MovingObject* moving_object = *i; - if(moving_object->get_group() != COLGROUP_MOVING + if((moving_object->get_group() != COLGROUP_MOVING + && moving_object->get_group() != COLGROUP_MOVING_STATIC) || !moving_object->is_valid()) continue; @@ -1121,6 +1333,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); } @@ -1132,14 +1349,16 @@ Sector::handle_collisions() i != moving_objects.end(); ++i) { MovingObject* moving_object = *i; - if(moving_object->get_group() != COLGROUP_MOVING + if((moving_object->get_group() != COLGROUP_MOVING + && moving_object->get_group() != COLGROUP_MOVING_STATIC) || !moving_object->is_valid()) continue; for(MovingObjects::iterator i2 = i+1; i2 != moving_objects.end(); ++i2) { MovingObject* moving_object_2 = *i2; - if(moving_object_2->get_group() != COLGROUP_MOVING + if((moving_object_2->get_group() != COLGROUP_MOVING + && moving_object_2->get_group() != COLGROUP_MOVING_STATIC) || !moving_object_2->is_valid()) continue; @@ -1158,7 +1377,7 @@ Sector::handle_collisions() } bool -Sector::is_free_space(const Rect& rect) const +Sector::is_free_of_tiles(const Rect& rect, const bool ignoreUnisolid) const { using namespace collision; @@ -1173,30 +1392,61 @@ Sector::is_free_space(const Rect& rect) const for(int x = starttilex; x*32 <= max_x; ++x) { for(int y = starttiley; y*32 <= max_y; ++y) { - const Tile* tile = solids->get_tile(x, y); - if(!tile) continue; - if(tile->getAttributes() & Tile::SLOPE) { - AATriangle triangle; - Vector p1(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset()); - Vector p2((x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset()); - triangle = AATriangle(p1, p2, tile->getData()); - Constraints constraints; - return collision::rectangle_aatriangle(&constraints, rect, triangle); - } - if(tile->getAttributes() & Tile::SOLID) return false; + const Tile* tile = solids->get_tile(x, y); + if(!tile) continue; + if(tile->getAttributes() & Tile::SLOPE) { + AATriangle triangle; + Vector p1(x*32 + solids->get_x_offset(), y*32 + solids->get_y_offset()); + Vector p2((x+1)*32 + solids->get_x_offset(), (y+1)*32 + solids->get_y_offset()); + triangle = AATriangle(p1, p2, tile->getData()); + Constraints constraints; + if(collision::rectangle_aatriangle(&constraints, rect, triangle) && (!ignoreUnisolid || !(tile->getAttributes() & Tile::UNISOLID))) return false; + } + if((tile->getAttributes() & Tile::SOLID) && (!ignoreUnisolid || !(tile->getAttributes() & Tile::UNISOLID))) return false; } } } + return true; +} + +bool +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, ignoreUnisolid)) return false; + for(MovingObjects::const_iterator i = moving_objects.begin(); i != moving_objects.end(); ++i) { const MovingObject* moving_object = *i; - if(moving_object->get_group() != COLGROUP_STATIC - || !moving_object->is_valid()) - continue; + if (moving_object == ignore_object) continue; + if (!moving_object->is_valid()) continue; + if (moving_object->get_group() == COLGROUP_STATIC) { + if(intersects(rect, moving_object->get_bbox())) return false; + } + } - if(intersects(rect, moving_object->get_bbox())) - return false; + return true; +} + +bool +Sector::is_free_of_movingstatics(const Rect& rect, const MovingObject* ignore_object) const +{ + using namespace collision; + + if (!is_free_of_tiles(rect)) return false; + + for(MovingObjects::const_iterator i = moving_objects.begin(); + i != moving_objects.end(); ++i) { + const MovingObject* moving_object = *i; + if (moving_object == ignore_object) continue; + if (!moving_object->is_valid()) continue; + 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; + } } return true; @@ -1208,9 +1458,12 @@ Sector::add_bullet(const Vector& pos, float xm, Direction dir) // TODO remove this function and move these checks elsewhere... Bullet* new_bullet = 0; - if((int)bullets.size() >= player_status->max_fire_bullets) + if((player_status->bonus == FIRE_BONUS && + (int)bullets.size() >= player_status->max_fire_bullets) || + (player_status->bonus == ICE_BONUS && + (int)bullets.size() >= player_status->max_ice_bullets)) return false; - new_bullet = new Bullet(pos, xm, dir); + new_bullet = new Bullet(pos, xm, dir, player_status->bonus); add_object(new_bullet); sound_manager->play("sounds/shoot.wav"); @@ -1234,7 +1487,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); @@ -1272,7 +1525,9 @@ Sector::inside(const Rect& rect) const 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; } @@ -1281,10 +1536,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; } @@ -1292,10 +1551,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; } @@ -1307,3 +1570,49 @@ Sector::change_solid_tiles(uint32_t old_tile_id, uint32_t new_tile_id) solids->change_all(old_tile_id, new_tile_id); } } + + +void +Sector::set_ambient_light(float red, float green, float blue) +{ + ambient_light.red = red; + ambient_light.green = green; + ambient_light.blue = blue; +} + +float +Sector::get_ambient_red() +{ + return ambient_light.red; +} + +float +Sector::get_ambient_green() +{ + return ambient_light.green; +} + +float +Sector::get_ambient_blue() +{ + return ambient_light.blue; +} + +void +Sector::set_gravity(float gravity) +{ + log_warning << "Changing a Sector's gravitational constant might have unforeseen 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); + } +} +