Mapgen: Remove '#include treegen.h' from non-mgv6 mapgens

[minetest.git] / src / cavegen.h

diff --git a/src/cavegen.h b/src/cavegen.h
index da0894635033ad1374c404b75829472f6b70de17..e322c181c625c1e2e5fd6433a1291fce90297496 100644 (file)
--- a/src/cavegen.h
+++ b/src/cavegen.h
@@ -41,7 +41,7 @@ class CavesNoiseIntersection {
 public:
        CavesNoiseIntersection(INodeDefManager *nodedef, BiomeManager *biomemgr,
                v3s16 chunksize, NoiseParams *np_cave1, NoiseParams *np_cave2,
-               int seed, float cave_width);
+               s32 seed, float cave_width);
        ~CavesNoiseIntersection();
 
        void generateCaves(MMVManip *vm, v3s16 nmin, v3s16 nmax, u8 *biomemap);
@@ -62,6 +62,36 @@ class CavesNoiseIntersection {
        Noise *noise_cave2;
 };
 
+/*
+       CavernsNoise is a cave digging algorithm
+*/
+class CavernsNoise {
+public:
+       CavernsNoise(INodeDefManager *nodedef, v3s16 chunksize, NoiseParams *np_cavern,
+       s32 seed, float cavern_limit, float cavern_taper, float cavern_threshold);
+       ~CavernsNoise();
+
+       bool generateCaverns(MMVManip *vm, v3s16 nmin, v3s16 nmax);
+
+private:
+       INodeDefManager *m_ndef;
+
+       // configurable parameters
+       v3s16 m_csize;
+       float m_cavern_limit;
+       float m_cavern_taper;
+       float m_cavern_threshold;
+
+       // intermediate state variables
+       u16 m_ystride;
+       u16 m_zstride_1d;
+
+       Noise *noise_cavern;
+
+       content_t c_water_source;
+       content_t c_lava_source;
+};
+
 /*
        CavesRandomWalk is an implementation of a cave-digging algorithm that
        operates on the principle of a "random walk" to approximate the stochiastic
@@ -83,7 +113,7 @@ class CavesRandomWalk {
        s16 *heightmap;
 
        // configurable parameters
-       int seed;
+       s32 seed;
        int water_level;
        int lava_depth;
        NoiseParams *np_caveliquids;
@@ -122,7 +152,7 @@ class CavesRandomWalk {
        // If gennotify is NULL, generation events are not logged.
        CavesRandomWalk(INodeDefManager *ndef,
                GenerateNotifier *gennotify = NULL,
-               int seed = 0,
+               s32 seed = 0,
                int water_level = 1,
                content_t water_source = CONTENT_IGNORE,
                content_t lava_source = CONTENT_IGNORE);