X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.cpp;h=e155abd04b48c5c25bd403b8d66fe21e2f9aecdd;hb=ab9eab4c870195c2b60ce76b77044c35b31e8806;hp=247a3dec39df6dbba1cb0781ffc9a9c07305badb;hpb=5c21e01c30deee6285d7c08a226f5265390dc0d7;p=supertux.git diff --git a/src/sector.cpp b/src/sector.cpp index 247a3dec3..e155abd04 100644 --- a/src/sector.cpp +++ b/src/sector.cpp @@ -56,6 +56,7 @@ #include "object/invisible_block.hpp" #include "object/bullet.hpp" #include "object/text_object.hpp" +#include "object/portable.hpp" #include "badguy/jumpy.hpp" #include "trigger/sequence_trigger.hpp" #include "player_status.hpp" @@ -69,12 +70,12 @@ bool Sector::show_collrects = false; bool Sector::draw_solids_only = false; Sector::Sector(Level* parent) - : level(parent), currentmusic(LEVEL_MUSIC), gravity(10), - player(0), solids(0), camera(0) + : level(parent), currentmusic(LEVEL_MUSIC), + ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), gravity(10), player(0), camera(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")); // create a new squirrel table for the sector using namespace Scripting; @@ -96,7 +97,7 @@ Sector::Sector(Level* parent) Sector::~Sector() { using namespace Scripting; - + deactivate(); for(ScriptList::iterator i = scripts.begin(); @@ -106,7 +107,7 @@ Sector::~Sector() } sq_release(global_vm, §or_table); sq_collectgarbage(global_vm); - + update_game_objects(); assert(gameobjects_new.size() == 0); @@ -132,7 +133,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") { @@ -157,20 +158,20 @@ Sector::parse_object(const std::string& name, const lisp::Lisp& reader) return partsys; } else if(name == "money") { // for compatibility with old maps return new Jumpy(reader); - } + } try { return create_object(name, reader); } catch(std::exception& e) { log_warning << e.what() << "" << std::endl; } - + return 0; } void Sector::parse(const lisp::Lisp& sector) -{ +{ lisp::ListIterator iter(§or); while(iter.next()) { const std::string& token = iter.item(); @@ -185,6 +186,10 @@ 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_vector( "ambient-light", vColor ); + ambient_light = Color( vColor ); } else { GameObject* object = parse_object(token, *(iter.lisp())); if(object) { @@ -195,14 +200,13 @@ Sector::parse(const lisp::Lisp& sector) update_game_objects(); - if(!solids) - throw std::runtime_error("sector does not contain a solid tile layer."); + if(solid_tilemaps.size() < 1) log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl; fix_old_tiles(); 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(); @@ -228,14 +232,14 @@ Sector::parse_old_format(const lisp::Lisp& reader) bkgd_top.red = static_cast (r) / 255.0f; bkgd_top.green = static_cast (g) / 255.0f; bkgd_top.blue = static_cast (b) / 255.0f; - + reader.get("bkgd_red_bottom", r); reader.get("bkgd_green_bottom", g); reader.get("bkgd_blue_bottom", b); bkgd_bottom.red = static_cast (r) / 255.0f; bkgd_bottom.green = static_cast (g) / 255.0f; bkgd_bottom.blue = static_cast (b) / 255.0f; - + if(backgroundimage != "") { Background* background = new Background(); background->set_image( @@ -272,7 +276,7 @@ Sector::parse_old_format(const lisp::Lisp& reader) int width = 30, height = 15; reader.get("width", width); reader.get("height", height); - + std::vector tiles; if(reader.get_vector("interactive-tm", tiles) || reader.get_vector("tilemap", tiles)) { @@ -328,13 +332,12 @@ 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(); - if(solids == 0) - throw std::runtime_error("sector does not contain a solid tile layer."); + if(solid_tilemaps.size() < 1) log_warning << "sector '" << name << "' does not contain a solid tile layer." << std::endl; fix_old_tiles(); update_game_objects(); @@ -343,28 +346,30 @@ Sector::parse_old_format(const lisp::Lisp& reader) void Sector::fix_old_tiles() { - // hack for now... - 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(x*32, 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); + 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); + } } } } @@ -413,10 +418,10 @@ Sector::run_script(std::istream& in, const std::string& sourcename) i = scripts.erase(i); continue; } - + ++i; } - + HSQOBJECT object = create_thread(global_vm); scripts.push_back(object); @@ -464,7 +469,7 @@ Sector::activate(const std::string& spawnpoint) sp = *i; break; } - } + } if(!sp) { log_warning << "Spawnpoint '" << spawnpoint << "' not found." << std::endl; if(spawnpoint != "main") { @@ -526,11 +531,11 @@ Sector::deactivate() if(SQ_FAILED(sq_deleteslot(vm, -2, SQFalse))) throw Scripting::SquirrelError(vm, "Couldn't unset sector in roottable"); sq_pop(vm, 1); - + for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) { GameObject* object = *i; - + try_unexpose(object); } @@ -556,10 +561,10 @@ Sector::update(float elapsed_time) GameObject* object = *i; if(!object->is_valid()) continue; - + object->update(elapsed_time); } - + /* Handle all possible collisions. */ handle_collisions(); update_game_objects(); @@ -569,37 +574,17 @@ 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; - + if(object->is_valid()) { ++i; continue; } before_object_remove(object); - + object->unref(); i = gameobjects.erase(i); } @@ -611,7 +596,7 @@ Sector::update_game_objects() GameObject* object = *i; before_object_add(object); - + gameobjects.push_back(object); } gameobjects_new.clear(); @@ -621,25 +606,27 @@ 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()) { - if(solids == 0) { - solids = tilemap; - } else { - log_warning << "Another solid tilemaps added. Ignoring" << std::endl; - } + 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; @@ -648,7 +635,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; @@ -659,7 +646,7 @@ Sector::before_object_add(GameObject* object) if(_current == this) { try_expose(object); } - + return true; } @@ -678,6 +665,20 @@ Sector::try_expose(GameObject* object) 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); } @@ -697,17 +698,18 @@ Sector::try_unexpose(GameObject* object) } sq_settop(vm, oldtop); } -} +} void Sector::draw(DrawingContext& context) { + context.set_ambient_color( ambient_light ); context.push_transform(); context.set_translation(camera->get_translation()); for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) { - GameObject* object = *i; + GameObject* object = *i; if(!object->is_valid()) continue; @@ -736,7 +738,7 @@ Sector::draw(DrawingContext& context) } /*------------------------------------------------------------------------- - * Collision Detection + * Collision Detection *-------------------------------------------------------------------------*/ static const float SHIFT_DELTA = 7.0f; @@ -818,37 +820,41 @@ Sector::collision_tilemap(collision::Constraints* constraints, float y1 = dest.get_top(); float y2 = dest.get_bottom(); - // test with all tiles in this rectangle - int starttilex = int(x1) / 32; - int starttiley = int(y1) / 32; - int max_x = int(x2); - int max_y = int(y2+1); - - 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, y*32); - Vector p2((x+1)*32, (y+1)*32); - triangle = AATriangle(p1, p2, tile->getData()); - - collision::rectangle_aatriangle(constraints, dest, triangle); - } else { // normal rectangular tile - Rect rect(x*32, y*32, (x+1)*32, (y+1)*32); - check_collisions(constraints, movement, dest, rect); + for(std::list::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) { + TileMap* solids = *i; + + // test with all tiles in this rectangle + int starttilex = int(x1 - solids->get_x_offset()) / 32; + int starttiley = int(y1 - solids->get_y_offset()) / 32; + int max_x = int(x2 - solids->get_x_offset()); + int max_y = int(y2+1 - solids->get_y_offset()); + + 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); + } } } } @@ -862,19 +868,23 @@ Sector::collision_tile_attributes(const Rect& dest) const float x2 = dest.p2.x; float y2 = dest.p2.y; - // test with all tiles in this rectangle - int starttilex = int(x1) / 32; - int starttiley = int(y1) / 32; - int max_x = int(x2); - int max_y = int(y2); - uint32_t result = 0; - 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(); + for(std::list::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) { + TileMap* solids = *i; + + // test with all tiles in this rectangle + int starttilex = int(x1 - solids->get_x_offset()) / 32; + int starttiley = int(y1 - solids->get_y_offset()) / 32; + int max_x = int(x2 - solids->get_x_offset()); + int max_y = int(y2+1 - solids->get_y_offset()); + + 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(); + } } } @@ -915,7 +925,7 @@ void Sector::collision_object(MovingObject* object1, MovingObject* object2) const { using namespace collision; - + const Rect& r1 = object1->dest; const Rect& r2 = object2->dest; @@ -956,15 +966,18 @@ 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; - - check_collisions(constraints, movement, dest, moving_object->dest, - &object, moving_object); + if(!moving_object->is_valid()) + continue; + + if(moving_object != &object) + check_collisions(constraints, movement, dest, moving_object->bbox, + &object, moving_object); } } -void +void Sector::collision_static_constrains(MovingObject& object) { using namespace collision; @@ -1034,11 +1047,11 @@ Sector::collision_static_constrains(MovingObject& object) } if(constraints.has_constraints()) { - if( constraints.hit.left || constraints.hit.right - || constraints.hit.top || constraints.hit.bottom + if( constraints.hit.left || constraints.hit.right + || constraints.hit.top || constraints.hit.bottom || constraints.hit.crush ) object.collision_solid(constraints.hit); - } + } // an extra pass to make sure we're not crushed horizontally constraints = Constraints(); @@ -1051,7 +1064,7 @@ Sector::collision_static_constrains(MovingObject& object) h.top = true; h.bottom = true; h.crush = true; - object.collision_solid(h); + object.collision_solid(h); } } } @@ -1060,7 +1073,7 @@ void Sector::handle_collisions() { using namespace collision; - + // calculate destination positions of the objects for(MovingObjects::iterator i = moving_objects.begin(); i != moving_objects.end(); ++i) { @@ -1075,6 +1088,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; @@ -1088,6 +1102,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; @@ -1102,7 +1117,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,7 +1137,7 @@ Sector::handle_collisions() moving_object->collision(*moving_object_2, hit); moving_object_2->collision(*moving_object, hit); } - } + } } // part3: COLGROUP_MOVING vs COLGROUP_MOVING @@ -1129,19 +1145,21 @@ 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; collision_object(moving_object, moving_object_2); - } + } } // apply object movement @@ -1158,20 +1176,30 @@ bool Sector::is_free_space(const Rect& rect) const { using namespace collision; - - // test with all tiles in this rectangle - int starttilex = int(rect.p1.x) / 32; - int starttiley = int(rect.p1.y) / 32; - int max_x = int(rect.p2.x); - int max_y = int(rect.p2.y); - - 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::SOLID) - return false; + + for(std::list::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) { + TileMap* solids = *i; + + // test with all tiles in this rectangle + int starttilex = int(rect.p1.x - solids->get_x_offset()) / 32; + int starttiley = int(rect.p1.y - solids->get_y_offset()) / 32; + int max_x = int(rect.p2.x - solids->get_x_offset()); + int max_y = int(rect.p2.y - solids->get_y_offset()); + + 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; + } } } @@ -1255,10 +1283,42 @@ Sector::get_total_badguys() bool Sector::inside(const Rect& rect) const { - if(rect.p1.x > solids->get_width() * 32 - || rect.p1.y > solids->get_height() * 32 - || rect.p2.x < 0) - return false; + 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; + } + return false; +} - return true; +float +Sector::get_width() const +{ + float width = 0; + 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()); + } + return width; +} + +float +Sector::get_height() const +{ + float height = 0; + 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()); + } + return height; +} + +void +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); + } }