mirror of
https://github.com/Azgaar/Fantasy-Map-Generator.git
synced 2025-12-17 01:41:22 +01:00
Dev submaps update (#780)
* Rescale style option for submaps. * namespace for submap ui. * Keep visual change for towns Co-authored-by: Mészáros Gergely <monk@geotronic.hu>
This commit is contained in:
Gergely Mészáros, Ph.D
GitHub
parent
b00a8a2228
commit
3cd30206b7
2 changed files with 186 additions and 152 deletions
|
|
@ -1728,8 +1728,8 @@
|
||||||
|
|
||||||
<p>Click to create a new map:</p>
|
<p>Click to create a new map:</p>
|
||||||
<div id="resamplers">
|
<div id="resamplers">
|
||||||
<button data-tip="Click to generate new (sub)map from the current viewport" onclick="openSubmapOptions()">Submap</button>
|
<button data-tip="Click to generate new (sub)map from the current viewport" onclick="UISubmap.openSubmapOptions()">Submap</button>
|
||||||
<button data-tip="Click to resample (transform) your map to different cellcount" onclick="openRemapOptions()">Resample</button>
|
<button data-tip="Click to resample (transform) your map to different cellcount" onclick="UISubmap.openRemapOptions()">Resample</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
@ -4488,6 +4488,10 @@
|
||||||
<input id="submapDepressRivers" class="checkbox" type="checkbox" />
|
<input id="submapDepressRivers" class="checkbox" type="checkbox" />
|
||||||
<label for="submapDepressRivers" class="checkbox-label">Errode riverbeds.</label>
|
<label for="submapDepressRivers" class="checkbox-label">Errode riverbeds.</label>
|
||||||
</div>
|
</div>
|
||||||
|
<div data-tip="Rescale styles (burg labels, emblem size) to match the new scale.">
|
||||||
|
<input id="submapRescaleStyles" class="checkbox" type="checkbox" checked/>
|
||||||
|
<label for="submapRescaleStyles" class="checkbox-label">Rescale Styles</label>
|
||||||
|
</div>
|
||||||
<div data-tip="Move all existing towns to the 'largetown' burg group">
|
<div data-tip="Move all existing towns to the 'largetown' burg group">
|
||||||
<input id="submapPromoteTowns" class="checkbox" type="checkbox" />
|
<input id="submapPromoteTowns" class="checkbox" type="checkbox" />
|
||||||
<label for="submapPromoteTowns" class="checkbox-label">Promote towns to largetowns</label>
|
<label for="submapPromoteTowns" class="checkbox-label">Promote towns to largetowns</label>
|
||||||
|
|
|
||||||
|
|
@ -4,158 +4,188 @@
|
||||||
UI elements for submap generation
|
UI elements for submap generation
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function openSubmapOptions() {
|
window.UISubmap = (function () {
|
||||||
$("#submapOptionsDialog").dialog({
|
function openSubmapOptions() {
|
||||||
title: "Submap options",
|
$("#submapOptionsDialog").dialog({
|
||||||
resizable: false,
|
title: "Submap options",
|
||||||
width: fitContent(),
|
resizable: false,
|
||||||
position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"},
|
width: fitContent(),
|
||||||
buttons: {
|
position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"},
|
||||||
Submap: function () {
|
buttons: {
|
||||||
$(this).dialog("close");
|
Submap: function () {
|
||||||
generateSubmap();
|
$(this).dialog("close");
|
||||||
},
|
generateSubmap();
|
||||||
Cancel: function () {
|
},
|
||||||
$(this).dialog("close");
|
Cancel: function () {
|
||||||
}
|
$(this).dialog("close");
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function openRemapOptions() {
|
|
||||||
resetZoom(0);
|
|
||||||
$("#remapOptionsDialog").dialog({
|
|
||||||
title: "Resampler options",
|
|
||||||
resizable: false,
|
|
||||||
width: fitContent(),
|
|
||||||
position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"},
|
|
||||||
buttons: {
|
|
||||||
Resample: function () {
|
|
||||||
const cellNumId = Number(document.getElementById("submapPointsInput").value);
|
|
||||||
const cells = cellsDensityConstants[cellNumId];
|
|
||||||
$(this).dialog("close");
|
|
||||||
if (!cells) {
|
|
||||||
console.error("Unknown cell number!");
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
changeCellsDensity(cellNumId);
|
|
||||||
resampleCurrentMap();
|
|
||||||
},
|
|
||||||
Cancel: function () {
|
|
||||||
$(this).dialog("close");
|
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/* callbacks */
|
|
||||||
|
|
||||||
const resampleCurrentMap = debounce(function () {
|
|
||||||
// Resample the whole map to different cell resolution or shape
|
|
||||||
WARN && console.warn("Resampling current map");
|
|
||||||
const options = {
|
|
||||||
lockMarkers: false,
|
|
||||||
lockBurgs: false,
|
|
||||||
depressRivers: false,
|
|
||||||
addLakesInDepressions: false,
|
|
||||||
promoteTowns: false,
|
|
||||||
smoothHeightMap: false,
|
|
||||||
projection: (x, y) => [x, y],
|
|
||||||
inverse: (x, y) => [x, y]
|
|
||||||
};
|
|
||||||
|
|
||||||
startResample(options);
|
|
||||||
}, 1000);
|
|
||||||
|
|
||||||
const generateSubmap = debounce(function () {
|
|
||||||
// Create submap from the current map
|
|
||||||
// submap limits defined by the current window size (canvas viewport)
|
|
||||||
|
|
||||||
WARN && console.warn("Resampling current map");
|
|
||||||
closeDialogs("#worldConfigurator, #options3d");
|
|
||||||
const checked = id => Boolean(document.getElementById(id).checked);
|
|
||||||
// Create projection func from current zoom extents
|
|
||||||
const [[x0, y0], [x1, y1]] = getViewBoxExtent();
|
|
||||||
const origScale = scale;
|
|
||||||
|
|
||||||
const options = {
|
|
||||||
lockMarkers: checked("submapLockMarkers"),
|
|
||||||
lockBurgs: checked("submapLockBurgs"),
|
|
||||||
|
|
||||||
depressRivers: checked("submapDepressRivers"),
|
|
||||||
addLakesInDepressions: checked("submapAddLakeInDepression"),
|
|
||||||
promoteTowns: checked("submapPromoteTowns"),
|
|
||||||
smoothHeightMap: scale > 2,
|
|
||||||
inverse: (x, y) => [x / origScale + x0, y / origScale + y0],
|
|
||||||
projection: (x, y) => [(x - x0) * origScale, (y - y0) * origScale],
|
|
||||||
};
|
|
||||||
|
|
||||||
// converting map position on the planet
|
|
||||||
const mapSizeOutput = document.getElementById("mapSizeOutput");
|
|
||||||
const latitudeOutput = document.getElementById("latitudeOutput");
|
|
||||||
const latN = 90 - ((180 - (mapSizeInput.value / 100) * 180) * latitudeOutput.value) / 100;
|
|
||||||
const newLatN = latN - ((y0 / graphHeight) * mapSizeOutput.value * 180) / 100;
|
|
||||||
mapSizeOutput.value /= scale;
|
|
||||||
latitudeOutput.value = ((90 - newLatN) / (180 - (mapSizeOutput.value / 100) * 180)) * 100;
|
|
||||||
document.getElementById("mapSizeInput").value = mapSizeOutput.value;
|
|
||||||
document.getElementById("latitudeInput").value = latitudeOutput.value;
|
|
||||||
|
|
||||||
// fix scale
|
|
||||||
distanceScaleInput.value = distanceScaleOutput.value = rn((distanceScale = distanceScaleOutput.value / scale), 2);
|
|
||||||
populationRateInput.value = populationRateOutput.value = rn((populationRate = populationRateOutput.value / scale), 2);
|
|
||||||
customization = 0;
|
|
||||||
startResample(options);
|
|
||||||
}, 1000);
|
|
||||||
|
|
||||||
async function startResample(options) {
|
|
||||||
undraw();
|
|
||||||
resetZoom(0);
|
|
||||||
let oldstate = {
|
|
||||||
grid: deepCopy(grid),
|
|
||||||
pack: deepCopy(pack),
|
|
||||||
seed,
|
|
||||||
graphWidth,
|
|
||||||
graphHeight
|
|
||||||
};
|
|
||||||
|
|
||||||
try {
|
|
||||||
const oldScale = scale;
|
|
||||||
await Submap.resample(oldstate, options);
|
|
||||||
if (options.promoteTowns) {
|
|
||||||
const groupName = "largetowns";
|
|
||||||
moveAllBurgsToGroup("towns", groupName);
|
|
||||||
changeRadius(rn(oldScale * 0.8, 2), groupName);
|
|
||||||
changeFontSize(svg.select(`#labels #${groupName}`), rn(oldScale * 2, 2));
|
|
||||||
invokeActiveZooming();
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
showSubmapErrorHandler(error);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
oldstate = null; // destroy old state to free memory
|
function openRemapOptions() {
|
||||||
|
resetZoom(0);
|
||||||
restoreLayers();
|
$("#remapOptionsDialog").dialog({
|
||||||
turnButtonOn("toggleMarkers");
|
title: "Resampler options",
|
||||||
if (ThreeD.options.isOn) ThreeD.redraw();
|
resizable: false,
|
||||||
if ($("#worldConfigurator").is(":visible")) editWorld();
|
width: fitContent(),
|
||||||
}
|
position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"},
|
||||||
|
buttons: {
|
||||||
function showSubmapErrorHandler(error) {
|
Resample: function () {
|
||||||
ERROR && console.error(error);
|
$(this).dialog("close");
|
||||||
clearMainTip();
|
resampleCurrentMap();
|
||||||
|
},
|
||||||
alertMessage.innerHTML = `Map resampling failed :_(.
|
Cancel: function () {
|
||||||
<br>You may retry after clearing stored data or contact us at discord.
|
$(this).dialog("close");
|
||||||
<p id="errorBox">${parseError(error)}</p>`;
|
}
|
||||||
$("#alert").dialog({
|
|
||||||
resizable: false,
|
|
||||||
title: "Generation error",
|
|
||||||
width: "32em",
|
|
||||||
buttons: {
|
|
||||||
Ok: function () {
|
|
||||||
$(this).dialog("close");
|
|
||||||
}
|
}
|
||||||
},
|
});
|
||||||
position: {my: "center", at: "center", of: "svg"}
|
}
|
||||||
});
|
|
||||||
}
|
/* callbacks */
|
||||||
|
|
||||||
|
const resampleCurrentMap = debounce(function () {
|
||||||
|
// Resample the whole map to different cell resolution or shape
|
||||||
|
const cellNumId = Number(document.getElementById("submapPointsInput").value);
|
||||||
|
if (!cellsDensityConstants[cellNumId]) {
|
||||||
|
console.error("Unknown cell number!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
changeCellsDensity(cellNumId);
|
||||||
|
WARN && console.warn("Resampling current map");
|
||||||
|
startResample({
|
||||||
|
lockMarkers: false,
|
||||||
|
lockBurgs: false,
|
||||||
|
depressRivers: false,
|
||||||
|
addLakesInDepressions: false,
|
||||||
|
promoteTowns: false,
|
||||||
|
smoothHeightMap: false,
|
||||||
|
rescaleStyles: false,
|
||||||
|
projection: (x, y) => [x, y],
|
||||||
|
inverse: (x, y) => [x, y]
|
||||||
|
});
|
||||||
|
}, 1000);
|
||||||
|
|
||||||
|
const generateSubmap = debounce(function () {
|
||||||
|
// Create submap from the current map
|
||||||
|
// submap limits defined by the current window size (canvas viewport)
|
||||||
|
|
||||||
|
WARN && console.warn("Resampling current map");
|
||||||
|
closeDialogs("#worldConfigurator, #options3d");
|
||||||
|
const checked = id => Boolean(document.getElementById(id).checked);
|
||||||
|
// Create projection func from current zoom extents
|
||||||
|
const [[x0, y0], [x1, y1]] = getViewBoxExtent();
|
||||||
|
const origScale = scale;
|
||||||
|
|
||||||
|
const options = {
|
||||||
|
lockMarkers: checked("submapLockMarkers"),
|
||||||
|
lockBurgs: checked("submapLockBurgs"),
|
||||||
|
|
||||||
|
depressRivers: checked("submapDepressRivers"),
|
||||||
|
addLakesInDepressions: checked("submapAddLakeInDepression"),
|
||||||
|
promoteTowns: checked("submapPromoteTowns"),
|
||||||
|
rescaleStyles: checked("submapRescaleStyles"),
|
||||||
|
smoothHeightMap: scale > 2,
|
||||||
|
inverse: (x, y) => [x / origScale + x0, y / origScale + y0],
|
||||||
|
projection: (x, y) => [(x - x0) * origScale, (y - y0) * origScale],
|
||||||
|
};
|
||||||
|
|
||||||
|
// converting map position on the planet
|
||||||
|
const mapSizeOutput = document.getElementById("mapSizeOutput");
|
||||||
|
const latitudeOutput = document.getElementById("latitudeOutput");
|
||||||
|
const latN = 90 - ((180 - (mapSizeInput.value / 100) * 180) * latitudeOutput.value) / 100;
|
||||||
|
const newLatN = latN - ((y0 / graphHeight) * mapSizeOutput.value * 180) / 100;
|
||||||
|
mapSizeOutput.value /= scale;
|
||||||
|
latitudeOutput.value = ((90 - newLatN) / (180 - (mapSizeOutput.value / 100) * 180)) * 100;
|
||||||
|
document.getElementById("mapSizeInput").value = mapSizeOutput.value;
|
||||||
|
document.getElementById("latitudeInput").value = latitudeOutput.value;
|
||||||
|
|
||||||
|
// fix scale
|
||||||
|
distanceScaleInput.value = distanceScaleOutput.value = rn((distanceScale = distanceScaleOutput.value / scale), 2);
|
||||||
|
populationRateInput.value = populationRateOutput.value = rn((populationRate = populationRateOutput.value / scale), 2);
|
||||||
|
customization = 0;
|
||||||
|
startResample(options);
|
||||||
|
}, 1000);
|
||||||
|
|
||||||
|
async function startResample(options) {
|
||||||
|
// Do model changes with Submap.resample then do view changes if needed.
|
||||||
|
undraw();
|
||||||
|
resetZoom(0);
|
||||||
|
let oldstate = {
|
||||||
|
grid: deepCopy(grid),
|
||||||
|
pack: deepCopy(pack),
|
||||||
|
seed,
|
||||||
|
graphWidth,
|
||||||
|
graphHeight
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const oldScale = scale;
|
||||||
|
await Submap.resample(oldstate, options);
|
||||||
|
if (options.promoteTowns) {
|
||||||
|
const groupName = "largetowns";
|
||||||
|
moveAllBurgsToGroup("towns", groupName);
|
||||||
|
changeRadius(rn(oldScale * 0.8, 2), groupName);
|
||||||
|
changeFontSize(svg.select(`#labels #${groupName}`), rn(oldScale * 2, 2));
|
||||||
|
invokeActiveZooming();
|
||||||
|
}
|
||||||
|
if (options.rescaleStyles) changeStyles(oldScale);
|
||||||
|
} catch (error) {
|
||||||
|
showSubmapErrorHandler(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
oldstate = null; // destroy old state to free memory
|
||||||
|
|
||||||
|
restoreLayers();
|
||||||
|
turnButtonOn("toggleMarkers");
|
||||||
|
if (ThreeD.options.isOn) ThreeD.redraw();
|
||||||
|
if ($("#worldConfigurator").is(":visible")) editWorld();
|
||||||
|
}
|
||||||
|
|
||||||
|
function changeStyles(scale) {
|
||||||
|
// resize burgIcons
|
||||||
|
const burgIcons = [...document.getElementById("burgIcons").querySelectorAll("g")];
|
||||||
|
for (const bi of burgIcons) {
|
||||||
|
const newRadius = rn(minmax(bi.getAttribute('size') * scale, 0.2, 10), 2);
|
||||||
|
changeRadius(newRadius, bi.id);
|
||||||
|
const swAttr = bi.attributes['stroke-width'];
|
||||||
|
swAttr.value = +swAttr.value * scale;
|
||||||
|
}
|
||||||
|
|
||||||
|
// burglabels
|
||||||
|
const burgLabels= [...document.getElementById("burgLabels").querySelectorAll("g")];
|
||||||
|
for (const bl of burgLabels) {
|
||||||
|
const size = +bl.dataset['size'];
|
||||||
|
bl.dataset['size'] = Math.max(rn((size + size / scale) / 2, 2), 1) * scale;
|
||||||
|
}
|
||||||
|
|
||||||
|
// emblems
|
||||||
|
const emblemMod = minmax((scale - 1) * 0.3 + 1, 0.5, 5);
|
||||||
|
emblemsStateSizeInput.value = minmax(+emblemsStateSizeInput.value * emblemMod, 0.5, 5);
|
||||||
|
emblemsProvinceSizeInput.value = minmax(+emblemsProvinceSizeInput.value * emblemMod, 0.5, 5);
|
||||||
|
emblemsBurgSizeInput.value = minmax(+emblemsBurgSizeInput.value * emblemMod, 0.5, 5);
|
||||||
|
drawEmblems();
|
||||||
|
}
|
||||||
|
|
||||||
|
function showSubmapErrorHandler(error) {
|
||||||
|
ERROR && console.error(error);
|
||||||
|
clearMainTip();
|
||||||
|
|
||||||
|
alertMessage.innerHTML = `Map resampling failed :_(.
|
||||||
|
<br>You may retry after clearing stored data or contact us at discord.
|
||||||
|
<p id="errorBox">${parseError(error)}</p>`;
|
||||||
|
$("#alert").dialog({
|
||||||
|
resizable: false,
|
||||||
|
title: "Generation error",
|
||||||
|
width: "32em",
|
||||||
|
buttons: {
|
||||||
|
Ok: function () {
|
||||||
|
$(this).dialog("close");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
position: {my: "center", at: "center", of: "svg"}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return {openSubmapOptions, openRemapOptions}
|
||||||
|
})();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue