diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-10-30 02:29:37 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-10-30 02:29:37 -0400 |
| commit | 6b4307791af9aab362029883c1cbee207e748af1 (patch) | |
| tree | 2be50929d33b386ecfd2dc19d375d5fb975d2b38 /src/mapgen_v7.cpp | |
| parent | 03f3f958ed4c21937d93637bd79b3e31c83009d8 (diff) | |
| download | minetest-6b4307791af9aab362029883c1cbee207e748af1.tar.gz minetest-6b4307791af9aab362029883c1cbee207e748af1.tar.bz2 minetest-6b4307791af9aab362029883c1cbee207e748af1.zip | |
mapgen: Resolve nodes in ctor rather than makeChunk
Diffstat (limited to 'src/mapgen_v7.cpp')
| -rw-r--r-- | src/mapgen_v7.cpp | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index a9547fdb0..332865304 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -60,8 +60,8 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge) { this->csize = v3s16(1, 1, 1) * params->chunksize * MAP_BLOCKSIZE; - // amount of elements to skip for the next index - // for noise/height/biome maps (not vmanip) + //// amount of elements to skip for the next index + //// for noise/height/biome maps (not vmanip) this->ystride = csize.X; this->zstride = csize.X * csize.Y; @@ -71,7 +71,7 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge) { MapgenV7Params *sp = (MapgenV7Params *)params->sparams; - // Terrain noise + //// Terrain noise noise_terrain_base = new Noise(&sp->np_terrain_base, seed, csize.X, csize.Z); noise_terrain_alt = new Noise(&sp->np_terrain_alt, seed, csize.X, csize.Z); noise_terrain_persist = new Noise(&sp->np_terrain_persist, seed, csize.X, csize.Z); @@ -80,13 +80,26 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge) { noise_mount_height = new Noise(&sp->np_mount_height, seed, csize.X, csize.Z); noise_ridge_uwater = new Noise(&sp->np_ridge_uwater, seed, csize.X, csize.Z); - // 3d terrain noise + //// 3d terrain noise noise_mountain = new Noise(&sp->np_mountain, seed, csize.X, csize.Y, csize.Z); noise_ridge = new Noise(&sp->np_ridge, seed, csize.X, csize.Y, csize.Z); - // Biome noise + //// Biome noise noise_heat = new Noise(bmgr->np_heat, seed, csize.X, csize.Z); - noise_humidity = new Noise(bmgr->np_humidity, seed, csize.X, csize.Z); + noise_humidity = new Noise(bmgr->np_humidity, seed, csize.X, csize.Z); + + //// Resolve nodes to be used + INodeDefManager *ndef = emerge->ndef; + + c_stone = ndef->getId("mapgen_stone"); + c_dirt = ndef->getId("mapgen_dirt"); + c_dirt_with_grass = ndef->getId("mapgen_dirt_with_grass"); + c_sand = ndef->getId("mapgen_sand"); + c_water_source = ndef->getId("mapgen_water_source"); + c_lava_source = ndef->getId("mapgen_lava_source"); + c_ice = ndef->getId("default:ice"); + if (c_ice == CONTENT_IGNORE) + c_ice = CONTENT_AIR; } @@ -208,16 +221,6 @@ void MapgenV7::makeChunk(BlockMakeData *data) { blockseed = emerge->getBlockSeed(full_node_min); //////use getBlockSeed2()! - c_stone = ndef->getId("mapgen_stone"); - c_dirt = ndef->getId("mapgen_dirt"); - c_dirt_with_grass = ndef->getId("mapgen_dirt_with_grass"); - c_sand = ndef->getId("mapgen_sand"); - c_water_source = ndef->getId("mapgen_water_source"); - c_lava_source = ndef->getId("mapgen_lava_source"); - c_ice = ndef->getId("default:ice"); - if (c_ice == CONTENT_IGNORE) - c_ice = CONTENT_AIR; - // Make some noise calculateNoise(); |