mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Deduplicate some code shared between blank and simplex generators

Browse Source
This commit is contained in:
Aaron van Geffen
2024-09-10 21:35:46 +02:00
parent e10e554872
commit 23edd3c0d0
2 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2-ui/windows/MapGen.cpp
View File

@@ -430,13 +430,13 @@ namespace OpenRCT2::Ui::Windows
switch (mapgenSettings.algorithm)
{
case MapGenAlgorithm::blank:
mapgenSettings.baseHeight += 2;
mapgenSettings.waterLevel += 2;
mapgenSettings.baseHeight += kMinimumLandHeight;
mapgenSettings.waterLevel += kMinimumWaterHeight;
break;
case MapGenAlgorithm::simplexNoise:
mapgenSettings.baseHeight += 2;
mapgenSettings.waterLevel += 2;
mapgenSettings.baseHeight += kMinimumLandHeight;
mapgenSettings.waterLevel += kMinimumWaterHeight;
mapgenSettings.heightmapLow = UtilRand() % 4;
mapgenSettings.heightmapHigh = 12 + (UtilRand() % (32 - 12));
mapgenSettings.simplex_base_freq = 1.75f;

37
src/openrct2/world/MapGen.cpp
View File

@@ -206,18 +206,17 @@ static ObjectEntryIndex MapGenEdgeTextureId(MapGenSettings* settings, ObjectEntr
return edgeTextureId;
}
static void MapGenGenerateBlank(MapGenSettings* settings)
static void MapGenResetSurfaces(MapGenSettings* settings)
{
int32_t x, y;
MapClearAllElements();
MapInit(settings->mapSize);
const auto surfaceTextureId = MapGenSurfaceTextureId(settings);
const auto edgeTextureId = MapGenEdgeTextureId(settings, surfaceTextureId);
MapInit(settings->mapSize);
for (y = 1; y < settings->mapSize.y - 1; y++)
for (auto y = 1; y < settings->mapSize.y - 1; y++)
{
for (x = 1; x < settings->mapSize.x - 1; x++)
for (auto x = 1; x < settings->mapSize.x - 1; x++)
{
auto surfaceElement = MapGetSurfaceElementAt(TileCoordsXY{ x, y });
if (surfaceElement != nullptr)
@@ -229,36 +228,20 @@ static void MapGenGenerateBlank(MapGenSettings* settings)
}
}
}
}
static void MapGenGenerateBlank(MapGenSettings* settings)
{
MapGenResetSurfaces(settings);
MapGenSetWaterLevel(settings->waterLevel);
}
static void MapGenGenerateSimplex(MapGenSettings* settings)
{
const auto surfaceTextureId = MapGenSurfaceTextureId(settings);
const auto edgeTextureId = MapGenEdgeTextureId(settings);
MapClearAllElements();
// Initialise the base map
const auto& mapSize = settings->mapSize;
MapInit(mapSize);
for (auto y = 1; y < mapSize.y - 1; y++)
{
for (auto x = 1; x < mapSize.x - 1; x++)
{
auto surfaceElement = MapGetSurfaceElementAt(TileCoordsXY{ x, y });
if (surfaceElement != nullptr)
{
surfaceElement->SetSurfaceObjectIndex(surfaceTextureId);
surfaceElement->SetEdgeObjectIndex(edgeTextureId);
surfaceElement->BaseHeight = settings->baseHeight;
surfaceElement->ClearanceHeight = settings->baseHeight;
}
}
}
MapGenResetSurfaces(settings);
// Create the temporary height map and initialise
auto& mapSize = settings->mapSize;
_heightSize = { mapSize.x * 2, mapSize.y * 2 };
_height = new uint8_t[_heightSize.y * _heightSize.x];
std::fill_n(_height, _heightSize.y * _heightSize.x, 0x00);