Mgvalleys: use standard caves

[minetest.git] / src / mapgen.h

diff --git a/src/mapgen.h b/src/mapgen.h
index c9aee5ef58cc40da00e472972d6292d383d95fee..9bb7d03b89241a9449c237498731476c73a6e3d6 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -29,11 +29,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define DEFAULT_MAPGEN "v6"
 
 /////////////////// Mapgen flags
-#define MG_TREES         0x01
-#define MG_CAVES         0x02
-#define MG_DUNGEONS      0x04
-#define MG_FLAT          0x08
-#define MG_LIGHT         0x10
+#define MG_TREES       0x01
+#define MG_CAVES       0x02
+#define MG_DUNGEONS    0x04
+#define MG_FLAT        0x08
+#define MG_LIGHT       0x10
+#define MG_DECORATIONS 0x20
 
 class Settings;
 class MMVManip;
@@ -70,6 +71,13 @@ enum GenNotifyType {
        NUM_GENNOTIFY_TYPES
 };
 
+// TODO(hmmmm/paramat): make stone type selection dynamic
+enum MgStoneType {
+       STONE,
+       DESERT_STONE,
+       SANDSTONE,
+};
+
 struct GenNotifyEvent {
        GenNotifyType type;
        v3s16 pos;
@@ -91,7 +99,7 @@ class GenerateNotifier {
 private:
        u32 m_notify_on;
        std::set<u32> *m_notify_on_deco_ids;
-       std::vector<GenNotifyEvent> m_notify_events;
+       std::list<GenNotifyEvent> m_notify_events;
 };
 
 struct MapgenSpecificParams {
@@ -100,8 +108,7 @@ struct MapgenSpecificParams {
        virtual ~MapgenSpecificParams() {}
 };
 
-class MapgenParams {
-public:
+struct MapgenParams {
        std::string mg_name;
        s16 chunksize;
        u64 seed;
@@ -109,7 +116,9 @@ class MapgenParams {
        u32 flags;
 
        NoiseParams np_biome_heat;
+       NoiseParams np_biome_heat_blend;
        NoiseParams np_biome_humidity;
+       NoiseParams np_biome_humidity_blend;
 
        MapgenSpecificParams *sparams;
 
@@ -118,9 +127,11 @@ class MapgenParams {
                chunksize(5),
                seed(0),
                water_level(1),
-               flags(MG_TREES | MG_CAVES | MG_LIGHT),
-               np_biome_heat(NoiseParams(50, 50, v3f(500.0, 500.0, 500.0), 5349, 3, 0.5, 2.0)),
-               np_biome_humidity(NoiseParams(50, 50, v3f(500.0, 500.0, 500.0), 842, 3, 0.5, 2.0)),
+               flags(MG_CAVES | MG_LIGHT | MG_DECORATIONS),
+               np_biome_heat(NoiseParams(50, 50, v3f(750.0, 750.0, 750.0), 5349, 3, 0.5, 2.0)),
+               np_biome_heat_blend(NoiseParams(0, 1.5, v3f(8.0, 8.0, 8.0), 13, 2, 1.0, 2.0)),
+               np_biome_humidity(NoiseParams(50, 50, v3f(750.0, 750.0, 750.0), 842, 3, 0.5, 2.0)),
+               np_biome_humidity_blend(NoiseParams(0, 1.5, v3f(8.0, 8.0, 8.0), 90003, 2, 1.0, 2.0)),
                sparams(NULL)
        {}
 
@@ -142,6 +153,8 @@ class Mapgen {
        u32 blockseed;
        s16 *heightmap;
        u8 *biomemap;
+       float *heatmap;
+       float *humidmap;
        v3s16 csize;
 
        GenerateNotifier gennotify;
@@ -154,24 +167,22 @@ class Mapgen {
        static u32 getBlockSeed2(v3s16 p, int seed);
        s16 findGroundLevelFull(v2s16 p2d);
        s16 findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax);
-       void initHeightMap(s16 *dest, size_t len);
+       s16 findLiquidSurface(v2s16 p2d, s16 ymin, s16 ymax);
        void updateHeightmap(v3s16 nmin, v3s16 nmax);
        void updateLiquid(UniqueQueue<v3s16> *trans_liquid, v3s16 nmin, v3s16 nmax);
 
        void setLighting(u8 light, v3s16 nmin, v3s16 nmax);
        void lightSpread(VoxelArea &a, v3s16 p, u8 light);
-
-       void calcLighting(v3s16 nmin, v3s16 nmax);
-       void calcLighting(v3s16 nmin, v3s16 nmax,
-               v3s16 full_nmin, v3s16 full_nmax);
-
-       void propagateSunlight(v3s16 nmin, v3s16 nmax);
+       void calcLighting(v3s16 nmin, v3s16 nmax, v3s16 full_nmin, v3s16 full_nmax,
+               bool propagate_shadow = true);
+       void propagateSunlight(v3s16 nmin, v3s16 nmax, bool propagate_shadow);
        void spreadLight(v3s16 nmin, v3s16 nmax);
 
-       void calcLightingOld(v3s16 nmin, v3s16 nmax);
-
        virtual void makeChunk(BlockMakeData *data) {}
        virtual int getGroundLevelAtPoint(v2s16 p) { return 0; }
+
+private:
+       DISABLE_CLASS_COPY(Mapgen);
 };
 
 struct MapgenFactory {
@@ -181,34 +192,4 @@ struct MapgenFactory {
        virtual ~MapgenFactory() {}
 };
 
-class GenElement {
-public:
-       virtual ~GenElement() {}
-       u32 id;
-       std::string name;
-};
-
-class GenElementManager {
-public:
-       static const char *ELEMENT_TITLE;
-       static const size_t ELEMENT_LIMIT = -1;
-
-       GenElementManager(IGameDef *gamedef);
-       virtual ~GenElementManager();
-
-       virtual GenElement *create(int type) = 0;
-
-       virtual u32 add(GenElement *elem);
-       virtual GenElement *get(u32 id);
-       virtual GenElement *update(u32 id, GenElement *elem);
-       virtual GenElement *remove(u32 id);
-       virtual void clear();
-
-       virtual GenElement *getByName(const std::string &name);
-
-protected:
-       INodeDefManager *m_ndef;
-       std::vector<GenElement *> m_elements;
-};
-
 #endif