backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2026-02-04 17:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: update editIce function to accept element parameter and improve logic for glacier handling

Browse source
This commit is contained in:
StempunkDev 2026-01-14 22:42:27 +01:00
parent 3711478d59
commit 6003dbb111
2 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/modules/ui/editors.js
View file

@ -26,7 +26,7 @@ function clicked() {
else if (ancestor.id === "labels" && el.tagName === "tspan") editLabel(); else if (ancestor.id === "labels" && el.tagName === "tspan") editLabel();
else if (grand.id === "burgLabels") editBurg(); else if (grand.id === "burgLabels") editBurg();
else if (grand.id === "burgIcons") editBurg(); else if (grand.id === "burgIcons") editBurg();
else if (parent.id === "ice") editIce(); else if (parent.id === "ice") editIce(el);
else if (parent.id === "terrain") editReliefIcon(); else if (parent.id === "terrain") editReliefIcon();
else if (grand.id === "markers" || great.id === "markers") editMarker(); else if (grand.id === "markers" || great.id === "markers") editMarker();
else if (grand.id === "coastline") editCoastline(); else if (grand.id === "coastline") editCoastline();

42
public/modules/ui/ice-editor.js
View file

@ -1,49 +1,48 @@
"use strict"; "use strict";
function editIce() { function editIce(element) {
if (customization) return; if (customization) return;
if (elSelected && element === elSelected.node()) return;
closeDialogs(".stable"); closeDialogs(".stable");
if (!layerIsOn("toggleIce")) toggleIce(); if (!layerIsOn("toggleIce")) toggleIce();
elSelected = d3.select(d3.event.target); elSelected = d3.select(d3.event.target);
const index = +elSelected.attr("data-index"); const index = +elSelected.attr("data-index");
const isGlacier = elSelected.attr("type") === "iceShield"; const isGlacier = elSelected.attr("type") === "glacier";
const type = isGlacier ? "Glacier" : "Iceberg"; const type = isGlacier ? "Glacier" : "Iceberg";
document.getElementById("iceRandomize").style.display = isGlacier ? "none" : "inline-block"; document.getElementById("iceRandomize").style.display = isGlacier ? "none" : "inline-block";
document.getElementById("iceSize").style.display = isGlacier ? "none" : "inline-block"; document.getElementById("iceSize").style.display = isGlacier ? "none" : "inline-block";
if (!isGlacier) document.getElementById("iceSize").value = +elSelected.attr("size"); if (!isGlacier) document.getElementById("iceSize").value = isGlacier ? "" : pack.ice.icebergs[index].size;
ice.selectAll("*").classed("draggable", true).call(d3.drag().on("drag", dragElement)); ice.selectAll("*").classed("draggable", true).call(d3.drag().on("drag", dragElement));
$("#iceEditor").dialog({ $("#iceEditor").dialog({
title: "Edit " + type, title: "Edit " + type,
resizable: false, resizable: false,
position: {my: "center top+60", at: "top", of: d3.event, collision: "fit"}, position: { my: "center top+60", at: "top", of: d3.event, collision: "fit" },
close: closeEditor close: closeEditor
}); });
if (!modules.editIce) { if (modules.editIce) return;
modules.editIce = {currentIndex: index, isGlacier: isGlacier}; modules.editIce = true;
// add listeners // add listeners
document.getElementById("iceEditStyle").addEventListener("click", () => editStyle("ice")); document.getElementById("iceEditStyle").addEventListener("click", () => editStyle("ice"));
document.getElementById("iceRandomize").addEventListener("click", randomizeShape); document.getElementById("iceRandomize").addEventListener("click", randomizeShape);
document.getElementById("iceSize").addEventListener("input", changeSize); document.getElementById("iceSize").addEventListener("input", changeSize);
document.getElementById("iceNew").addEventListener("click", toggleAdd); document.getElementById("iceNew").addEventListener("click", toggleAdd);
document.getElementById("iceRemove").addEventListener("click", removeIce); document.getElementById("iceRemove").addEventListener("click", removeIce);
}
modules.editIce.currentIndex = index;
modules.editIce.isGlacier = isGlacier;
function randomizeShape() { function randomizeShape() {
const idx = modules.editIce.currentIndex; const idx = +elSelected.attr("data-index");
Ice.randomizeIcebergShape(idx); Ice.randomizeIcebergShape(idx);
redrawIceberg(idx); redrawIceberg(idx);
} }
function changeSize() { function changeSize() {
const newSize = +this.value; const newSize = +this.value;
const idx = modules.editIce.currentIndex; const idx = +elSelected.attr("data-index");
Ice.changeIcebergSize(idx, newSize); Ice.changeIcebergSize(idx, newSize);
redrawIceberg(idx); redrawIceberg(idx);
} }
@ -70,7 +69,7 @@ function editIce() {
} }
function removeIce() { function removeIce() {
const type = modules.editIce.isGlacier ? "Glacier" : "Iceberg"; const type = elSelected.attr("type") === "glacier" ? "Glacier" : "Iceberg";
alertMessage.innerHTML = /* html */ `Are you sure you want to remove the ${type}?`; alertMessage.innerHTML = /* html */ `Are you sure you want to remove the ${type}?`;
$("#alert").dialog({ $("#alert").dialog({
resizable: false, resizable: false,
@ -78,7 +77,7 @@ function editIce() {
buttons: { buttons: {
Remove: function () { Remove: function () {
$(this).dialog("close"); $(this).dialog("close");
Ice.removeIce(type.toLowerCase(), modules.editIce.currentIndex); Ice.removeIce(type.toLowerCase(), +elSelected.attr("data-index"));
$("#iceEditor").dialog("close"); $("#iceEditor").dialog("close");
}, },
Cancel: function () { Cancel: function () {
@ -89,7 +88,6 @@ function editIce() {
} }
function dragElement() { function dragElement() {
const isGlacier = elSelected.attr("type") === "iceShield";
const idx = +elSelected.attr("data-index"); const idx = +elSelected.attr("data-index");
const initialTransform = parseTransform(this.getAttribute("transform")); const initialTransform = parseTransform(this.getAttribute("transform"));
const dx = initialTransform[0] - d3.event.x; const dx = initialTransform[0] - d3.event.x;
@ -100,10 +98,10 @@ function editIce() {
const y = d3.event.y; const y = d3.event.y;
const transform = `translate(${dx + x},${dy + y})`; const transform = `translate(${dx + x},${dy + y})`;
this.setAttribute("transform", transform); this.setAttribute("transform", transform);
// Update data model with new position // Update data model with new position
const offset = [dx + x, dy + y]; const offset = [dx + x, dy + y];
const iceData = isGlacier ? pack.ice.glaciers[idx] : pack.ice.icebergs[idx]; const iceData = elSelected.attr("type") === "glacier" ? pack.ice.glaciers[idx] : pack.ice.icebergs[idx];
if (iceData) { if (iceData) {
// Store offset for visual positioning, actual geometry stays in points // Store offset for visual positioning, actual geometry stays in points
iceData.offset = offset; iceData.offset = offset;