#include <map>
#include "irr_v3d.h"
#include "util/container.h"
-#include "map.h" // for ManualMapVoxelManipulator
+#include "mapgen.h" // for MapgenParams
+#include "map.h"
#define MGPARAMS_SET_MGNAME 1
#define MGPARAMS_SET_SEED 2
#define BLOCK_EMERGE_ALLOWGEN (1<<0)
#define EMERGE_DBG_OUT(x) \
- { if (enable_mapgen_debug_info) \
- infostream << "EmergeThread: " x << std::endl; }
+ do { \
+ if (enable_mapgen_debug_info) \
+ infostream << "EmergeThread: " x << std::endl; \
+ } while (0)
class EmergeThread;
-class Mapgen;
-struct MapgenParams;
-struct MapgenFactory;
-class Biome;
-class BiomeDefManager;
-class Decoration;
-class Ore;
class INodeDefManager;
class Settings;
+class BiomeManager;
+class OreManager;
+class DecorationManager;
+class SchematicManager;
+
struct BlockMakeData {
ManualMapVoxelManipulator *vmanip;
u64 seed;
u8 flags;
};
-class IBackgroundBlockEmerger
-{
-public:
- virtual bool enqueueBlockEmerge(u16 peer_id, v3s16 p,
- bool allow_generate) = 0;
- virtual ~IBackgroundBlockEmerger() {}
-};
-
-class EmergeManager : public IBackgroundBlockEmerger {
+class EmergeManager {
public:
INodeDefManager *ndef;
std::vector<Mapgen *> mapgen;
std::vector<EmergeThread *> emergethread;
+ bool threads_active;
+
//settings
- MapgenParams *params;
+ MapgenParams params;
bool mapgen_debug_info;
u16 qlimit_total;
u16 qlimit_diskonly;
u16 qlimit_generate;
- u32 gennotify;
-
- MapgenParams *luaoverride_params;
- u32 luaoverride_params_modified;
- u32 luaoverride_flagmask;
+ u32 gen_notify_on;
+ std::set<u32> gen_notify_on_deco_ids;
- //block emerge queue data structures
+ //// Block emerge queue data structures
JMutex queuemutex;
std::map<v3s16, BlockEmergeData *> blocks_enqueued;
std::map<u16, u16> peer_queue_count;
- //Mapgen-related structures
- BiomeDefManager *biomedef;
- std::vector<Ore *> ores;
- std::vector<Decoration *> decorations;
+ //// Managers of map generation-related components
+ BiomeManager *biomemgr;
+ OreManager *oremgr;
+ DecorationManager *decomgr;
+ SchematicManager *schemmgr;
+ //// Methods
EmergeManager(IGameDef *gamedef);
~EmergeManager();
- void initMapgens(MapgenParams *mgparams);
- MapgenParams *setMapgenType(MapgenParams *mgparams, std::string newname);
+ void loadMapgenParams();
+ void initMapgens();
Mapgen *getCurrentMapgen();
Mapgen *createMapgen(std::string mgname, int mgid,
- MapgenParams *mgparams);
- MapgenParams *createMapgenParams(std::string mgname);
- void startAllThreads();
+ MapgenParams *mgparams);
+ MapgenSpecificParams *createMapgenParams(std::string mgname);
+ void startThreads();
+ void stopThreads();
bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
void registerMapgen(std::string name, MapgenFactory *mgfactory);
- MapgenParams *getParamsFromSettings(Settings *settings);
- void setParamsToSettings(Settings *settings);
+ void loadParamsFromSettings(Settings *settings);
+ void saveParamsToSettings(Settings *settings);
//mapgen helper methods
Biome *getBiomeAtPoint(v3s16 p);