#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 <map>
+#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_NOLIGHT 0x40
-#define MGV7_MOUNTAINS 0x80
-#define MGV7_RIDGES 0x100
-
-/////////////////// Ore generation flags
-// Use absolute value of height to determine ore placement
-#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
-// nodes isn't the specified node
-#define OREFLAG_NODEISNT 0x04 // not yet implemented
-
-/////////////////// Decoration flags
-#define DECO_PLACE_CENTER_X 1
-#define DECO_PLACE_CENTER_Y 2
-#define DECO_PLACE_CENTER_Z 4
+#define MG_FLAT 0x08
+#define MG_LIGHT 0x10
+
+class Settings;
+class MMVManip;
+class INodeDefManager;
extern FlagDesc flagdesc_mapgen[];
-extern FlagDesc flagdesc_ore[];
-extern FlagDesc flagdesc_deco_schematic[];
+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<u32> *notify_on_deco_ids);
+
+ void setNotifyOn(u32 notify_on);
+ void setNotifyOnDecoIds(std::set<u32> *notify_on_deco_ids);
+
+ bool addEvent(GenNotifyType type, v3s16 pos, u32 id=0);
+ void getEvents(std::map<std::string, std::vector<v3s16> > &event_map,
+ bool peek_events=false);
+
+private:
+ u32 m_notify_on;
+ std::set<u32> *m_notify_on_deco_ids;
+ std::list<GenNotifyEvent> m_notify_events;
+};
+
+struct MapgenSpecificParams {
+ virtual void readParams(const Settings *settings) = 0;
+ virtual void writeParams(Settings *settings) const = 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";
- seed = 0;
- water_level = 1;
- chunksize = 5;
- flags = MG_TREES | MG_CAVES | MGV6_BIOME_BLEND;
- }
-
- virtual bool readParams(Settings *settings) { return true; }
- virtual void writeParams(Settings *settings) {}
- virtual ~MapgenParams() {}
+ NoiseParams np_biome_heat;
+ NoiseParams np_biome_humidity;
+
+ MapgenSpecificParams *sparams;
+
+ MapgenParams() :
+ mg_name(DEFAULT_MAPGEN),
+ 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)),
+ sparams(NULL)
+ {}
+
+ void load(const Settings &settings);
+ void save(Settings &settings) const;
};
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();
- virtual ~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<v3s16> *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 calcLighting(v3s16 nmin, v3s16 nmax,
+ v3s16 full_nmin, v3s16 full_nmax);
+
+ void propagateSunlight(v3s16 nmin, v3s16 nmax);
+ void spreadLight(v3s16 nmin, v3s16 nmax);
+
void calcLightingOld(v3s16 nmin, v3s16 nmax);
virtual void makeChunk(BlockMakeData *data) {}
virtual int getGroundLevelAtPoint(v2s16 p) { return 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);
};
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 MapgenObject {
- MGOBJ_VMANIP,
- MGOBJ_HEIGHTMAP,
- MGOBJ_BIOMEMAP,
- MGOBJ_HEATMAP,
- MGOBJ_HUMIDMAP
+typedef std::map<std::string, std::string> StringMap;
+typedef u32 ObjDefHandle;
+
+#define OBJDEF_INVALID_INDEX ((u32)(-1))
+#define OBJDEF_INVALID_HANDLE 0
+#define OBJDEF_HANDLE_SALT 0x00585e6fu
+#define OBJDEF_MAX_ITEMS (1 << 18)
+#define OBJDEF_UID_MASK ((1 << 7) - 1)
+
+enum ObjDefType {
+ OBJDEF_GENERIC,
+ OBJDEF_BIOME,
+ OBJDEF_ORE,
+ OBJDEF_DECORATION,
+ OBJDEF_SCHEMATIC,
};
-enum OreType {
- ORE_SCATTER,
- ORE_SHEET,
- ORE_CLAYLIKE
-};
-
-#define ORE_RANGE_ACTUAL 1
-#define ORE_RANGE_MIRROR 2
-
-class Ore {
+class ObjDef {
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;
- 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
- 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,
- u32 blockseed, v3s16 nmin, v3s16 nmax) = 0;
-};
+ virtual ~ObjDef() {}
-class OreScatter : public Ore {
- ~OreScatter() {}
- virtual void generate(ManualMapVoxelManipulator *vm, int seed,
- u32 blockseed, v3s16 nmin, v3s16 nmax);
+ u32 index;
+ u32 uid;
+ ObjDefHandle handle;
+ std::string name;
};
-class OreSheet : public Ore {
- ~OreSheet() {}
- virtual void generate(ManualMapVoxelManipulator *vm, int seed,
- u32 blockseed, v3s16 nmin, v3s16 nmax);
-};
-
-Ore *createOre(OreType type);
-
-
-enum DecorationType {
- DECO_SIMPLE,
- DECO_SCHEMATIC,
- DECO_LSYSTEM
-};
+class ObjDefManager {
+public:
+ ObjDefManager(IGameDef *gamedef, ObjDefType type);
+ virtual ~ObjDefManager();
-#if 0
-struct CutoffData {
- VoxelArea a;
- Decoration *deco;
- //v3s16 p;
- //v3s16 size;
- //s16 height;
-
- CutoffData(s16 x, s16 y, s16 z, s16 h) {
- p = v3s16(x, y, z);
- height = h;
- }
-};
-#endif
+ virtual const char *getObjectTitle() const = 0;
-class Decoration {
-public:
- int mapseed;
- std::string place_on_name;
- content_t c_place_on;
- s16 sidelen;
- float fill_ratio;
- NoiseParams *np;
-
- std::set<u8> biomes;
- //std::list<CutoffData> 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;
-};
+ virtual void clear();
+ virtual ObjDef *getByName(const std::string &name) const;
-class DecoSimple : public Decoration {
-public:
- std::string deco_name;
- std::string spawnby_name;
- content_t c_deco;
- content_t c_spawnby;
- s16 deco_height;
- s16 deco_height_max;
- s16 nspawnby;
-
- std::vector<std::string> decolist_names;
- std::vector<content_t> 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();
-};
+ //// Add new/get/set object definitions by handle
+ virtual ObjDefHandle add(ObjDef *obj);
+ virtual ObjDef *get(ObjDefHandle handle) const;
+ virtual ObjDef *set(ObjDefHandle handle, ObjDef *obj);
-enum Rotation {
- ROTATE_0,
- ROTATE_90,
- ROTATE_180,
- ROTATE_270,
- ROTATE_RAND,
-};
+ //// Raw variants that work on indexes
+ virtual u32 addRaw(ObjDef *obj);
-class DecoSchematic : public Decoration {
-public:
- std::string filename;
-
- std::vector<std::string> *node_names;
- std::vector<content_t> c_nodes;
+ // It is generally assumed that getRaw() will always return a valid object
+ // This won't be true if people do odd things such as call setRaw() with NULL
+ virtual ObjDef *getRaw(u32 index) const;
+ virtual ObjDef *setRaw(u32 index, ObjDef *obj);
- u32 flags;
- Rotation rotation;
- v3s16 size;
- MapNode *schematic;
-
- 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,
- int 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<std::pair<v3s16, s16> > *plist, v3s16 p0);
-};
+ size_t getNumObjects() const { return m_objects.size(); }
+ ObjDefType getType() const { return m_objtype; }
+ INodeDefManager *getNodeDef() const { return m_ndef; }
-void build_nnlist_and_update_ids(MapNode *nodes, u32 nodecount,
- std::vector<content_t> *usednodes);
+ u32 validateHandle(ObjDefHandle handle) const;
+ static ObjDefHandle createHandle(u32 index, ObjDefType type, u32 uid);
+ static bool decodeHandle(ObjDefHandle handle, u32 *index,
+ ObjDefType *type, u32 *uid);
-/*
-class DecoLSystem : public Decoration {
-public:
- virtual void generate(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
+protected:
+ INodeDefManager *m_ndef;
+ std::vector<ObjDef *> m_objects;
+ ObjDefType m_objtype;
};
-*/
-
-Decoration *createDecoration(DecorationType type);
#endif
-
projects / minetest.git / blobdiff