luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-16 01:45:36 +02:00
Code 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

8
src/mapgen_math.cpp
View File

@@ -147,7 +147,7 @@ double sphere(double x, double y, double z, double d, int ITR = 1) {
//////////////////////// Mapgen Math parameter read/write
bool MapgenMathParams::readParams(Settings *settings) {
void MapgenMathParams::readParams(Settings *settings) {
//params = settings->getJson("mg_math");
// can be counfigured from here.
std::string value = "{}";
@@ -157,8 +157,6 @@ bool MapgenMathParams::readParams(Settings *settings) {
}
if (params["generator"].empty()) params["generator"] = settings->get("mgmath_generator");
return true;
}
@@ -169,8 +167,8 @@ void MapgenMathParams::writeParams(Settings *settings) {
///////////////////////////////////////////////////////////////////////////////
MapgenMath::MapgenMath(int mapgenid, MapgenMathParams *params_, EmergeManager *emerge) : MapgenV7(mapgenid, params_, emerge) {
mg_params = params_;
MapgenMath::MapgenMath(int mapgenid, MapgenParams *params_, EmergeManager *emerge) : MapgenV7(mapgenid, params_, emerge) {
mg_params = (MapgenMathParams *)params_;
this->flags |= MG_NOLIGHT;
Json::Value & params = mg_params->params;