X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fbiome.cpp;h=e1dfc47afbb021c31bf06e03a79d7f27c8d3d327;hb=58e6d25e033c76dc91aaac18fdeda92ac23fe0e1;hp=4b240d5a546f46a21a870ac99e5eacaf23737fb4;hpb=11afcbff69c95915e5142bc4b55636ff6358ece9;p=oweals%2Fminetest.git diff --git a/src/biome.cpp b/src/biome.cpp index 4b240d5a5..e1dfc47af 100644 --- a/src/biome.cpp +++ b/src/biome.cpp @@ -1,6 +1,6 @@ /* -Minetest-c55 -Copyright (C) 2010-2011 kwolekr, Ryan Kwolek +Minetest +Copyright (C) 2010-2013 kwolekr, Ryan Kwolek This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -20,210 +20,186 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "biome.h" #include "nodedef.h" #include "map.h" //for ManualMapVoxelManipulator +#include "log.h" +#include "util/numeric.h" #include "main.h" - -#define BT_NONE 0 -#define BT_OCEAN 1 -#define BT_LAKE 2 -#define BT_SBEACH 3 -#define BT_GBEACH 4 -#define BT_PLAINS 5 -#define BT_HILLS 6 -#define BT_EXTREMEHILLS 7 -#define BT_MOUNTAINS 8 -#define BT_DESERT 9 -#define BT_DESERTHILLS 10 -#define BT_HELL 11 -#define BT_AETHER 12 - -#define BT_BTMASK 0x3F - -#define BTF_SNOW 0x40 -#define BTF_FOREST 0x80 - -#define BGFREQ_1 ( 0.40) -#define BGFREQ_2 (BGFREQ_1 + 0.05) -#define BGFREQ_3 (BGFREQ_2 + 0.08) -#define BGFREQ_4 (BGFREQ_3 + 0.35) -#define BGFREQ_5 (BGFREQ_4 + 0.18) -//BGFREQ_5 is not checked as an upper bound; it ought to sum up to 1.00, but it's okay if it doesn't. - - -/*float bg1_temps[] = {0.0}; -int bg1_biomes[] = {BT_OCEAN}; - -float bg2_temps[] = {10.0}; -int bg2_biomes[] = {BT_GBEACH, BT_SBEACH}; - -float bg3_temps[] = {30.0, 40.0}; -int bg3_biomes[] = {BT_HILLS, BT_EXTREMEHILLS, BT_MOUNTAINS}; - -float bg4_temps[] = {25.0, 30.0, 35.0, 40.0}; -int bg4_biomes[] = {BT_HILLS, BT_EXTREMEHILLS, BT_MOUNTAINS, BT_DESERT, BT_DESERTHILLS}; - -float bg5_temps[] = {5.0, 40.0}; -int bg5_biomes[] = {BT_LAKE, BT_PLAINS, BT_DESERT};*/ - - -BiomeDefManager::BiomeDefManager(IGameDef *gamedef) { - this->m_gamedef = gamedef; - this->ndef = gamedef->ndef(); - - //addDefaultBiomes(); //can't do this in the ctor, too early +#include "util/mathconstants.h" +#include "porting.h" + +NoiseParams nparams_biome_def_heat(50, 50, v3f(500.0, 500.0, 500.0), 5349, 3, 0.70); +NoiseParams nparams_biome_def_humidity(50, 50, v3f(500.0, 500.0, 500.0), 842, 3, 0.55); + + +BiomeDefManager::BiomeDefManager() { + biome_registration_finished = false; + np_heat = &nparams_biome_def_heat; + np_humidity = &nparams_biome_def_humidity; + + // Create default biome to be used in case none exist + Biome *b = new Biome; + + b->id = 0; + b->name = "Default"; + b->flags = 0; + + b->depth_top = 0; + b->depth_filler = 0; + + b->nname_top = "air"; + b->nname_filler = "air"; + b->nname_water = "mapgen_water_source"; + b->nname_dust = "air"; + b->nname_dust_water = "mapgen_water_source"; + + b->c_top = CONTENT_IGNORE; + b->c_filler = CONTENT_IGNORE; + b->c_water = CONTENT_IGNORE; + b->c_dust = CONTENT_IGNORE; + b->c_dust_water = CONTENT_IGNORE; + + b->height_min = -MAP_GENERATION_LIMIT; + b->height_max = MAP_GENERATION_LIMIT; + b->heat_point = 0.0; + b->humidity_point = 0.0; + + biomes.push_back(b); } BiomeDefManager::~BiomeDefManager() { - for (int i = 0; i != bgroups.size(); i++) - delete bgroups[i]; + //if (biomecache) + // delete[] biomecache; + + for (size_t i = 0; i != biomes.size(); i++) + delete biomes[i]; } -void BiomeDefManager::addBiome() { - +Biome *BiomeDefManager::createBiome(BiomeTerrainType btt) { + /*switch (btt) { + case BIOME_TERRAIN_NORMAL: + return new Biome; + case BIOME_TERRAIN_LIQUID: + return new BiomeLiquid; + case BIOME_TERRAIN_NETHER: + return new BiomeHell; + case BIOME_TERRAIN_AETHER: + return new BiomeSky; + case BIOME_TERRAIN_FLAT: + return new BiomeSuperflat; + } + return NULL;*/ + return new Biome; } -NoiseParams npmtdef = {0.0, 20.0, v3f(250., 250., 250.), 82341, 5, 0.6}; - -void BiomeDefManager::addDefaultBiomes() { - std::vector *bgroup; - Biome *b; - - //bgroup = new std::vector; - - b = new Biome; - b->name = "Default"; - b->n_top = MapNode(ndef->getId("mapgen_stone")); - b->n_filler = b->n_top; - b->ntopnodes = 0; - b->height_min = -MAP_GENERATION_LIMIT; - b->height_max = MAP_GENERATION_LIMIT; - b->heat_min = FLT_MIN; - b->heat_max = FLT_MAX; - b->humidity_min = FLT_MIN; - b->humidity_max = FLT_MAX; - b->np = &npmtdef; - biome_default = b; - - //bgroup->push_back(b); - //bgroups.push_back(bgroup); +// just a PoC, obviously needs optimization later on (precalculate this) +void BiomeDefManager::calcBiomes(BiomeNoiseInput *input, u8 *biomeid_map) { + int i = 0; + for (int y = 0; y != input->mapsize.Y; y++) { + for (int x = 0; x != input->mapsize.X; x++, i++) { + float heat = (input->heat_map[i] + 1) * 50; + float humidity = (input->humidity_map[i] + 1) * 50; + biomeid_map[i] = getBiome(heat, humidity, input->height_map[i])->id; + } + } } -Biome *BiomeDefManager::getBiome(float bgfreq, float heat, float humidity) { - std::vector bgroup; +void BiomeDefManager::resolveNodeNames(INodeDefManager *ndef) { Biome *b; - int i; - - int ngroups = bgroup_freqs.size(); - if (!ngroups) - return biome_default; - for (i = 0; (i != ngroups - 1) && (bgfreq > bgroup_freqs[i]); i++); - bgroup = *(bgroups[i]); - - int nbiomes = bgroup.size(); - if (!nbiomes) - return biome_default; - for (i = 0; i != nbiomes - 1; i++) { - b = bgroup[i]; - if (heat >= b->heat_min && heat <= b->heat_max && - humidity >= b->humidity_min && humidity <= b->humidity_max) - return b; + + biome_registration_finished = true; + + for (size_t i = 0; i < biomes.size(); i++) { + b = biomes[i]; + + b->c_top = ndef->getId(b->nname_top); + if (b->c_top == CONTENT_IGNORE) { + errorstream << "BiomeDefManager::resolveNodeNames: node '" + << b->nname_top << "' not defined" << std::endl; + b->c_top = CONTENT_AIR; + b->depth_top = 0; + } + + b->c_filler = ndef->getId(b->nname_filler); + if (b->c_filler == CONTENT_IGNORE) { + errorstream << "BiomeDefManager::resolveNodeNames: node '" + << b->nname_filler << "' not defined" << std::endl; + b->c_filler = CONTENT_AIR; + b->depth_filler = 0; + } + + b->c_water = ndef->getId(b->nname_water); + if (b->c_water == CONTENT_IGNORE) { + errorstream << "BiomeDefManager::resolveNodeNames: node '" + << b->nname_water << "' not defined" << std::endl; + b->c_water = CONTENT_AIR; + } + + b->c_dust = ndef->getId(b->nname_dust); + if (b->c_dust == CONTENT_IGNORE) { + errorstream << "BiomeDefManager::resolveNodeNames: node '" + << b->nname_dust << "' not defined" << std::endl; + } + + b->c_dust_water = ndef->getId(b->nname_dust_water); + if (b->c_dust_water == CONTENT_IGNORE) { + errorstream << "BiomeDefManager::resolveNodeNames: node '" + << b->nname_dust_water << "' not defined" << std::endl; + } } - - return biome_default; -} - - -//////////////////////////// [ Generic biome ] //////////////////////////////// - - -int Biome::getSurfaceHeight(float noise_terrain) { - return np->offset + np->scale * noise_terrain; } -void Biome::genColumn(Mapgen *mg, int x, int z, int y1, int y2) { - //printf("(%d, %d): %f\n", x, z, mg->map_terrain[z * mg->ystride + x]); - - //int surfaceh = 4; - int surfaceh = np->offset + np->scale * mg->map_terrain[(z - mg->node_min.Z) * 80 /*THIS IS TEMPORARY mg->ystride*/ + (x - mg->node_min.X)]; - //printf("gen column %f\n", ); - int y = y1; - int i = mg->vmanip->m_area.index(x, y, z); //z * mg->zstride + x + (y - mg->vmanip->m_area.MinEdge.Y) * mg->ystride; - for (; y <= surfaceh - ntopnodes && y <= y2; y++, i += mg->ystride) - mg->vmanip->m_data[i] = n_filler; - for (; y <= surfaceh && y <= y2; y++, i += mg->ystride) - mg->vmanip->m_data[i] = n_top; - for (; y <= y2; y++, i += mg->ystride) - mg->vmanip->m_data[i] = mg->n_air; -} - - - -///////////////////////////// [ Ocean biome ] ///////////////////////////////// - - - -void BiomeOcean::genColumn(Mapgen *mg, int x, int z, int y1, int y2) { - int y, i = 0; - - int surfaceh = np->offset + np->scale * mg->map_terrain[z * mg->ystride + x]; - - i = z * mg->zstride + x; - for (y = y1; y <= surfaceh - ntopnodes && y <= y2; y++, i += mg->ystride) - mg->vmanip->m_data[i] = n_filler; - for (; y <= surfaceh && y <= y2; y++, i += mg->ystride) - mg->vmanip->m_data[i] = n_top; - for (; y <= y2; y++, i += mg->ystride) - mg->vmanip->m_data[i] = mg->n_air; -} - - -///////////////////////////// [ Nether biome ] ///////////////////////////////// - - -int BiomeHell::getSurfaceHeight(float noise_terrain) { - return np->offset + np->scale * noise_terrain; -} - - -void BiomeHell::genColumn(Mapgen *mg, int x, int z, int y1, int y2) { - int y, i = 0; - - int surfaceh = np->offset + np->scale * mg->map_terrain[z * mg->ystride + x]; +void BiomeDefManager::addBiome(Biome *b) { + if (biome_registration_finished) { + errorstream << "BIomeDefManager: biome registration already finished, dropping " << b->name <= 0xFF) { + errorstream << "BiomeDefManager: too many biomes, dropping " << b->name << std::endl; + delete b; + return; + } - i = z * mg->zstride + x; - for (y = y1; y <= surfaceh - ntopnodes && y <= y2; y++, i += mg->ystride) - mg->vmanip->m_data[i] = n_filler; - for (; y <= surfaceh && y <= y2; y++, i += mg->ystride) - mg->vmanip->m_data[i] = n_top; - for (; y <= y2; y++, i += mg->ystride) - mg->vmanip->m_data[i] = mg->n_air; + b->id = (u8)nbiomes; + biomes.push_back(b); + verbosestream << "BiomeDefManager: added biome " << b->name << std::endl; } -///////////////////////////// [ Aether biome ] //////////////////////////////// - -/////////////////////////// [ Superflat biome ] /////////////////////////////// +Biome *BiomeDefManager::getBiome(float heat, float humidity, s16 y) { + Biome *b, *biome_closest = NULL; + float dist_min = FLT_MAX; + for (size_t i = 1; i < biomes.size(); i++) { + b = biomes[i]; + if (y > b->height_max || y < b->height_min) + continue; -int BiomeSuperflat::getSurfaceHeight(float noise_terrain) { - return ntopnodes; + float d_heat = heat - b->heat_point; + float d_humidity = humidity - b->humidity_point; + float dist = (d_heat * d_heat) + + (d_humidity * d_humidity); + if (dist < dist_min) { + dist_min = dist; + biome_closest = b; + } + } + + return biome_closest ? biome_closest : biomes[0]; } -void BiomeSuperflat::genColumn(Mapgen *mg, int x, int z, int y1, int y2) { - int y, i = 0; - - int surfaceh = ntopnodes; - - i = z * mg->zstride + x; - for (y = y1; y <= surfaceh - ntopnodes && y <= y2; y++, i += mg->ystride) - mg->vmanip->m_data[i] = n_filler; - for (; y <= surfaceh && y <= y2; y++, i += mg->ystride) - mg->vmanip->m_data[i] = n_top; - for (; y <= y2; y++, i += mg->ystride) - mg->vmanip->m_data[i] = mg->n_air; +u8 BiomeDefManager::getBiomeIdByName(const char *name) { + for (size_t i = 0; i != biomes.size(); i++) { + if (!strcasecmp(name, biomes[i]->name.c_str())) + return i; + } + + return 0; }