#include "profiler.h"
#include "log.h"
#include "nodedef.h"
-#include "biome.h"
+#include "mg_biome.h"
+#include "mg_ore.h"
+#include "mg_decoration.h"
+#include "mg_schematic.h"
+#include "mapgen_v5.h"
#include "mapgen_v6.h"
#include "mapgen_v7.h"
-#include "mapgen_indev.h"
#include "mapgen_singlenode.h"
-#include "mapgen_math.h"
class EmergeThread : public JThread
EmergeManager::EmergeManager(IGameDef *gamedef) {
//register built-in mapgens
+ registerMapgen("v5", new MapgenFactoryV5());
registerMapgen("v6", new MapgenFactoryV6());
registerMapgen("v7", new MapgenFactoryV7());
- registerMapgen("indev", new MapgenFactoryIndev());
registerMapgen("singlenode", new MapgenFactorySinglenode());
- registerMapgen("math", new MapgenFactoryMath());
- this->ndef = gamedef->getNodeDefManager();
- this->biomedef = new BiomeDefManager();
- this->gennotify = 0;
+ this->ndef = gamedef->getNodeDefManager();
+ this->biomemgr = new BiomeManager(gamedef);
+ this->oremgr = new OreManager(gamedef);
+ this->decomgr = new DecorationManager(gamedef);
+ this->schemmgr = new SchematicManager(gamedef);
+ this->gen_notify_on = 0;
// Note that accesses to this variable are not synchronized.
// This is because the *only* thread ever starting or stopping
// if unspecified, leave a proc for the main thread and one for
// some other misc thread
- int nthreads = 0;
+ s16 nthreads = 0;
if (!g_settings->getS16NoEx("num_emerge_threads", nthreads))
nthreads = porting::getNumberOfProcessors() - 2;
if (nthreads < 1)
if (!g_settings->getU16NoEx("emergequeue_limit_generate", qlimit_generate))
qlimit_generate = nthreads + 1;
- for (int i = 0; i != nthreads; i++)
- emergethread.push_back(new EmergeThread((Server *)gamedef, i));
+ // don't trust user input for something very important like this
+ if (qlimit_total < 1)
+ qlimit_total = 1;
+ if (qlimit_diskonly < 1)
+ qlimit_diskonly = 1;
+ if (qlimit_generate < 1)
+ qlimit_generate = 1;
- infostream << "EmergeManager: using " << nthreads << " threads" << std::endl;
-
- loadParamsFromSettings(g_settings);
+ for (s16 i = 0; i < nthreads; i++)
+ emergethread.push_back(new EmergeThread((Server *) gamedef, i));
- if (g_settings->get("fixed_map_seed").empty()) {
- params.seed = (((u64)(myrand() & 0xffff) << 0)
- | ((u64)(myrand() & 0xffff) << 16)
- | ((u64)(myrand() & 0xffff) << 32)
- | ((u64)(myrand() & 0xffff) << 48));
- }
+ infostream << "EmergeManager: using " << nthreads << " threads" << std::endl;
}
emergethread.clear();
mapgen.clear();
- for (unsigned int i = 0; i < ores.size(); i++)
- delete ores[i];
- ores.clear();
+ std::map<std::string, MapgenFactory *>::iterator it;
+ for (it = mglist.begin(); it != mglist.end(); ++it)
+ delete it->second;
+ mglist.clear();
- for (unsigned int i = 0; i < decorations.size(); i++)
- delete decorations[i];
- decorations.clear();
+ delete biomemgr;
+ delete oremgr;
+ delete decomgr;
+ delete schemmgr;
- for (std::map<std::string, MapgenFactory *>::iterator iter = mglist.begin();
- iter != mglist.end(); iter ++) {
- delete iter->second;
+ if (params.sparams) {
+ delete params.sparams;
+ params.sparams = NULL;
}
- mglist.clear();
+}
+
- delete biomedef;
+void EmergeManager::loadMapgenParams() {
+ loadParamsFromSettings(g_settings);
+
+ if (g_settings->get("fixed_map_seed").empty()) {
+ params.seed = (((u64)(myrand() & 0xffff) << 0)
+ | ((u64)(myrand() & 0xffff) << 16)
+ | ((u64)(myrand() & 0xffff) << 32)
+ | ((u64)(myrand() & 0xffff) << 48));
+ }
}
if (mapgen.size())
return;
- // Resolve names of nodes for things that were registered
- // (at this point, the registration period is over)
- biomedef->resolveNodeNames(ndef);
-
- for (size_t i = 0; i != ores.size(); i++)
- ores[i]->resolveNodeNames(ndef);
-
- for (size_t i = 0; i != decorations.size(); i++)
- decorations[i]->resolveNodeNames(ndef);
-
if (!params.sparams) {
params.sparams = createMapgenParams(params.mg_name);
if (!params.sparams) {
settings->getS16NoEx("water_level", params.water_level);
settings->getS16NoEx("chunksize", params.chunksize);
settings->getFlagStrNoEx("mg_flags", params.flags, flagdesc_mapgen);
+ settings->getNoiseParams("mg_biome_np_heat", params.np_biome_heat);
+ settings->getNoiseParams("mg_biome_np_humidity", params.np_biome_humidity);
delete params.sparams;
params.sparams = createMapgenParams(params.mg_name);
if (params.sparams)
params.sparams->readParams(settings);
-
}
settings->setU64("seed", params.seed);
settings->setS16("water_level", params.water_level);
settings->setS16("chunksize", params.chunksize);
- settings->setFlagStr("mg_flags", params.flags, flagdesc_mapgen);
+ settings->setFlagStr("mg_flags", params.flags, flagdesc_mapgen, (u32)-1);
+ settings->setNoiseParams("mg_biome_np_heat", params.np_biome_heat);
+ settings->setNoiseParams("mg_biome_np_humidity", params.np_biome_humidity);
if (params.sparams)
params.sparams->writeParams(settings);
v3s16 last_tried_pos(-32768,-32768,-32768); // For error output
v3s16 p;
- u8 flags;
+ u8 flags = 0;
map = (ServerMap *)&(m_server->m_env->getMap());
emerge = m_server->m_emerge;
mapgen = emerge->mapgen[id];
enable_mapgen_debug_info = emerge->mapgen_debug_info;
+ porting::setThreadName("EmergeThread");
+
while (!StopRequested())
try {
if (!popBlockEmerge(&p, &flags)) {