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

Changed RouteOpisometer.cellStops to act like a set and prevent repeats. Also allow holding shift to go off-road while drawing it.

Browse source
This commit is contained in:
Richard Robertson 2021-03-12 09:17:52 -06:00
parent c86b480eb3
commit 426ee32ee5
2 changed files with 20 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/ui/measurers.js
View file

@ -326,12 +326,13 @@ class RouteOpisometer extends Measurer {
trackCell(cell, rigth) { trackCell(cell, rigth) {
this.checkCellStops(); this.checkCellStops();
const cellStops = this.cellStops; const cellStops = this.cellStops;
const foundIndex = cellStops.indexOf(cell);
if (rigth) { if (rigth) {
if (last(cellStops) === cell) { if (last(cellStops) === cell) {
return; return;
} else if (cellStops.length > 1 && cellStops[cellStops.length - 2] === cell) { } else if (cellStops.length > 1 && foundIndex != -1) {
cellStops.pop(); cellStops.splice(foundIndex + 1);
this.points.pop(); this.points.splice(foundIndex + 1);
this.updateCurve(); this.updateCurve();
this.updateLabel(); this.updateLabel();
} else { } else {
@ -340,13 +341,12 @@ class RouteOpisometer extends Measurer {
this.updateCurve(); this.updateCurve();
this.updateLabel(); this.updateLabel();
} }
} } else {
else {
if (cellStops[0] === cell) { if (cellStops[0] === cell) {
return; return;
} else if (cellStops.length > 1 && cellStops[1] === cell) { } else if (cellStops.length > 1 && foundIndex != -1) {
cellStops.shift(); cellStops.splice(0, foundIndex);
this.points.shift(); this.points.splice(0, foundIndex);
this.updateCurve(); this.updateCurve();
this.updateLabel(); this.updateLabel();
} else { } else {
@ -361,14 +361,10 @@ class RouteOpisometer extends Measurer {
getCellRouteCoord(c) { getCellRouteCoord(c) {
const cells = pack.cells; const cells = pack.cells;
const burgs = pack.burgs; const burgs = pack.burgs;
if (cells.road[c]) {
const b = cells.burg[c]; const b = cells.burg[c];
const x = b ? burgs[b].x : cells.p[c][0]; const x = b ? burgs[b].x : cells.p[c][0];
const y = b ? burgs[b].y : cells.p[c][1]; const y = b ? burgs[b].y : cells.p[c][1];
return [x, y]; return [x, y];
} else {
return null;
}
} }
draw() { draw() {
@ -377,7 +373,7 @@ class RouteOpisometer extends Measurer {
const dash = this.getDash(); const dash = this.getDash();
const context = this; const context = this;
const el = this.el = ruler.append("g").attr("class", "opisometer")/*.call(d3.drag().on("start", this.drag))*/.attr("font-size", 10 * size); const el = this.el = ruler.append("g").attr("class", "opisometer").attr("font-size", 10 * size);
el.append("path").attr("class", "white").attr("stroke-width", size); el.append("path").attr("class", "white").attr("stroke-width", size);
el.append("path").attr("class", "gray").attr("stroke-width", size).attr("stroke-dasharray", dash); el.append("path").attr("class", "gray").attr("stroke-width", size).attr("stroke-dasharray", dash);
const rulerPoints = el.append("g").attr("class", "rulerPoints").attr("stroke-width", .5 * size).attr("font-size", 2 * size); const rulerPoints = el.append("g").attr("class", "rulerPoints").attr("stroke-width", .5 * size).attr("font-size", 2 * size);
@ -414,7 +410,7 @@ class RouteOpisometer extends Measurer {
const cells = pack.cells; const cells = pack.cells;
const c = findCell(mousePoint[0], mousePoint[1]); const c = findCell(mousePoint[0], mousePoint[1]);
if (!cells.road[c]) { if (!cells.road[c] && !d3.event.sourceEvent.shiftKey) {
return; return;
} }

10
modules/ui/units-editor.js
View file

@ -250,7 +250,7 @@ function editUnits() {
this.classList.remove("pressed"); this.classList.remove("pressed");
} else { } else {
if (!layerIsOn("toggleRulers")) toggleRulers(); if (!layerIsOn("toggleRulers")) toggleRulers();
tip("Draw a curve along routes to measure length", true); tip("Draw a curve along routes to measure length. Hold Shift to measure away from roads.", true);
unitsBottom.querySelectorAll(".pressed").forEach(button => button.classList.remove("pressed")); unitsBottom.querySelectorAll(".pressed").forEach(button => button.classList.remove("pressed"));
this.classList.add("pressed"); this.classList.add("pressed");
viewbox.style("cursor", "crosshair").call(d3.drag().on("start", function() { viewbox.style("cursor", "crosshair").call(d3.drag().on("start", function() {
@ -258,7 +258,7 @@ function editUnits() {
const burgs = pack.burgs; const burgs = pack.burgs;
const point = d3.mouse(this); const point = d3.mouse(this);
const c = findCell(point[0], point[1]); const c = findCell(point[0], point[1]);
if (cells.road[c]) { if (cells.road[c] || d3.event.sourceEvent.shiftKey) {
const b = cells.burg[c]; const b = cells.burg[c];
const x = b ? burgs[b].x : cells.p[c][0]; const x = b ? burgs[b].x : cells.p[c][0];
const y = b ? burgs[b].y : cells.p[c][1]; const y = b ? burgs[b].y : cells.p[c][1];
@ -267,11 +267,7 @@ function editUnits() {
d3.event.on("drag", function () { d3.event.on("drag", function () {
const point = d3.mouse(this); const point = d3.mouse(this);
const c = findCell(point[0], point[1]); const c = findCell(point[0], point[1]);
if (cells.road[c]) { if (cells.road[c] || d3.event.sourceEvent.shiftKey) {
/*const b = cells.burg[c];
const x = b ? burgs[b].x : cells.p[c][0];
const y = b ? burgs[b].y : cells.p[c][1];
routeOpisometer.addPoint([x, y]);*/
routeOpisometer.trackCell(c, true); routeOpisometer.trackCell(c, true);
} }
}); });