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

Auto-Smoothing,dist fix

Browse source
This commit is contained in:
Mészáros Gergely 2021-09-14 00:52:06 +02:00
parent d2bd611412
commit 006ab7f329
2 changed files with 40 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/ui/submap.js
View file

@ -20,7 +20,7 @@ const generateSubmap = debounce(async function () {
WARN && console.warn("Resampling current map");
closeDialogs("#worldConfigurator, #options3d");
const checked = id => Boolean(document.getElementById(id).checked)
const settings = {
const options = {
promoteTown: checked("submapPromoteTown"),
depressRivers: checked("submapDepressRivers"),
copyBurgs: checked("submapCopyBurgs"),
@ -28,6 +28,7 @@ const generateSubmap = debounce(async function () {
addMilitary: checked("submapAddMilitary"),
addMarkers: checked("submapAddMarkers"),
addZones: checked("submapAddZones"),
smoothHeightMap: scale > 2,
}
// Create projection func from current zoom extents
@ -64,9 +65,9 @@ const generateSubmap = debounce(async function () {
};
try {
await Submap.resample(oldstate, projection, settings);
await Submap.resample(oldstate, projection, options);
} catch (error) {
generateSubmapErrorHandler(error);
generateSubmapErrorHandler(error, oldstate, projection, options);
}
oldstate = null; // destroy old state to free memory
@ -76,7 +77,7 @@ const generateSubmap = debounce(async function () {
if ($("#worldConfigurator").is(":visible")) editWorld();
}, 1000);
function generateSubmapErrorHandler(error) {
function generateSubmapErrorHandler(error, oldstate, projection, options) {
ERROR && console.error(error);
clearMainTip();
@ -88,12 +89,12 @@ function generateSubmapErrorHandler(error) {
title: "Generation error",
width: "32em",
buttons: {
"Clear data": function () {
localStorage.clear();
localStorage.setItem("version", version);
},
Regenerate: function () {
generateSubmap();
Regenerate: async function () {
try {
await Submap.resample(oldstate, projection, options);
} catch (error) {
generateSubmapErrorHandler(error, oldstate, projection, options);
}
$(this).dialog("close");
},
Ignore: function () {