oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-27 17:28:41 +00:00
Code Wiki Activity

Huge overhaul of the entire MapgenParams system

Browse source 
MapgenParams is no longer a polymorphic class, eliminating the need for messy and bug-prone reallocations.
Separation between the common and mapgen-specific parameters is now strongly defined.
Mapgen parameters objects are now properly encapsulated within the proper subsystems.
This commit is contained in:
kwolekr 2014-02-03 22:42:10 -05:00
parent a439343844
commit 5a34f40d80
24 changed files with 402 additions and 619 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/mapgen_v7.h
View file

@ -22,17 +22,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mapgen.h"
extern NoiseParams nparams_v7_def_terrain_base;
extern NoiseParams nparams_v7_def_terrain_alt;
extern NoiseParams nparams_v7_def_terrain_persist;
extern NoiseParams nparams_v7_def_height_select;
extern NoiseParams nparams_v7_def_filler_depth;
extern NoiseParams nparams_v7_def_mount_height;
extern NoiseParams nparams_v7_def_ridge_uwater;
extern NoiseParams nparams_v7_def_mountain;
extern NoiseParams nparams_v7_def_ridge;
/////////////////// Mapgen V7 flags
#define MGV7_MOUNTAINS 0x01
#define MGV7_RIDGES 0x02
struct MapgenV7Params : public MapgenParams {
extern FlagDesc flagdesc_mapgen_v7[];
struct MapgenV7Params : public MapgenSpecificParams {
u32 spflags;
NoiseParams np_terrain_base;
NoiseParams np_terrain_alt;
NoiseParams np_terrain_persist;
@ -43,21 +42,10 @@ struct MapgenV7Params : public MapgenParams {
NoiseParams np_mountain;
NoiseParams np_ridge;
MapgenV7Params() {
np_terrain_base = nparams_v7_def_terrain_base;
np_terrain_alt = nparams_v7_def_terrain_alt;
np_terrain_persist = nparams_v7_def_terrain_persist;
np_height_select = nparams_v7_def_height_select;
np_filler_depth = nparams_v7_def_filler_depth;
np_mount_height = nparams_v7_def_mount_height;
np_ridge_uwater = nparams_v7_def_ridge_uwater;
np_mountain = nparams_v7_def_mountain;
np_ridge = nparams_v7_def_ridge;
}
MapgenV7Params();
~MapgenV7Params() {}
bool readParams(Settings *settings);
void readParams(Settings *settings);
void writeParams(Settings *settings);
};
@ -69,6 +57,7 @@ public:
int ystride;
int zstride;
u32 flags;
u32 spflags;
u32 blockseed;
v3s16 node_min;
@ -103,7 +92,7 @@ public:
content_t c_desert_sand;
content_t c_desert_stone;
MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge);
MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
~MapgenV7();
virtual void makeChunk(BlockMakeData *data);
@ -132,10 +121,10 @@ public:
struct MapgenFactoryV7 : public MapgenFactory {
Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) {
return new MapgenV7(mgid, (MapgenV7Params *)params, emerge);
return new MapgenV7(mgid, params, emerge);
};
MapgenParams *createMapgenParams() {
MapgenSpecificParams *createMapgenParams() {
return new MapgenV7Params();
};
};