Biome API: Enable biome generation to lower world limit

[minetest.git] / src / mapgen.cpp

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 3f83d21785757042960442886586453e4ca42f32..7965730e48cc4efbed72d3772bef66e439eb397f 100644 (file)
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -1,6 +1,7 @@
 /*
 Minetest
-Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -30,17 +31,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "emerge.h"
 #include "content_mapnode.h" // For content_mapnode_get_new_name
 #include "voxelalgorithms.h"
+#include "porting.h"
 #include "profiler.h"
-#include "settings.h" // For g_settings
-#include "main.h" // For g_profiler
+#include "settings.h"
 #include "treegen.h"
 #include "serialization.h"
 #include "util/serialize.h"
+#include "util/numeric.h"
 #include "filesys.h"
 #include "log.h"
 
-const char *GenElementManager::ELEMENT_TITLE = "element";
-
 FlagDesc flagdesc_mapgen[] = {
        {"trees",    MG_TREES},
        {"caves",    MG_CAVES},
@@ -64,6 +64,7 @@ FlagDesc flagdesc_gennotify[] = {
 
 ///////////////////////////////////////////////////////////////////////////////
 
+
 Mapgen::Mapgen()
 {
        generating    = false;
@@ -112,7 +113,9 @@ u32 Mapgen::getBlockSeed(v3s16 p, int seed)
 
 u32 Mapgen::getBlockSeed2(v3s16 p, int seed)
 {
-       return noise3d(p.X, p.Y, p.Z, 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);
 }
 
 
@@ -136,6 +139,7 @@ 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();
@@ -149,7 +153,7 @@ s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax)
 
                vm->m_area.add_y(em, i, -1);
        }
-       return y;
+       return (y >= ymin) ? y : -MAP_GENERATION_LIMIT;
 }
 
 
@@ -164,12 +168,6 @@ void Mapgen::updateHeightmap(v3s16 nmin, v3s16 nmax)
                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;
                }
        }
@@ -308,7 +306,6 @@ void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax)
 {
        //TimeTaker t("spreadLight");
        VoxelArea a(nmin, nmax);
-       v3s16 em = vm->m_area.getExtent();
 
        for (int z = a.MinEdge.Z; z <= a.MaxEdge.Z; z++) {
                for (int y = a.MinEdge.Y; y <= a.MaxEdge.Y; y++) {
@@ -431,84 +428,43 @@ void GenerateNotifier::getEvents(
                m_notify_events.clear();
 }
 
-
 ///////////////////////////////////////////////////////////////////////////////
 
-
-GenElementManager::GenElementManager(IGameDef *gamedef)
+void MapgenParams::load(const Settings &settings)
 {
-       m_ndef = gamedef->getNodeDefManager();
+       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
+               myrand_bytes(&seed, sizeof(seed));
+
+       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);
 }
 
 
-GenElementManager::~GenElementManager()
+void MapgenParams::save(Settings &settings) const
 {
-       for (size_t i = 0; i != m_elements.size(); i++)
-               delete m_elements[i];
+       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);
 }
 
-
-u32 GenElementManager::add(GenElement *elem)
-{
-       size_t nelem = m_elements.size();
-
-       for (size_t i = 0; i != nelem; i++) {
-               if (m_elements[i] == NULL) {
-                       elem->id = i;
-                       m_elements[i] = elem;
-                       return i;
-               }
-       }
-
-       if (nelem >= this->ELEMENT_LIMIT)
-               return -1;
-
-       elem->id = nelem;
-       m_elements.push_back(elem);
-
-       verbosestream << "GenElementManager: added " << this->ELEMENT_TITLE
-               << " element '" << elem->name << "'" << std::endl;
-
-       return nelem;
-}
-
-
-GenElement *GenElementManager::get(u32 id)
-{
-       return (id < m_elements.size()) ? m_elements[id] : NULL;
-}
-
-
-GenElement *GenElementManager::getByName(const std::string &name)
-{
-       for (size_t i = 0; i != m_elements.size(); i++) {
-               GenElement *elem = m_elements[i];
-               if (elem && name == elem->name)
-                       return elem;
-       }
-
-       return NULL;
-}
-
-
-GenElement *GenElementManager::update(u32 id, GenElement *elem)
-{
-       if (id >= m_elements.size())
-               return NULL;
-
-       GenElement *old_elem = m_elements[id];
-       m_elements[id] = elem;
-       return old_elem;
-}
-
-
-GenElement *GenElementManager::remove(u32 id)
-{
-       return update(id, NULL);
-}
-
-
-void GenElementManager::clear()
-{
-       m_elements.clear();
-}