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

refactor: curve and shorten 2-points routes

Browse source
This commit is contained in:
max 2022-08-23 21:34:33 +03:00
parent bbf8871e70
commit 03809e56ab
3 changed files with 48 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/layers/renderers/drawRoutes.ts
View file

@ -1,11 +1,12 @@
import * as d3 from "d3";
import {getNormal} from "utils/lineUtils";
import {round} from "utils/stringUtils";
const lineGenTypeMap: {[key in IRoute["type"]]: d3.CurveFactory | d3.CurveFactoryLineOnly} = {
road: d3.curveCatmullRom.alpha(0.1),
trail: d3.curveCatmullRom.alpha(0.1),
sea: d3.curveBundle.beta(1)
sea: d3.curveBasis
};
export function drawRoutes() {
@ -22,7 +23,7 @@ export function drawRoutes() {
for (const {i, type, cells} of pack.routes) {
if (type !== "sea") straightenPathAngles(cells); // mutates points
const pathPoints = cells.map(cellId => points[cellId]);
const pathPoints = getPathPoints(cells);
lineGen.curve(lineGenTypeMap[type]);
const path = round(lineGen(pathPoints)!, 1);
@ -79,4 +80,40 @@ export function drawRoutes() {
}
}
}
function getPathPoints(cellIds: number[]): TPoints {
const pathPoints = cellIds.map(cellId => points[cellId]);
if (pathPoints.length === 2) {
// curve and shorten 2-points line
const [[x1, y1], [x2, y2]] = pathPoints;
const middleX = (x1 + x2) / 2;
const middleY = (y1 + y2) / 2;
// add shifted point at the middle to curve the line a bit
const NORMAL_LENGTH = 0.3;
const normal = getNormal([x1, y1], [x2, y2]);
const sign = cellIds[0] % 2 ? 1 : -1;
const normalX = middleX + NORMAL_LENGTH * Math.cos(normal) * sign;
const normalY = middleY + NORMAL_LENGTH * Math.sin(normal) * sign;
// make line shorter to avoid overlapping with other lines
const SHORT_LINE_LENGTH_MODIFIER = 0.8;
const distX = x2 - x1;
const distY = y2 - y1;
const nx1 = x1 + distX * SHORT_LINE_LENGTH_MODIFIER;
const ny1 = y1 + distY * SHORT_LINE_LENGTH_MODIFIER;
const nx2 = x2 - distX * SHORT_LINE_LENGTH_MODIFIER;
const ny2 = y2 - distY * SHORT_LINE_LENGTH_MODIFIER;
return [
[nx1, ny1],
[normalX, normalY],
[nx2, ny2]
];
}
return pathPoints;
}
}