X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fenvironment.h;h=b35ca42496b175bd4eea290b42faac9d2faddc68;hb=87b9cdab07f70a7f2dd6531650242b0893eb5930;hp=03c21b08ccff55aad7963da7e003876ddf4f8d59;hpb=2b119e1e192ead701e69e261fe94ccb7382dbee7;p=dragonfireclient.git diff --git a/src/environment.h b/src/environment.h index 03c21b08c..b35ca4249 100644 --- a/src/environment.h +++ b/src/environment.h @@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include +#include #include #include "irr_v3d.h" #include "activeobject.h" @@ -75,28 +76,19 @@ class Environment Player * getPlayer(const char *name); Player * getRandomConnectedPlayer(); Player * getNearestConnectedPlayer(v3f pos); - std::list getPlayers(); - std::list getPlayers(bool ignore_disconnected); - + std::vector getPlayers(); + std::vector getPlayers(bool ignore_disconnected); + u32 getDayNightRatio(); // 0-23999 - virtual void setTimeOfDay(u32 time) - { - m_time_of_day = time; - m_time_of_day_f = (float)time / 24000.0; - } - - u32 getTimeOfDay() - { return m_time_of_day; } - - float getTimeOfDayF() - { return m_time_of_day_f; } + virtual void setTimeOfDay(u32 time); + u32 getTimeOfDay(); + float getTimeOfDayF(); void stepTimeOfDay(float dtime); void setTimeOfDaySpeed(float speed); - float getTimeOfDaySpeed(); void setDayNightRatioOverride(bool enable, u32 value) @@ -110,7 +102,7 @@ class Environment protected: // peer_ids in here should be unique, except that there may be many 0s - std::list m_players; + std::vector m_players; // Time of day in milli-hours (0-23999); determines day and night u32 m_time_of_day; // Time of day in 0...1 @@ -132,9 +124,10 @@ class Environment * a later release. */ bool m_cache_enable_shaders; - + private: - JMutex m_lock; + JMutex m_timeofday_lock; + JMutex m_time_lock; }; @@ -150,7 +143,7 @@ class ActiveBlockModifier public: ActiveBlockModifier(){}; virtual ~ActiveBlockModifier(){}; - + // Set of contents to trigger on virtual std::set getTriggerContents()=0; // Set of required neighbors (trigger doesn't happen if none are found) @@ -182,7 +175,7 @@ struct ABMWithState class ActiveBlockList { public: - void update(std::list &active_positions, + void update(std::vector &active_positions, s16 radius, std::set &blocks_removed, std::set &blocks_added); @@ -255,7 +248,7 @@ class ServerEnvironment : public Environment Returns 0 if not added and thus deleted. */ u16 addActiveObject(ServerActiveObject *object); - + /* Add an active object as a static object to the corresponding MapBlock. @@ -264,7 +257,7 @@ class ServerEnvironment : public Environment (note: not used, pending removal from engine) */ //bool addActiveObjectAsStatic(ServerActiveObject *object); - + /* Find out what new objects have been added to inside a radius around a position @@ -282,7 +275,7 @@ class ServerEnvironment : public Environment s16 player_radius, std::set ¤t_objects, std::set &removed_objects); - + /* Get the next message emitted by some active object. Returns a message with id=0 if no messages are available. @@ -311,16 +304,16 @@ class ServerEnvironment : public Environment bool setNode(v3s16 p, const MapNode &n); bool removeNode(v3s16 p); bool swapNode(v3s16 p, const MapNode &n); - + // Find all active objects inside a radius around a point - std::set getObjectsInsideRadius(v3f pos, float radius); - + void getObjectsInsideRadius(std::vector &objects, v3f pos, float radius); + // Clear all objects, loading and going through every MapBlock void clearAllObjects(); - + // This makes stuff happen void step(f32 dtime); - + //check if there's a line of sight between two positions bool line_of_sight(v3f pos1, v3f pos2, float stepsize=1.0, v3s16 *p=NULL); @@ -328,9 +321,9 @@ class ServerEnvironment : public Environment void reportMaxLagEstimate(float f) { m_max_lag_estimate = f; } float getMaxLagEstimate() { return m_max_lag_estimate; } - + std::set* getForceloadedBlocks() { return &m_active_blocks.m_forceloaded_list; }; - + private: /* @@ -349,17 +342,17 @@ class ServerEnvironment : public Environment Returns 0 if not added and thus deleted. */ u16 addActiveObjectRaw(ServerActiveObject *object, bool set_changed, u32 dtime_s); - + /* Remove all objects that satisfy (m_removed && m_known_by_count==0) */ void removeRemovedObjects(); - + /* Convert stored objects from block to active */ void activateObjects(MapBlock *block, u32 dtime_s); - + /* Convert objects that are not in active blocks to static. @@ -374,7 +367,7 @@ class ServerEnvironment : public Environment /* Member variables */ - + // The map ServerMap *m_map; // Lua state @@ -386,7 +379,7 @@ class ServerEnvironment : public Environment // Active object list std::map m_active_objects; // Outgoing network message buffer for active objects - std::list m_active_object_messages; + std::queue m_active_object_messages; // Some timers float m_send_recommended_timer; IntervalLimiter m_object_management_interval; @@ -401,7 +394,7 @@ class ServerEnvironment : public Environment u32 m_game_time; // A helper variable for incrementing the latter float m_game_time_fraction_counter; - std::list m_abms; + std::vector m_abms; // An interval for generally sending object positions and stuff float m_recommended_send_interval; // Estimate for general maximum lag as determined by server. @@ -412,6 +405,8 @@ class ServerEnvironment : public Environment #ifndef SERVER #include "clientobject.h" +#include "content_cao.h" + class ClientSimpleObject; /* @@ -433,8 +428,8 @@ struct ClientEnvEvent { ClientEnvEventType type; union { - struct{ - } none; + //struct{ + //} none; struct{ u8 amount; bool send_to_server; @@ -463,7 +458,7 @@ class ClientEnvironment : public Environment virtual void addPlayer(Player *player); LocalPlayer * getLocalPlayer(); - + /* ClientSimpleObjects */ @@ -473,7 +468,8 @@ class ClientEnvironment : public Environment /* ActiveObjects */ - + + GenericCAO* getGenericCAO(u16 id); ClientActiveObject* getActiveObject(u16 id); /* @@ -501,15 +497,15 @@ class ClientEnvironment : public Environment /* Client likes to call these */ - + // Get all nearby objects void getActiveObjects(v3f origin, f32 max_d, std::vector &dest); - + // Get event from queue. CEE_NONE is returned if queue is empty. ClientEnvEvent getClientEvent(); - u16 m_attachements[USHRT_MAX]; + u16 attachement_parent_ids[USHRT_MAX + 1]; std::list getPlayerNames() { return m_player_names; } @@ -521,7 +517,7 @@ class ClientEnvironment : public Environment { m_camera_offset = camera_offset; } v3s16 getCameraOffset() { return m_camera_offset; } - + private: ClientMap *m_map; scene::ISceneManager *m_smgr; @@ -529,7 +525,7 @@ class ClientEnvironment : public Environment IGameDef *m_gamedef; IrrlichtDevice *m_irr; std::map m_active_objects; - std::list m_simple_objects; + std::vector m_simple_objects; std::list m_client_event_queue; IntervalLimiter m_active_object_light_update_interval; IntervalLimiter m_lava_hurt_interval;