Skip to content

Commit

Permalink
Mapgen: Deduplicate common constructor code
Browse files Browse the repository at this point in the history
  • Loading branch information
@kwolekr
kwolekr committed May 28, 2016
1 parent 0df5c01 commit 0810901
Show file tree
Hide file tree
Showing 12 changed files with 122 additions and 215 deletions.
55 changes: 53 additions & 2 deletions src/mapgen.cpp
View file
Expand Up @@ -377,9 +377,60 @@ void Mapgen::spreadLight(v3s16 nmin, v3s16 nmax)
MapgenBasic::MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emerge)
: Mapgen(mapgenid, params, emerge)
{
this->m_emerge = emerge;
this->m_bmgr = emerge->biomemgr;

//// Here, 'stride' refers to the number of elements needed to skip to index
//// an adjacent element for that coordinate in noise/height/biome maps
//// (*not* vmanip content map!)

// Note there is no X stride explicitly defined. Items adjacent in the X
// coordinate are assumed to be adjacent in memory as well (i.e. stride of 1).

// Number of elements to skip to get to the next Y coordinate
this->ystride = csize.X;

// Number of elements to skip to get to the next Z coordinate
this->zstride = csize.X * csize.Y;

// Z-stride value for maps oversized for 1-down overgeneration
this->zstride_1d = csize.X * (csize.Y + 1);

// Z-stride value for maps oversized for 1-up 1-down overgeneration
this->zstride_1u1d = csize.X * (csize.Y + 2);

//// Allocate heightmap
this->heightmap = new s16[csize.X * csize.Z];

//// Initialize biome generator
// TODO(hmmmm): should we have a way to disable biomemanager biomes?
biomegen = m_bmgr->createBiomeGen(BIOMEGEN_ORIGINAL, params->bparams, csize);
biomemap = biomegen->biomemap;

//// Look up some commonly used content
c_stone = ndef->getId("mapgen_stone");
c_water_source = ndef->getId("mapgen_water_source");
c_desert_stone = ndef->getId("mapgen_desert_stone");
c_sandstone = ndef->getId("mapgen_sandstone");
c_river_water_source = ndef->getId("mapgen_river_water_source");

//// Fall back to more basic content if not defined
if (c_desert_stone == CONTENT_IGNORE)
c_desert_stone = c_stone;
if (c_sandstone == CONTENT_IGNORE)
c_sandstone = c_stone;
if (c_river_water_source == CONTENT_IGNORE)
c_river_water_source = c_water_source;
}


MapgenBasic::~MapgenBasic()
{
delete biomegen;
delete []heightmap;
}


MgStoneType MapgenBasic::generateBiomes()
{
v3s16 em = vm->m_area.getExtent();
Expand Down Expand Up @@ -499,7 +550,7 @@ void MapgenBasic::dustTopNodes()

for (s16 z = node_min.Z; z <= node_max.Z; z++)
for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
Biome *biome = (Biome *)bmgr->getRaw(biomemap[index]);
Biome *biome = (Biome *)m_bmgr->getRaw(biomemap[index]);

if (biome->c_dust == CONTENT_IGNORE)
continue;
Expand Down Expand Up @@ -544,7 +595,7 @@ void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
if (max_stone_y < node_min.Y)
return;

CavesNoiseIntersection caves_noise(ndef, bmgr, csize,
CavesNoiseIntersection caves_noise(ndef, m_bmgr, csize,
&np_cave1, &np_cave2, seed, cave_width);

caves_noise.generateCaves(vm, node_min, node_max, biomemap);
Expand Down
22 changes: 15 additions & 7 deletions src/mapgen.h
View file
Expand Up @@ -216,8 +216,16 @@ class Mapgen {
*/
class MapgenBasic : public Mapgen {
public:
MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emerge);
virtual ~MapgenBasic();

virtual MgStoneType generateBiomes();
virtual void dustTopNodes();
virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);

protected:
EmergeManager *m_emerge;
BiomeManager *bmgr;
BiomeManager *m_bmgr;

Noise *noise_filler_depth;

Expand All @@ -233,15 +241,15 @@ class MapgenBasic : public Mapgen {
content_t c_sandstone;

int ystride;
int zstride;
int zstride_1d;
int zstride_1u1d;

u32 spflags;

NoiseParams np_cave1;
NoiseParams np_cave2;
float cave_width;

MapgenBasic(int mapgenid, MapgenParams *params, EmergeManager *emerge);

virtual MgStoneType generateBiomes();
virtual void dustTopNodes();
virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);
};

struct MapgenFactory {
Expand Down
30 changes: 2 additions & 28 deletions src/mapgen_flat.cpp
View file
Expand Up @@ -52,15 +52,6 @@ FlagDesc flagdesc_mapgen_flat[] = {
MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge)
: MapgenBasic(mapgenid, params, emerge)
{
this->m_emerge = emerge;
this->bmgr = emerge->biomemgr;

//// amount of elements to skip for the next index
//// for noise/height/biome maps (not vmanip)
this->ystride = csize.X;

this->heightmap = new s16[csize.X * csize.Z];

MapgenFlatParams *sp = (MapgenFlatParams *)params->sparams;

this->spflags = sp->spflags;
Expand All @@ -79,27 +70,14 @@ MapgenFlat::MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge
MapgenBasic::np_cave1 = sp->np_cave1;
MapgenBasic::np_cave2 = sp->np_cave2;

//// Initialize biome generator
biomegen = emerge->biomemgr->createBiomeGen(
BIOMEGEN_ORIGINAL, params->bparams, csize);
biomemap = biomegen->biomemap;

//// Resolve nodes to be used
c_stone = ndef->getId("mapgen_stone");
c_water_source = ndef->getId("mapgen_water_source");
c_lava_source = ndef->getId("mapgen_lava_source");
c_desert_stone = ndef->getId("mapgen_desert_stone");
c_ice = ndef->getId("mapgen_ice");
c_sandstone = ndef->getId("mapgen_sandstone");

// Content used for dungeon generation
c_cobble = ndef->getId("mapgen_cobble");
c_stair_cobble = ndef->getId("mapgen_stair_cobble");
c_mossycobble = ndef->getId("mapgen_mossycobble");
c_sandstonebrick = ndef->getId("mapgen_sandstonebrick");
c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");

if (c_ice == CONTENT_IGNORE)
c_ice = CONTENT_AIR;
// Fall back to more basic content if not defined
if (c_mossycobble == CONTENT_IGNORE)
c_mossycobble = c_cobble;
if (c_stair_cobble == CONTENT_IGNORE)
Expand All @@ -115,10 +93,6 @@ MapgenFlat::~MapgenFlat()
{
delete noise_terrain;
delete noise_filler_depth;

delete biomegen;

delete[] heightmap;
}


Expand Down
19 changes: 8 additions & 11 deletions src/mapgen_flat.h
View file
Expand Up @@ -55,7 +55,14 @@ struct MapgenFlatParams : public MapgenSpecificParams {

class MapgenFlat : public MapgenBasic {
public:
u32 spflags;
MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge);
~MapgenFlat();

virtual void makeChunk(BlockMakeData *data);
int getSpawnLevelAtPoint(v2s16 p);
s16 generateTerrain();

private:
s16 ground_level;
s16 large_cave_depth;
float lake_threshold;
Expand All @@ -64,21 +71,11 @@ class MapgenFlat : public MapgenBasic {
float hill_steepness;
Noise *noise_terrain;

content_t c_lava_source;
content_t c_ice;

content_t c_cobble;
content_t c_stair_cobble;
content_t c_mossycobble;
content_t c_sandstonebrick;
content_t c_stair_sandstonebrick;

MapgenFlat(int mapgenid, MapgenParams *params, EmergeManager *emerge);
~MapgenFlat();

virtual void makeChunk(BlockMakeData *data);
int getSpawnLevelAtPoint(v2s16 p);
s16 generateTerrain();
};

struct MapgenFactoryFlat : public MapgenFactory {
Expand Down
30 changes: 2 additions & 28 deletions src/mapgen_fractal.cpp
View file
Expand Up @@ -50,15 +50,6 @@ FlagDesc flagdesc_mapgen_fractal[] = {
MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge)
: MapgenBasic(mapgenid, params, emerge)
{
this->m_emerge = emerge;
this->bmgr = emerge->biomemgr;

//// amount of elements to skip for the next index
//// for noise/height/biome maps (not vmanip)
this->ystride = csize.X;

this->heightmap = new s16[csize.X * csize.Z];

MapgenFractalParams *sp = (MapgenFractalParams *)params->sparams;

this->spflags = sp->spflags;
Expand All @@ -80,30 +71,17 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *
MapgenBasic::np_cave1 = sp->np_cave1;
MapgenBasic::np_cave2 = sp->np_cave2;

//// Initialize biome generator
biomegen = emerge->biomemgr->createBiomeGen(
BIOMEGEN_ORIGINAL, params->bparams, csize);
biomemap = biomegen->biomemap;

this->formula = fractal / 2 + fractal % 2;
this->julia = fractal % 2 == 0;

//// Resolve nodes to be used
c_stone = ndef->getId("mapgen_stone");
c_water_source = ndef->getId("mapgen_water_source");
c_lava_source = ndef->getId("mapgen_lava_source");
c_desert_stone = ndef->getId("mapgen_desert_stone");
c_ice = ndef->getId("mapgen_ice");
c_sandstone = ndef->getId("mapgen_sandstone");

// Content used for dungeon generation
c_cobble = ndef->getId("mapgen_cobble");
c_stair_cobble = ndef->getId("mapgen_stair_cobble");
c_mossycobble = ndef->getId("mapgen_mossycobble");
c_sandstonebrick = ndef->getId("mapgen_sandstonebrick");
c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");

if (c_ice == CONTENT_IGNORE)
c_ice = CONTENT_AIR;
// Fall back to more basic content if not defined
if (c_mossycobble == CONTENT_IGNORE)
c_mossycobble = c_cobble;
if (c_stair_cobble == CONTENT_IGNORE)
Expand All @@ -119,10 +97,6 @@ MapgenFractal::~MapgenFractal()
{
delete noise_seabed;
delete noise_filler_depth;

delete biomegen;

delete[] heightmap;
}


Expand Down
21 changes: 9 additions & 12 deletions src/mapgen_fractal.h
View file
Expand Up @@ -59,10 +59,18 @@ struct MapgenFractalParams : public MapgenSpecificParams {

class MapgenFractal : public MapgenBasic {
public:
MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge);
~MapgenFractal();

virtual void makeChunk(BlockMakeData *data);
int getSpawnLevelAtPoint(v2s16 p);
bool getFractalAtPoint(s16 x, s16 y, s16 z);
s16 generateTerrain();

private:
u16 formula;
bool julia;

u32 spflags;
u16 fractal;
u16 iterations;
v3f scale;
Expand All @@ -74,22 +82,11 @@ class MapgenFractal : public MapgenBasic {
float julia_w;
Noise *noise_seabed;

content_t c_lava_source;
content_t c_ice;

content_t c_cobble;
content_t c_stair_cobble;
content_t c_mossycobble;
content_t c_sandstonebrick;
content_t c_stair_sandstonebrick;

MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge);
~MapgenFractal();

virtual void makeChunk(BlockMakeData *data);
int getSpawnLevelAtPoint(v2s16 p);
bool getFractalAtPoint(s16 x, s16 y, s16 z);
s16 generateTerrain();
};

struct MapgenFactoryFractal : public MapgenFactory {
Expand Down
30 changes: 2 additions & 28 deletions src/mapgen_v5.cpp
View file
Expand Up @@ -48,15 +48,6 @@ FlagDesc flagdesc_mapgen_v5[] = {
MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
: MapgenBasic(mapgenid, params, emerge)
{
this->m_emerge = emerge;
this->bmgr = emerge->biomemgr;

// amount of elements to skip for the next index
// for noise/height/biome maps (not vmanip)
this->ystride = csize.X;

this->heightmap = new s16[csize.X * csize.Z];

MapgenV5Params *sp = (MapgenV5Params *)params->sparams;

this->spflags = sp->spflags;
Expand All @@ -74,27 +65,14 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
MapgenBasic::np_cave1 = sp->np_cave1;
MapgenBasic::np_cave2 = sp->np_cave2;

//// Initialize biome generator
biomegen = emerge->biomemgr->createBiomeGen(
BIOMEGEN_ORIGINAL, params->bparams, csize);
biomemap = biomegen->biomemap;

//// Resolve nodes to be used
c_stone = ndef->getId("mapgen_stone");
c_water_source = ndef->getId("mapgen_water_source");
c_lava_source = ndef->getId("mapgen_lava_source");
c_desert_stone = ndef->getId("mapgen_desert_stone");
c_ice = ndef->getId("mapgen_ice");
c_sandstone = ndef->getId("mapgen_sandstone");

// Content used for dungeon generation
c_cobble = ndef->getId("mapgen_cobble");
c_stair_cobble = ndef->getId("mapgen_stair_cobble");
c_mossycobble = ndef->getId("mapgen_mossycobble");
c_sandstonebrick = ndef->getId("mapgen_sandstonebrick");
c_stair_sandstonebrick = ndef->getId("mapgen_stair_sandstonebrick");

if (c_ice == CONTENT_IGNORE)
c_ice = CONTENT_AIR;
// Fall back to more basic content if not defined
if (c_mossycobble == CONTENT_IGNORE)
c_mossycobble = c_cobble;
if (c_stair_cobble == CONTENT_IGNORE)
Expand All @@ -112,10 +90,6 @@ MapgenV5::~MapgenV5()
delete noise_factor;
delete noise_height;
delete noise_ground;

delete biomegen;

delete[] heightmap;
}


Expand Down

0 comments on commit 0810901

Please sign in to comment.