From 650e932ddf7352e50bba42acbc0ff4eda8aa40e2 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 9 Mar 2013 21:28:19 -0500 Subject: Re-add dungeons in new dungeongen.cpp --- src/mapgen_v6.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mapgen_v6.h') diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index d2f05252b..eb21794c3 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef MAPGENV6_HEADER #define MAPGENV6_HEADER +#include "dungeongen.h" #include "mapgen.h" #define AVERAGE_MUD_AMOUNT 4 -- cgit v1.2.3 From d10223254ab9363eb1b6f8cc7aa6b99965940cee Mon Sep 17 00:00:00 2001 From: kwolekr Date: Mon, 11 Mar 2013 21:32:52 -0400 Subject: Clean up Mapgen --- src/mapgen_v6.h | 73 ++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 27 deletions(-) (limited to 'src/mapgen_v6.h') diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index eb21794c3..7b1e31020 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -20,10 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef MAPGENV6_HEADER #define MAPGENV6_HEADER -#include "dungeongen.h" #include "mapgen.h" #define AVERAGE_MUD_AMOUNT 4 +#define VMANIP_FLAG_CAVE VOXELFLAG_CHECKED1 enum BiomeType { @@ -74,13 +74,17 @@ struct MapgenV6Params : public MapgenParams { class MapgenV6 : public Mapgen { public: - //ManualMapVoxelManipulator &vmanip; - int ystride; v3s16 csize; + u32 flags; + u32 blockseed; v3s16 node_min; v3s16 node_max; + v3s16 full_node_min; + v3s16 full_node_max; + v3s16 central_area_size; + int volume_nodes; Noise *noise_terrain_base; Noise *noise_terrain_higher; @@ -90,21 +94,20 @@ public: Noise *noise_mud; Noise *noise_beach; Noise *noise_biome; - - float *map_terrain_base; - float *map_terrain_higher; - float *map_steepness; - float *map_height_select; - float *map_trees; - float *map_mud; - float *map_beach; - float *map_biome; - NoiseParams *np_cave; - - u32 flags; float freq_desert; float freq_beach; + + content_t c_stone; + content_t c_dirt; + content_t c_dirt_with_grass; + content_t c_sand; + 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; MapgenV6(int mapgenid, MapgenV6Params *params); ~MapgenV6(); @@ -112,21 +115,37 @@ public: void makeChunk(BlockMakeData *data); int getGroundLevelAtPoint(v2s16 p); - double baseRockLevelFromNoise(v2s16 p); - static s16 find_ground_level(VoxelManipulator &vmanip, - v2s16 p2d, INodeDefManager *ndef); - static s16 find_stone_level(VoxelManipulator &vmanip, - v2s16 p2d, INodeDefManager *ndef); - void make_tree(ManualMapVoxelManipulator &vmanip, v3s16 p0, - bool is_apple_tree, INodeDefManager *ndef); - double tree_amount_2d(u64 seed, v2s16 p); + float baseTerrainLevel(float terrain_base, float terrain_higher, + float steepness, float height_select); + float baseTerrainLevelFromNoise(v2s16 p); + float baseTerrainLevelFromMap(v2s16 p); + float baseTerrainLevelFromMap(int index); + + s16 find_ground_level(v2s16 p2d); + s16 find_stone_level(v2s16 p2d); bool block_is_underground(u64 seed, v3s16 blockpos); - double base_rock_level_2d(u64 seed, v2s16 p); s16 find_ground_level_from_noise(u64 seed, v2s16 p2d, s16 precision); - double get_mud_add_amount(u64 seed, v2s16 p); - bool get_have_beach(u64 seed, v2s16 p2d); - BiomeType get_biome(u64 seed, v2s16 p2d); + + float getTreeAmount(v2s16 p); + float getTreeAmount(int index); + float getMudAmount(v2s16 p); + float getMudAmount(int index); + bool getHaveBeach(v2s16 p); + bool getHaveBeach(int index); + BiomeType getBiome(v2s16 p); + BiomeType getBiome(int index, v2s16 p); + u32 get_blockseed(u64 seed, v3s16 p); + + + void calculateNoise(); + int generateGround(); + void addMud(); + void flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos); + void addDirtGravelBlobs(); + void growGrass(); + void placeTrees(); + void generateCaves(int max_stone_y); }; struct MapgenFactoryV6 : public MapgenFactory { -- cgit v1.2.3 From 6823ce99a7deabe410dd8b143b688cd364490cec Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 16 Mar 2013 17:06:11 -0400 Subject: Re-add jungles, apple trees --- src/mapgen_v6.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'src/mapgen_v6.h') diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index 7b1e31020..89d72300a 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -35,11 +35,13 @@ 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_trees; 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 { float freq_desert; @@ -48,12 +50,14 @@ struct MapgenV6Params : public MapgenParams { NoiseParams *np_terrain_higher; NoiseParams *np_steepness; NoiseParams *np_height_select; - NoiseParams *np_trees; NoiseParams *np_mud; NoiseParams *np_beach; NoiseParams *np_biome; NoiseParams *np_cave; - + NoiseParams *np_humidity; + NoiseParams *np_trees; + NoiseParams *np_apple_trees; + MapgenV6Params() { freq_desert = 0.45; freq_beach = 0.15; @@ -61,11 +65,14 @@ struct MapgenV6Params : public MapgenParams { np_terrain_higher = &nparams_v6_def_terrain_higher; np_steepness = &nparams_v6_def_steepness; np_height_select = &nparams_v6_def_height_select; - np_trees = &nparams_v6_def_trees; 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; + } bool readParams(Settings *settings); @@ -90,11 +97,13 @@ public: Noise *noise_terrain_higher; Noise *noise_steepness; Noise *noise_height_select; - Noise *noise_trees; Noise *noise_mud; Noise *noise_beach; Noise *noise_biome; NoiseParams *np_cave; + NoiseParams *np_humidity; + NoiseParams *np_trees; + NoiseParams *np_apple_trees; float freq_desert; float freq_beach; @@ -126,8 +135,9 @@ public: 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); - float getTreeAmount(int index); + bool getHaveAppleTree(v2s16 p); float getMudAmount(v2s16 p); float getMudAmount(int index); bool getHaveBeach(v2s16 p); -- cgit v1.2.3 From 165498cecfc11f3471d84855f4d019be9b353621 Mon Sep 17 00:00:00 2001 From: proller Date: Wed, 13 Mar 2013 00:41:14 +0400 Subject: initial mapgen indev version with farscale feature and huge caves --- src/mapgen_v6.h | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'src/mapgen_v6.h') diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index 89d72300a..34de7c0ed 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -43,6 +43,16 @@ extern NoiseParams nparams_v6_def_humidity; extern NoiseParams nparams_v6_def_trees; extern NoiseParams nparams_v6_def_apple_trees; +struct Cave { + s16 min_tunnel_diameter; + s16 max_tunnel_diameter; + int dswitchint; + u16 tunnel_routepoints; + int part_max_length_rs; + bool large_cave_is_flat; + bool flooded; +}; + struct MapgenV6Params : public MapgenParams { float freq_desert; float freq_beach; @@ -126,9 +136,9 @@ public: float baseTerrainLevel(float terrain_base, float terrain_higher, float steepness, float height_select); - float baseTerrainLevelFromNoise(v2s16 p); - float baseTerrainLevelFromMap(v2s16 p); - float baseTerrainLevelFromMap(int index); + virtual float baseTerrainLevelFromNoise(v2s16 p); + virtual float baseTerrainLevelFromMap(v2s16 p); + virtual float baseTerrainLevelFromMap(int index); s16 find_ground_level(v2s16 p2d); s16 find_stone_level(v2s16 p2d); @@ -139,7 +149,7 @@ public: float getTreeAmount(v2s16 p); bool getHaveAppleTree(v2s16 p); float getMudAmount(v2s16 p); - float getMudAmount(int index); + virtual float getMudAmount(int index); bool getHaveBeach(v2s16 p); bool getHaveBeach(int index); BiomeType getBiome(v2s16 p); @@ -148,13 +158,14 @@ public: u32 get_blockseed(u64 seed, v3s16 p); - void calculateNoise(); + virtual void calculateNoise(); int generateGround(); void addMud(); void flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos); void addDirtGravelBlobs(); void growGrass(); void placeTrees(); + virtual void defineCave(Cave & cave, PseudoRandom ps, v3s16 node_min, bool large_cave); void generateCaves(int max_stone_y); }; -- cgit v1.2.3 From 67228160aed84e0ef07a863ac0127931f8d58b05 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 16 Mar 2013 22:34:12 -0400 Subject: Some minor cleanups from the last commit --- src/mapgen_v6.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mapgen_v6.h') diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index 34de7c0ed..662aed2ce 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -157,7 +157,6 @@ public: u32 get_blockseed(u64 seed, v3s16 p); - virtual void calculateNoise(); int generateGround(); void addMud(); @@ -165,7 +164,8 @@ public: void addDirtGravelBlobs(); void growGrass(); void placeTrees(); - virtual void defineCave(Cave & cave, PseudoRandom ps, v3s16 node_min, bool large_cave); + virtual void defineCave(Cave &cave, PseudoRandom ps, + v3s16 node_min, bool large_cave); void generateCaves(int max_stone_y); }; -- cgit v1.2.3 From 939397dd6e9cf26358b7e7f07aa58b72b175691f Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 17 Mar 2013 23:07:51 -0400 Subject: Add jungle grass to jungles --- src/mapgen_v6.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mapgen_v6.h') diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index 662aed2ce..5b3ea9d27 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -163,7 +163,7 @@ public: void flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos); void addDirtGravelBlobs(); void growGrass(); - void placeTrees(); + void placeTreesAndJungleGrass(); virtual void defineCave(Cave &cave, PseudoRandom ps, v3s16 node_min, bool large_cave); void generateCaves(int max_stone_y); -- cgit v1.2.3 From f70378f7f57f293a2a0afcf35aec8ee67180a6c0 Mon Sep 17 00:00:00 2001 From: proller Date: Sun, 24 Mar 2013 03:40:15 +0400 Subject: Mapgen indev: float islands, larger far biomes --- src/mapgen_v6.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mapgen_v6.h') diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index 5b3ea9d27..89a3324cd 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -167,6 +167,7 @@ public: virtual void defineCave(Cave &cave, PseudoRandom ps, v3s16 node_min, bool large_cave); void generateCaves(int max_stone_y); + virtual void generateSomething() {}; //for next mapgen }; struct MapgenFactoryV6 : public MapgenFactory { -- cgit v1.2.3 From 57cbb8bfd8daaa1b8b1aa876723ff6355d21f7fc Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 24 Mar 2013 01:43:38 -0400 Subject: Add Ore infrastructure and l_register_ore() --- src/mapgen_v6.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/mapgen_v6.h') diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h index 89a3324cd..d37e406cb 100644 --- a/src/mapgen_v6.h +++ b/src/mapgen_v6.h @@ -91,6 +91,8 @@ struct MapgenV6Params : public MapgenParams { class MapgenV6 : public Mapgen { public: + EmergeManager *emerge; + int ystride; v3s16 csize; u32 flags; @@ -128,7 +130,7 @@ public: content_t c_desert_sand; content_t c_desert_stone; - MapgenV6(int mapgenid, MapgenV6Params *params); + MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge); ~MapgenV6(); void makeChunk(BlockMakeData *data); @@ -172,7 +174,7 @@ public: struct MapgenFactoryV6 : public MapgenFactory { Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) { - return new MapgenV6(mgid, (MapgenV6Params *)params); + return new MapgenV6(mgid, (MapgenV6Params *)params, emerge); }; MapgenParams *createMapgenParams() { -- cgit v1.2.3