#include "mapgen.h"
#include "voxel.h"
#include "noise.h"
+#include "gamedef.h"
#include "mg_biome.h"
#include "mapblock.h"
#include "mapnode.h"
}
+u32 Mapgen::getBlockSeed(v3s16 p, int seed)
+{
+ return (u32)seed +
+ p.Z * 38134234 +
+ p.Y * 42123 +
+ p.X * 23;
+}
+
+
+u32 Mapgen::getBlockSeed2(v3s16 p, int seed)
+{
+ u32 n = 1619 * p.X + 31337 * p.Y + 52591 * p.Z + 1013 * seed;
+ n = (n >> 13) ^ n;
+ return (n * (n * n * 60493 + 19990303) + 1376312589);
+}
+
+
// Returns Y one under area minimum if not found
s16 Mapgen::findGroundLevelFull(v2s16 p2d)
{
}
+// Returns -MAP_GENERATION_LIMIT if not found
s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax)
{
v3s16 em = vm->m_area.getExtent();
vm->m_area.add_y(em, i, -1);
}
- return y;
+ return (y >= ymin) ? y : -MAP_GENERATION_LIMIT;
}
for (s16 x = nmin.X; x <= nmax.X; x++, index++) {
s16 y = findGroundLevel(v2s16(x, z), nmin.Y, nmax.Y);
- // if the values found are out of range, trust the old heightmap
- if (y == nmax.Y && heightmap[index] > nmax.Y)
- continue;
- if (y == nmin.Y - 1 && heightmap[index] < nmin.Y)
- continue;
-
heightmap[index] = y;
}
}
}
-void Mapgen::setLighting(v3s16 nmin, v3s16 nmax, u8 light)
+void Mapgen::setLighting(u8 light, v3s16 nmin, v3s16 nmax)
{
ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
VoxelArea a(nmin, nmax);
}
-void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax)
+void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax, v3s16 full_nmin, v3s16 full_nmax)
{
- VoxelArea a(nmin, nmax);
- bool block_is_underground = (water_level >= nmax.Y);
+ ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
+ //TimeTaker t("updateLighting");
+
+ propagateSunlight(nmin, nmax);
+ spreadLight(full_nmin, full_nmax);
+ //printf("updateLighting: %dms\n", t.stop());
+}
+
+
+
+void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax)
+{
ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
//TimeTaker t("updateLighting");
- // first, send vertical rays of sunshine downward
+ propagateSunlight(
+ nmin - v3s16(1, 1, 1) * MAP_BLOCKSIZE,
+ nmax + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
+
+ spreadLight(
+ nmin - v3s16(1, 1, 1) * MAP_BLOCKSIZE,
+ nmax + v3s16(1, 1, 1) * MAP_BLOCKSIZE);
+
+ //printf("updateLighting: %dms\n", t.stop());
+}
+
+
+void Mapgen::propagateSunlight(v3s16 nmin, v3s16 nmax)
+{
+ //TimeTaker t("propagateSunlight");
+ VoxelArea a(nmin, nmax);
+ bool block_is_underground = (water_level >= nmax.Y);
v3s16 em = vm->m_area.getExtent();
+
for (int z = a.MinEdge.Z; z <= a.MaxEdge.Z; z++) {
for (int x = a.MinEdge.X; x <= a.MaxEdge.X; x++) {
// see if we can get a light value from the overtop
}
}
}
+ //printf("propagateSunlight: %dms\n", t.stop());
+}
+
+
+
+void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax)
+{
+ //TimeTaker t("spreadLight");
+ VoxelArea a(nmin, nmax);
- // now spread the sunlight and light up any sources
for (int z = a.MinEdge.Z; z <= a.MaxEdge.Z; z++) {
for (int y = a.MinEdge.Y; y <= a.MaxEdge.Y; y++) {
u32 i = vm->m_area.index(a.MinEdge.X, y, z);
u8 light = n.param1 & 0x0F;
if (light) {
- lightSpread(a, v3s16(x, y, z + 1), light - 1);
- lightSpread(a, v3s16(x, y + 1, z ), light - 1);
- lightSpread(a, v3s16(x + 1, y, z ), light - 1);
- lightSpread(a, v3s16(x, y, z - 1), light - 1);
- lightSpread(a, v3s16(x, y - 1, z ), light - 1);
- lightSpread(a, v3s16(x - 1, y, z ), light - 1);
+ lightSpread(a, v3s16(x, y, z + 1), light);
+ lightSpread(a, v3s16(x, y + 1, z ), light);
+ lightSpread(a, v3s16(x + 1, y, z ), light);
+ lightSpread(a, v3s16(x, y, z - 1), light);
+ lightSpread(a, v3s16(x, y - 1, z ), light);
+ lightSpread(a, v3s16(x - 1, y, z ), light);
}
}
}
}
- //printf("updateLighting: %dms\n", t.stop());
+ //printf("spreadLight: %dms\n", t.stop());
}
+
void Mapgen::calcLightingOld(v3s16 nmin, v3s16 nmax)
{
enum LightBank banks[2] = {LIGHTBANK_DAY, LIGHTBANK_NIGHT};
GenerateNotifier::GenerateNotifier()
{
+ m_notify_on = 0;
}
std::map<std::string, std::vector<v3s16> > &event_map,
bool peek_events)
{
- std::list<GenNotifyEvent>::iterator it;
-
- for (it = m_notify_events.begin(); it != m_notify_events.end(); ++it) {
+ for (std::vector<GenNotifyEvent>::iterator it = m_notify_events.begin();
+ it != m_notify_events.end(); ++it) {
GenNotifyEvent &gn = *it;
std::string name = (gn.type == GENNOTIFY_DECORATION) ?
"decoration#"+ itos(gn.id) :
///////////////////////////////////////////////////////////////////////////////
+GenElementManager::GenElementManager(IGameDef *gamedef)
+{
+ m_ndef = gamedef->getNodeDefManager();
+}
+
+
GenElementManager::~GenElementManager()
{
for (size_t i = 0; i != m_elements.size(); i++)
}
-GenElement *GenElementManager::getByName(const char *name)
+GenElement *GenElementManager::getByName(const std::string &name)
{
for (size_t i = 0; i != m_elements.size(); i++) {
GenElement *elem = m_elements[i];
- if (elem && !strcmp(elem->name.c_str(), name))
+ if (elem && name == elem->name)
return elem;
}
return NULL;
}
-GenElement *GenElementManager::getByName(std::string &name)
-{
- return getByName(name.c_str());
-}
-
GenElement *GenElementManager::update(u32 id, GenElement *elem)
{
{
return update(id, NULL);
}
+
+
+void GenElementManager::clear()
+{
+ m_elements.clear();
+}
+
+
+void MapgenParams::load(const Settings &settings)
+{
+ std::string seed_str;
+ const char *seed_name = (&settings == g_settings) ? "fixed_map_seed" : "seed";
+
+ if (settings.getNoEx(seed_name, seed_str) && !seed_str.empty()) {
+ seed = read_seed(seed_str.c_str());
+ } else {
+ seed = ((u64)(myrand() & 0xFFFF) << 0) |
+ ((u64)(myrand() & 0xFFFF) << 16) |
+ ((u64)(myrand() & 0xFFFF) << 32) |
+ ((u64)(myrand() & 0xFFFF) << 48);
+ }
+
+ settings.getNoEx("mg_name", mg_name);
+ settings.getS16NoEx("water_level", water_level);
+ settings.getS16NoEx("chunksize", chunksize);
+ settings.getFlagStrNoEx("mg_flags", flags, flagdesc_mapgen);
+ settings.getNoiseParams("mg_biome_np_heat", np_biome_heat);
+ settings.getNoiseParams("mg_biome_np_humidity", np_biome_humidity);
+
+ delete sparams;
+ sparams = EmergeManager::createMapgenParams(mg_name);
+ if (sparams)
+ sparams->readParams(&settings);
+}
+
+
+void MapgenParams::save(Settings &settings) const
+{
+ settings.set("mg_name", mg_name);
+ settings.setU64("seed", seed);
+ settings.setS16("water_level", water_level);
+ settings.setS16("chunksize", chunksize);
+ settings.setFlagStr("mg_flags", flags, flagdesc_mapgen, (u32)-1);
+ settings.setNoiseParams("mg_biome_np_heat", np_biome_heat);
+ settings.setNoiseParams("mg_biome_np_humidity", np_biome_humidity);
+
+ if (sparams)
+ sparams->writeParams(&settings);
+}
+