Add an [invert:<mode> texture modifier

[minetest.git] / src / mapgen_v6.h

diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index 14736e3d0fef1a43f38876af0cb97204bf379df3..f018ffaca182bb35fe76e091793e55f677c3adad 100644 (file)
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+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
@@ -21,28 +21,40 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MAPGENV6_HEADER
 
 #include "mapgen.h"
+#include "noise.h"
 
-#define AVERAGE_MUD_AMOUNT 4
+#define MGV6_AVERAGE_MUD_AMOUNT 4
+#define MGV6_DESERT_STONE_BASE -32
+#define MGV6_ICE_BASE 0
+#define MGV6_FREQ_HOT 0.4
+#define MGV6_FREQ_SNOW -0.4
+#define MGV6_FREQ_TAIGA 0.5
+#define MGV6_FREQ_JUNGLE 0.5
 
-enum BiomeType
+//////////// Mapgen V6 flags
+#define MGV6_JUNGLES    0x01
+#define MGV6_BIOMEBLEND 0x02
+#define MGV6_MUDFLOW    0x04
+#define MGV6_SNOWBIOMES 0x08
+#define MGV6_FLAT       0x10
+#define MGV6_TREES      0x20
+
+
+extern FlagDesc flagdesc_mapgen_v6[];
+
+
+enum BiomeV6Type
 {
        BT_NORMAL,
-       BT_DESERT
+       BT_DESERT,
+       BT_JUNGLE,
+       BT_TUNDRA,
+       BT_TAIGA,
 };
 
-extern NoiseParams nparams_v6_def_terrain_base;
-extern NoiseParams nparams_v6_def_terrain_higher;
-extern NoiseParams nparams_v6_def_steepness;
-extern NoiseParams nparams_v6_def_height_select;
-extern NoiseParams nparams_v6_def_mud;
-extern NoiseParams nparams_v6_def_beach;
-extern NoiseParams nparams_v6_def_biome;
-extern NoiseParams nparams_v6_def_cave;
-extern NoiseParams nparams_v6_def_humidity;
-extern NoiseParams nparams_v6_def_trees;
-extern NoiseParams nparams_v6_def_apple_trees;
 
 struct MapgenV6Params : public MapgenParams {
+       u32 spflags;
        float freq_desert;
        float freq_beach;
        NoiseParams np_terrain_base;
@@ -56,37 +68,22 @@ struct MapgenV6Params : public MapgenParams {
        NoiseParams np_humidity;
        NoiseParams np_trees;
        NoiseParams np_apple_trees;
-       
-       MapgenV6Params() {
-               freq_desert       = 0.45;
-               freq_beach        = 0.15;
-               np_terrain_base   = nparams_v6_def_terrain_base;
-               np_terrain_higher = nparams_v6_def_terrain_higher;
-               np_steepness      = nparams_v6_def_steepness;
-               np_height_select  = nparams_v6_def_height_select;
-               np_mud            = nparams_v6_def_mud;
-               np_beach          = nparams_v6_def_beach;
-               np_biome          = nparams_v6_def_biome;
-               np_cave           = nparams_v6_def_cave;
-               np_humidity       = nparams_v6_def_humidity;
-               np_trees          = nparams_v6_def_trees;
-               np_apple_trees    = nparams_v6_def_apple_trees;
-       }
-       
+
+       MapgenV6Params();
        ~MapgenV6Params() {}
-       
-       bool readParams(Settings *settings);
-       void writeParams(Settings *settings);
+
+       void readParams(const Settings *settings);
+       void writeParams(Settings *settings) const;
 };
 
+
 class MapgenV6 : public Mapgen {
 public:
-       EmergeManager *emerge;
+       EmergeManager *m_emerge;
 
        int ystride;
-       u32 flags;
+       u32 spflags;
 
-       u32 blockseed;
        v3s16 node_min;
        v3s16 node_max;
        v3s16 full_node_min;
@@ -101,13 +98,14 @@ class MapgenV6 : public Mapgen {
        Noise *noise_mud;
        Noise *noise_beach;
        Noise *noise_biome;
+       Noise *noise_humidity;
        NoiseParams *np_cave;
        NoiseParams *np_humidity;
        NoiseParams *np_trees;
        NoiseParams *np_apple_trees;
        float freq_desert;
        float freq_beach;
-       
+
        content_t c_stone;
        content_t c_dirt;
        content_t c_dirt_with_grass;
@@ -115,18 +113,28 @@ class MapgenV6 : public Mapgen {
        content_t c_water_source;
        content_t c_lava_source;
        content_t c_gravel;
-       content_t c_cobble;
-       content_t c_desert_sand;
        content_t c_desert_stone;
+       content_t c_desert_sand;
+       content_t c_dirt_with_snow;
+       content_t c_snow;
+       content_t c_snowblock;
+       content_t c_ice;
+
+       content_t c_cobble;
+       content_t c_mossycobble;
+       content_t c_stair_cobble;
 
        MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge);
        ~MapgenV6();
-       
+
+       virtual MapgenType getType() const { return MAPGEN_V6; }
+
        void makeChunk(BlockMakeData *data);
        int getGroundLevelAtPoint(v2s16 p);
+       int getSpawnLevelAtPoint(v2s16 p);
 
        float baseTerrainLevel(float terrain_base, float terrain_higher,
-                                                  float steepness, float height_select);
+               float steepness, float height_select);
        virtual float baseTerrainLevelFromNoise(v2s16 p);
        virtual float baseTerrainLevelFromMap(v2s16 p);
        virtual float baseTerrainLevelFromMap(int index);
@@ -134,7 +142,7 @@ class MapgenV6 : public Mapgen {
        s16 find_stone_level(v2s16 p2d);
        bool block_is_underground(u64 seed, v3s16 blockpos);
        s16 find_ground_level_from_noise(u64 seed, v2s16 p2d, s16 precision);
-       
+
        float getHumidity(v2s16 p);
        float getTreeAmount(v2s16 p);
        bool getHaveAppleTree(v2s16 p);
@@ -142,30 +150,18 @@ class MapgenV6 : public Mapgen {
        virtual float getMudAmount(int index);
        bool getHaveBeach(v2s16 p);
        bool getHaveBeach(int index);
-       BiomeType getBiome(v2s16 p);
-       BiomeType getBiome(int index, v2s16 p);
-       
+       BiomeV6Type getBiome(v2s16 p);
+       BiomeV6Type getBiome(int index, v2s16 p);
+
        u32 get_blockseed(u64 seed, v3s16 p);
-       
+
        virtual void calculateNoise();
        int generateGround();
        void addMud();
        void flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos);
-       void addDirtGravelBlobs();
        void growGrass();
        void placeTreesAndJungleGrass();
        virtual void generateCaves(int max_stone_y);
-       virtual void generateExperimental() {}
-};
-
-struct MapgenFactoryV6 : public MapgenFactory {
-       Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) {
-               return new MapgenV6(mgid, (MapgenV6Params *)params, emerge);
-       };
-       
-       MapgenParams *createMapgenParams() {
-               return new MapgenV6Params();
-       };
 };
 
 #endif