X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapgen.h;h=5bbdd724dd139fbb6c4934575c34adcce19970d9;hb=fd70f4f2f040b64064676706e41d6da90c2b00db;hp=ee8a8c20c7ef91a960ceaf6a8fad03072e8c2007;hpb=35ed5198fe45eceb62b33dfb1b85f019ee4016e1;p=minetest.git diff --git a/src/mapgen.h b/src/mapgen.h index ee8a8c20c..5bbdd724d 100644 --- a/src/mapgen.h +++ b/src/mapgen.h @@ -20,125 +20,191 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef MAPGEN_HEADER #define MAPGEN_HEADER -#include "irrlichttypes_extrabloated.h" -#include "util/container.h" // UniqueQueue -#include "gamedef.h" -#include "mapnode.h" #include "noise.h" -#include "settings.h" -#include +#include "nodedef.h" +#include "mapnode.h" +#include "util/string.h" +#include "util/container.h" + +#define DEFAULT_MAPGEN "v6" /////////////////// Mapgen flags #define MG_TREES 0x01 #define MG_CAVES 0x02 #define MG_DUNGEONS 0x04 -#define MGV6_JUNGLES 0x08 -#define MGV6_BIOME_BLEND 0x10 -#define MG_FLAT 0x20 +#define MG_FLAT 0x08 +#define MG_LIGHT 0x10 + +class Settings; +class MMVManip; +class INodeDefManager; extern FlagDesc flagdesc_mapgen[]; +extern FlagDesc flagdesc_gennotify[]; -class BiomeDefManager; class Biome; class EmergeManager; class MapBlock; -class ManualMapVoxelManipulator; class VoxelManipulator; -class INodeDefManager; struct BlockMakeData; class VoxelArea; +class Map; + +enum MapgenObject { + MGOBJ_VMANIP, + MGOBJ_HEIGHTMAP, + MGOBJ_BIOMEMAP, + MGOBJ_HEATMAP, + MGOBJ_HUMIDMAP, + MGOBJ_GENNOTIFY +}; + +enum GenNotifyType { + GENNOTIFY_DUNGEON, + GENNOTIFY_TEMPLE, + GENNOTIFY_CAVE_BEGIN, + GENNOTIFY_CAVE_END, + GENNOTIFY_LARGECAVE_BEGIN, + GENNOTIFY_LARGECAVE_END, + GENNOTIFY_DECORATION, + NUM_GENNOTIFY_TYPES +}; + +struct GenNotifyEvent { + GenNotifyType type; + v3s16 pos; + u32 id; +}; + +class GenerateNotifier { +public: + GenerateNotifier(); + GenerateNotifier(u32 notify_on, std::set *notify_on_deco_ids); + + void setNotifyOn(u32 notify_on); + void setNotifyOnDecoIds(std::set *notify_on_deco_ids); + + bool addEvent(GenNotifyType type, v3s16 pos, u32 id=0); + void getEvents(std::map > &event_map, + bool peek_events=false); + +private: + u32 m_notify_on; + std::set *m_notify_on_deco_ids; + std::list m_notify_events; +}; + +struct MapgenSpecificParams { + virtual void readParams(Settings *settings) = 0; + virtual void writeParams(Settings *settings) = 0; + virtual ~MapgenSpecificParams() {} +}; struct MapgenParams { std::string mg_name; - int chunksize; + s16 chunksize; u64 seed; - int water_level; + s16 water_level; u32 flags; - MapgenParams() { - mg_name = "v6"; + NoiseParams np_biome_heat; + NoiseParams np_biome_humidity; + + MapgenSpecificParams *sparams; + + MapgenParams() + { + mg_name = DEFAULT_MAPGEN; seed = 0; water_level = 1; chunksize = 5; - flags = MG_TREES | MG_CAVES | MGV6_BIOME_BLEND; + flags = MG_TREES | MG_CAVES | MG_LIGHT; + sparams = NULL; + 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); } - - virtual bool readParams(Settings *settings) = 0; - virtual void writeParams(Settings *settings) {}; }; class Mapgen { public: int seed; int water_level; + u32 flags; bool generating; int id; - ManualMapVoxelManipulator *vm; + + MMVManip *vm; INodeDefManager *ndef; + u32 blockseed; + s16 *heightmap; + u8 *biomemap; + v3s16 csize; + + GenerateNotifier gennotify; + + Mapgen(); + Mapgen(int mapgenid, MapgenParams *params, EmergeManager *emerge); + virtual ~Mapgen(); + + static u32 getBlockSeed(v3s16 p, int seed); + static u32 getBlockSeed2(v3s16 p, int seed); + s16 findGroundLevelFull(v2s16 p2d); + s16 findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax); + void updateHeightmap(v3s16 nmin, v3s16 nmax); void updateLiquid(UniqueQueue *trans_liquid, v3s16 nmin, v3s16 nmax); - void setLighting(v3s16 nmin, v3s16 nmax, u8 light); + + void setLighting(u8 light, v3s16 nmin, v3s16 nmax); void lightSpread(VoxelArea &a, v3s16 p, u8 light); + void calcLighting(v3s16 nmin, v3s16 nmax); - void calcLightingOld(v3s16 nmin, v3s16 nmax); + void calcLighting(v3s16 nmin, v3s16 nmax, + v3s16 full_nmin, v3s16 full_nmax); + + void propagateSunlight(v3s16 nmin, v3s16 nmax); + void spreadLight(v3s16 nmin, v3s16 nmax); - virtual void makeChunk(BlockMakeData *data) {}; - virtual int getGroundLevelAtPoint(v2s16 p) = 0; + void calcLightingOld(v3s16 nmin, v3s16 nmax); - //Legacy functions for Farmesh (pending removal) - static bool get_have_beach(u64 seed, v2s16 p2d); - static double tree_amount_2d(u64 seed, v2s16 p); - static s16 find_ground_level_from_noise(u64 seed, v2s16 p2d, s16 precision); + virtual void makeChunk(BlockMakeData *data) {} + virtual int getGroundLevelAtPoint(v2s16 p) { return 0; } }; struct MapgenFactory { virtual Mapgen *createMapgen(int mgid, MapgenParams *params, - EmergeManager *emerge) = 0; - virtual MapgenParams *createMapgenParams() = 0; + EmergeManager *emerge) = 0; + virtual MapgenSpecificParams *createMapgenParams() = 0; + virtual ~MapgenFactory() {} }; -enum OreType { - ORE_SCATTER, - ORE_SHEET, - ORE_CLAYLIKE +class GenElement { +public: + virtual ~GenElement() {} + u32 id; + std::string name; }; -class Ore { +class GenElementManager { public: - std::string ore_name; - std::string wherein_name; - - content_t ore; - content_t wherein; // the node to be replaced - u32 clust_scarcity; // ore cluster has a 1-in-clust_scarcity chance of appearing at a node - s16 clust_num_ores; // how many ore nodes are in a chunk - s16 clust_size; // how large (in nodes) a chunk of ore is - s16 height_min; - s16 height_max; - float nthresh; // threshhold for noise at which an ore is placed - NoiseParams *np; // noise for distribution of clusters (NULL for uniform scattering) - Noise *noise; - - Ore() { - ore = CONTENT_IGNORE; - wherein = CONTENT_IGNORE; - np = NULL; - noise = NULL; - } - - void resolveNodeNames(INodeDefManager *ndef); - virtual void generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax) = 0; -}; + static const char *ELEMENT_TITLE; + static const size_t ELEMENT_LIMIT = -1; -class OreScatter : public Ore { - void generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax); -}; + GenElementManager(IGameDef *gamedef); + virtual ~GenElementManager(); -class OreSheet : public Ore { - void generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax); -}; + virtual GenElement *create(int type) = 0; -Ore *createOre(OreType type); + 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(); -#endif + virtual GenElement *getByName(const std::string &name); +protected: + INodeDefManager *m_ndef; + std::vector m_elements; +}; + +#endif