X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmapgen.h;h=3c897e02315a58c58b3ea5d42d2e4d826070fb22;hb=58e6d25e033c76dc91aaac18fdeda92ac23fe0e1;hp=b2fbe74290b79edc2832d43aee665e199f8cf271;hpb=4d77781ce7cba571701e731b1f442af691933720;p=oweals%2Fminetest.git diff --git a/src/mapgen.h b/src/mapgen.h index b2fbe7429..3c897e023 100644 --- a/src/mapgen.h +++ b/src/mapgen.h @@ -20,25 +20,26 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef MAPGEN_HEADER #define MAPGEN_HEADER -#include "irrlichttypes_extrabloated.h" +#include "irrlichttypes_bloated.h" #include "util/container.h" // UniqueQueue #include "gamedef.h" +#include "nodedef.h" #include "mapnode.h" #include "noise.h" #include "settings.h" -#include + +#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 /////////////////// Ore generation flags // Use absolute value of height to determine ore placement -#define OREFLAG_ABSHEIGHT 0x01 +#define OREFLAG_ABSHEIGHT 0x01 // Use 3d noise to get density of ore placement, instead of just the position #define OREFLAG_DENSITY 0x02 // not yet implemented // For claylike ore types, place ore if the number of surrounding @@ -50,9 +51,16 @@ with this program; if not, write to the Free Software Foundation, Inc., #define DECO_PLACE_CENTER_Y 2 #define DECO_PLACE_CENTER_Z 4 +#define ORE_RANGE_ACTUAL 1 +#define ORE_RANGE_MIRROR 2 + +#define NUM_GEN_NOTIFY 6 + + extern FlagDesc flagdesc_mapgen[]; extern FlagDesc flagdesc_ore[]; extern FlagDesc flagdesc_deco_schematic[]; +extern FlagDesc flagdesc_gennotify[]; class BiomeDefManager; class Biome; @@ -60,11 +68,42 @@ 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 GenNotify { + GENNOTIFY_DUNGEON, + GENNOTIFY_TEMPLE, + GENNOTIFY_CAVE_BEGIN, + GENNOTIFY_CAVE_END, + GENNOTIFY_LARGECAVE_BEGIN, + GENNOTIFY_LARGECAVE_END +}; + +enum OreType { + ORE_SCATTER, + ORE_SHEET, + ORE_CLAYLIKE +}; + + +struct MapgenSpecificParams { + virtual void readParams(Settings *settings) = 0; + virtual void writeParams(Settings *settings) = 0; + virtual ~MapgenSpecificParams() {} +}; + struct MapgenParams { std::string mg_name; int chunksize; @@ -72,17 +111,16 @@ struct MapgenParams { int water_level; u32 flags; + MapgenSpecificParams *sparams; + MapgenParams() { - mg_name = "v6"; + 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; } - - virtual bool readParams(Settings *settings) = 0; - virtual void writeParams(Settings *settings) = 0; - virtual ~MapgenParams() {} }; class Mapgen { @@ -93,11 +131,16 @@ public: int id; ManualMapVoxelManipulator *vm; INodeDefManager *ndef; + s16 *heightmap; u8 *biomemap; + v3s16 csize; + + u32 gennotify; + std::vector *gen_notifications[NUM_GEN_NOTIFY]; Mapgen(); - virtual ~Mapgen() {} + virtual ~Mapgen(); s16 findGroundLevelFull(v2s16 p2d); s16 findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax); @@ -108,37 +151,23 @@ public: void calcLighting(v3s16 nmin, v3s16 nmax); void calcLightingOld(v3s16 nmin, v3s16 nmax); - virtual void makeChunk(BlockMakeData *data) {}; - virtual int getGroundLevelAtPoint(v2s16 p) = 0; - - //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; + virtual MapgenSpecificParams *createMapgenParams() = 0; virtual ~MapgenFactory() {} }; -enum OreType { - ORE_SCATTER, - ORE_SHEET, - ORE_CLAYLIKE -}; - -#define ORE_RANGE_ACTUAL 1 -#define ORE_RANGE_MIRROR 2 - class Ore { public: std::string ore_name; - std::string wherein_name; + std::vector wherein_names; content_t ore; - content_t wherein; // the node to be replaced + std::vector 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 @@ -146,19 +175,18 @@ public: s16 height_max; u8 ore_param2; // to set node-specific attributes u32 flags; // attributes for this ore - float nthresh; // threshhold for noise at which an ore is placed + 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; } - + virtual ~Ore(); - + void resolveNodeNames(INodeDefManager *ndef); void placeOre(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax); virtual void generate(ManualMapVoxelManipulator *vm, int seed, @@ -181,7 +209,7 @@ Ore *createOre(OreType type); enum DecorationType { - DECO_SIMPLE, + DECO_SIMPLE = 1, DECO_SCHEMATIC, DECO_LSYSTEM }; @@ -193,7 +221,7 @@ struct CutoffData { //v3s16 p; //v3s16 size; //s16 height; - + CutoffData(s16 x, s16 y, s16 z, s16 h) { p = v3s16(x, y, z); height = h; @@ -203,24 +231,26 @@ struct CutoffData { class Decoration { public: + INodeDefManager *ndef; + int mapseed; std::string place_on_name; content_t c_place_on; s16 sidelen; float fill_ratio; NoiseParams *np; - + std::set biomes; //std::list cutoffs; //JMutex cutoff_mutex; Decoration(); virtual ~Decoration(); - + virtual void resolveNodeNames(INodeDefManager *ndef); void placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax); void placeCutoffs(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax); - + virtual void generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p) = 0; virtual int getHeight() = 0; virtual std::string getName() = 0; @@ -235,43 +265,58 @@ public: s16 deco_height; s16 deco_height_max; s16 nspawnby; - + std::vector decolist_names; std::vector c_decolist; ~DecoSimple() {} - + void resolveNodeNames(INodeDefManager *ndef); virtual void generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p); virtual int getHeight(); virtual std::string getName(); }; +#define MTSCHEM_FILE_SIGNATURE 0x4d54534d // 'MTSM' +#define MTSCHEM_FILE_VER_HIGHEST_READ 3 +#define MTSCHEM_FILE_VER_HIGHEST_WRITE 3 + +#define MTSCHEM_PROB_NEVER 0x00 +#define MTSCHEM_PROB_ALWAYS 0xFF + class DecoSchematic : public Decoration { public: std::string filename; - + std::vector *node_names; std::vector c_nodes; + std::map replacements; u32 flags; + Rotation rotation; v3s16 size; MapNode *schematic; + u8 *slice_probs; DecoSchematic(); ~DecoSchematic(); - + void resolveNodeNames(INodeDefManager *ndef); virtual void generate(Mapgen *mg, PseudoRandom *pr, s16 max_y, v3s16 p); virtual int getHeight(); virtual std::string getName(); - + + void blitToVManip(v3s16 p, ManualMapVoxelManipulator *vm, + Rotation rot, bool force_placement); + bool loadSchematicFile(); void saveSchematicFile(INodeDefManager *ndef); - + bool getSchematicFromMap(Map *map, v3s16 p1, v3s16 p2); - void placeStructure(Map *map, v3s16 p); - void applyProbabilities(std::vector > *plist, v3s16 p0); + void placeStructure(Map *map, v3s16 p, bool force_placement); + void applyProbabilities(v3s16 p0, + std::vector > *plist, + std::vector > *splist); }; void build_nnlist_and_update_ids(MapNode *nodes, u32 nodecount,