X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.hpp;h=5033959c1716ba729d04dc7c8a08641c9163df98;hb=a362e6fbb3f1a812b6dafb6b54e22d1532327ea2;hp=7a973966d5acbc50e2e69f994389fb1e55af812f;hpb=c62711567861587107d124642db29e2674ee6533;p=supertux.git diff --git a/src/sector.hpp b/src/sector.hpp index 7a973966d..5033959c1 100644 --- a/src/sector.hpp +++ b/src/sector.hpp @@ -19,20 +19,25 @@ #ifndef SUPERTUX_SECTOR_H #define SUPERTUX_SECTOR_H -#include #include +#include #include #include +#include #include "direction.hpp" -#include "math/vector.hpp" -#include "video/drawing_context.hpp" +#include "video/color.hpp" +#include "scripting/ssector.hpp" namespace lisp { class Lisp; class Writer; } +namespace collision { +class Constraints; +} +class Vector; class Rect; class Sprite; class GameObject; @@ -40,12 +45,13 @@ class Player; class Camera; class TileMap; class Bullet; -class CollisionGrid; class ScriptInterpreter; class SpawnPoint; class MovingObject; class CollisionHit; class Level; +class Portable; +class DrawingContext; enum MusicType { LEVEL_MUSIC, @@ -54,10 +60,11 @@ enum MusicType { }; /** - * This class holds a sector (a part of a level) and all the game objects in - * the sector + * Represents one of (potentially) multiple, separate parts of a Level. + * + * Sectors contain GameObjects, e.g. Badguys and Players. */ -class Sector +class Sector : public Scripting::SSector { public: Sector(Level* parent); @@ -104,11 +111,10 @@ public: void play_music(MusicType musictype); MusicType get_music_type(); - + bool add_bullet(const Vector& pos, float xm, Direction dir); bool add_smoke_cloud(const Vector& pos); - void add_floating_text(const Vector& pos, const std::string& text); - + /** get currently activated sector. */ static Sector* current() { return _current; } @@ -126,12 +132,28 @@ public: return total; } - void collision_tilemap(const Rect& dest, const Vector& movement, CollisionHit& hit) const; + void collision_tilemap(collision::Constraints* constraints, + const Vector& movement, const Rect& dest) const; - /** Checks if at the specified rectangle are gameobjects with STATIC flag set - * (or solid tiles from the tilemap) + /** + * Checks if the specified rectangle is free of (solid) tiles. + * Note that this does not include static objects, e.g. bonus blocks. */ - bool is_free_space(const Rect& rect) const; + bool is_free_of_tiles(const Rect& rect, const bool ignoreUnisolid = false) const; + /** + * Checks if the specified rectangle is free of both + * 1.) solid tiles and + * 2.) MovingObjects in COLGROUP_STATIC. + * Note that this does not include badguys or players. + */ + bool is_free_of_statics(const Rect& rect, const MovingObject* ignore_object = 0, const bool ignoreUnisolid = false) const; + /** + * Checks if the specified rectangle is free of both + * 1.) solid tiles and + * 2.) MovingObjects in COLGROUP_STATIC, COLGROUP_MOVINGSTATIC or COLGROUP_MOVING. + * This includes badguys and players. + */ + bool is_free_of_movingstatics(const Rect& rect, const MovingObject* ignore_object = 0) const; /** * returns a list of players currently in the sector @@ -142,9 +164,34 @@ public: Rect get_active_region(); + /** + * returns the width (in px) of a sector) + */ + float get_width() const; + + /** + * returns the height (in px) of a sector) + */ + float get_height() const; + + /** + * globally changes solid tilemaps' tile ids + */ + void change_solid_tiles(uint32_t old_tile_id, uint32_t new_tile_id); + typedef std::vector GameObjects; typedef std::vector MovingObjects; typedef std::vector SpawnPoints; + typedef std::vector Portables; + + // --- Scripting --- + /** + * get/set color of ambient light + */ + void set_ambient_light(float red, float green, float blue); + float get_ambient_red(); + float get_ambient_green(); + float get_ambient_blue(); private: Level* level; /**< Parent level containing this sector */ @@ -155,21 +202,40 @@ private: void try_expose(GameObject* object); void try_unexpose(GameObject* object); - - bool collision_static(MovingObject* object, const Vector& movement); - + void try_expose_me(); + void try_unexpose_me(); + /** Checks for all possible collisions. And calls the collision_handlers, which the collision_objects provide for this case (or not). */ void handle_collisions(); - + + /** + * Does collision detection between 2 objects and does instant + * collision response handling in case of a collision + */ void collision_object(MovingObject* object1, MovingObject* object2) const; + + /** + * Does collision detection of an object against all other static + * objects (and the tilemap) in the level. Collision response is done + * for the first hit in time. (other hits get ignored, the function + * should be called repeatedly to resolve those) + * + * returns true if the collision detection should be aborted for this object + * (because of ABORT_MOVE in the collision response or no collisions) + */ + void collision_static(collision::Constraints* constraints, + const Vector& movement, const Rect& dest, GameObject& object); + + void collision_static_constrains(MovingObject& object); + GameObject* parse_object(const std::string& name, const lisp::Lisp& lisp); void fix_old_tiles(); static Sector* _current; - + std::string name; std::vector bullets; @@ -178,24 +244,25 @@ private: /// container for newly created objects, they'll be added in Sector::update GameObjects gameobjects_new; - - MusicType currentmusic; - std::auto_ptr grid; + MusicType currentmusic; HSQOBJECT sector_table; /// sector scripts typedef std::vector ScriptList; ScriptList scripts; + Color ambient_light; + public: // TODO make this private again /// show collision rectangles of moving objects (for debugging) static bool show_collrects; static bool draw_solids_only; - + GameObjects gameobjects; MovingObjects moving_objects; - SpawnPoints spawnpoints; + SpawnPoints spawnpoints; + Portables portables; std::string music; float gravity; @@ -203,9 +270,8 @@ public: // TODO make this private again // some special objects, where we need direct access // (try to avoid accessing them directly) Player* player; - TileMap* solids; + std::list solid_tilemaps; Camera* camera; }; #endif -