oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-12 16:58:39 +00:00
Code Wiki Activity

Disentangle map implementations (#12148)

Browse source 
Fixes violation of Liskov substitution principle
Fixes #12144
This commit is contained in:
Jude Melton-Houghton 2022-04-07 15:58:04 -04:00 • committed by GitHub
parent 1348d9aaf8
commit 0b5b2b2633
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 57 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/map.h
View file

@ -54,10 +54,6 @@ struct BlockMakeData;
MapEditEvent
*/
#define MAPTYPE_BASE 0
#define MAPTYPE_SERVER 1
#define MAPTYPE_CLIENT 2
enum MapEditEventType{
// Node added (changed from air or something else to something)
MEET_ADDNODE,
@ -127,11 +123,6 @@ public:
virtual ~Map();
DISABLE_CLASS_COPY(Map);
virtual s32 mapType() const
{
return MAPTYPE_BASE;
}
/*
Drop (client) or delete (server) the map.
*/
@ -180,7 +171,7 @@ public:
/*
These handle lighting but not faces.
*/
void addNodeAndUpdate(v3s16 p, MapNode n,
virtual void addNodeAndUpdate(v3s16 p, MapNode n,
std::map<v3s16, MapBlock*> &modified_blocks,
bool remove_metadata = true);
void removeNodeAndUpdate(v3s16 p,
@ -200,6 +191,11 @@ public:
virtual void save(ModifiedState save_level) { FATAL_ERROR("FIXME"); }
/*
Return true unless the map definitely cannot save blocks.
*/
virtual bool maySaveBlocks() { return true; }
// Server implements these.
// Client leaves them as no-op.
virtual bool saveBlock(MapBlock *block) { return false; }
@ -207,14 +203,14 @@ public:
/*
Updates usage timers and unloads unused blocks and sectors.
Saves modified blocks before unloading on MAPTYPE_SERVER.
Saves modified blocks before unloading if possible.
*/
void timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks,
std::vector<v3s16> *unloaded_blocks=NULL);
/*
Unloads all blocks with a zero refCount().
Saves modified blocks before unloading on MAPTYPE_SERVER.
Saves modified blocks before unloading if possible.
*/
void unloadUnreferencedBlocks(std::vector<v3s16> *unloaded_blocks=NULL);
@ -226,9 +222,6 @@ public:
// For debug printing. Prints "Map: ", "ServerMap: " or "ClientMap: "
virtual void PrintInfo(std::ostream &out);
void transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks,
ServerEnvironment *env);
/*
Node metadata
These are basically coordinate wrappers to MapBlock
@ -267,12 +260,8 @@ public:
Variables
*/
void transforming_liquid_add(v3s16 p);
bool isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes);
protected:
friend class LuaVoxelManip;
IGameDef *m_gamedef;
std::set<MapEventReceiver*> m_event_receivers;
@ -283,9 +272,6 @@ protected:
MapSector *m_sector_cache = nullptr;
v2s16 m_sector_cache_p;
// Queued transforming water nodes
UniqueQueue<v3s16> m_transforming_liquid;
// This stores the properties of the nodes on the map.
const NodeDefManager *m_nodedef;
@ -294,12 +280,6 @@ protected:
bool isOccluded(const v3s16 &pos_camera, const v3s16 &pos_target,
float step, float stepfac, float start_offset, float end_offset,
u32 needed_count);
private:
f32 m_transforming_liquid_loop_count_multiplier = 1.0f;
u32 m_unprocessed_count = 0;
u64 m_inc_trending_up_start_time = 0; // milliseconds
bool m_queue_size_timer_started = false;
};
/*
@ -317,11 +297,6 @@ public:
ServerMap(const std::string &savedir, IGameDef *gamedef, EmergeManager *emerge, MetricsBackend *mb);
~ServerMap();
s32 mapType() const
{
return MAPTYPE_SERVER;
}
/*
Get a sector from somewhere.
- Check memory
@ -364,6 +339,10 @@ public:
bool isBlockInQueue(v3s16 pos);
void addNodeAndUpdate(v3s16 p, MapNode n,
std::map<v3s16, MapBlock*> &modified_blocks,
bool remove_metadata) override;
/*
Database functions
*/
@ -406,9 +385,16 @@ public:
bool repairBlockLight(v3s16 blockpos,
std::map<v3s16, MapBlock *> *modified_blocks);
void transformLiquids(std::map<v3s16, MapBlock*> & modified_blocks,
ServerEnvironment *env);
void transforming_liquid_add(v3s16 p);
MapSettingsManager settings_mgr;
private:
friend class LuaVoxelManip;
// Emerge manager
EmergeManager *m_emerge;
@ -419,6 +405,13 @@ private:
std::set<v3s16> m_chunks_in_progress;
// Queued transforming water nodes
UniqueQueue<v3s16> m_transforming_liquid;
f32 m_transforming_liquid_loop_count_multiplier = 1.0f;
u32 m_unprocessed_count = 0;
u64 m_inc_trending_up_start_time = 0; // milliseconds
bool m_queue_size_timer_started = false;
/*
Metadata is re-written on disk only if this is true.
This is reset to false when written on disk.