backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-19 10:31:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: refactor greneration routine

Browse source
This commit is contained in:
Azgaar 2022-07-10 23:31:03 +03:00
parent d1208b12ec
commit 6b2de4d20e
19 changed files with 401 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/dialogs/dialogs/heightmap-editor.js
View file

@ -6,7 +6,7 @@ import {ERROR, INFO, TIME} from "config/logging";
import {closeDialogs} from "dialogs/utils";
import {layerIsOn, turnLayerButtonOff, turnLayerButtonOn, updatePresetInput, renderLayer} from "layers";
import {drawCoastline} from "modules/coastline";
import {markFeatures, markupGridOcean} from "modules/markup";
import {markupGridFeatures} from "modules/markup";
import {generatePrecipitation} from "modules/precipitation";
import {calculateTemperatures} from "modules/temperature";
import {moveCircle, removeCircle} from "modules/ui/editors";
@ -214,11 +214,11 @@ export function open(options) {
TIME && console.time("regenerateErasedData");
const erosionAllowed = allowErosion.checked;
markFeatures();
markupGridOcean();
markupGridFeatures();
if (erosionAllowed) {
Lakes.addLakesInDeepDepressions();
Lakes.openNearSeaLakes();
Lakes.addLakesInDeepDepressions(grid);
Lakes.openNearSeaLakes(grid);
}
OceanLayers();
calculateTemperatures();
@ -336,8 +336,8 @@ export function open(options) {
zone.selectAll("*").remove();
});
markFeatures();
markupGridOcean();
markupGridFeatures();
if (erosionAllowed) addLakesInDeepDepressions();
OceanLayers();
calculateTemperatures();

4
src/dialogs/dialogs/heightmap-selection.js
View file

@ -2,7 +2,7 @@ import * as d3 from "d3";
import {heightmapTemplates} from "config/heightmap-templates";
import {precreatedHeightmaps} from "config/precreated-heightmaps";
import {shouldRegenerateGrid, generateGrid} from "utils/graphUtils";
import {shouldRegenerateGridPoints, generateGrid} from "utils/graphUtils";
import {byId} from "utils/shorthands";
import {generateSeed} from "utils/probabilityUtils";
import {getColorScheme} from "utils/colorUtils";
@ -274,7 +274,7 @@ function getName(id) {
}
function getGraph(currentGraph) {
const newGraph = shouldRegenerateGrid(currentGraph) ? generateGrid() : structuredClone(currentGraph);
const newGraph = shouldRegenerateGridPoints(currentGraph) ? generateGrid() : structuredClone(currentGraph);
delete newGraph.cells.h;
return newGraph;
}