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

refactor: Update feature interfaces and improve type safety in FeatureModule

Browse source
This commit is contained in:
Marc Emmanuel 2026-01-20 07:42:18 +01:00
parent e7c853bf52
commit cf43ca9de1
1 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/modules/features.ts
View file

@ -28,12 +28,21 @@ interface Feature {
height: number; height: number;
group: string; group: string;
temp: number; temp: number;
flux: number;
evaporation: number;
inlets: number; inlets: number;
outlet: number; outlet: number;
evaporation: number;
flux: number;
} }
interface GridFeature {
i: number;
land: boolean;
border: boolean;
type: FeatureType;
}
interface PackedGraphFeature extends Omit<Feature, 'group' | 'temp' | 'flux' | 'evaporation' | 'inlets' | 'outlet'> {}
class FeatureModule { class FeatureModule {
private DEEPER_LAND = 3; private DEEPER_LAND = 3;
private LANDLOCKED = 2; private LANDLOCKED = 2;
@ -90,7 +99,7 @@ class FeatureModule {
const cellsNumber = i.length; const cellsNumber = i.length;
const distanceField = new Int8Array(cellsNumber); // gird.cells.t const distanceField = new Int8Array(cellsNumber); // gird.cells.t
const featureIds = new Uint16Array(cellsNumber); // gird.cells.f const featureIds = new Uint16Array(cellsNumber); // gird.cells.f
const features: any[] = [0]; const features: GridFeature[] = [];
const queue = [0]; const queue = [0];
for (let featureId = 1; queue[0] !== -1; featureId++) { for (let featureId = 1; queue[0] !== -1; featureId++) {
@ -127,7 +136,7 @@ class FeatureModule {
this.markup({ distanceField, neighbors, start: this.DEEP_WATER, increment: -1, limit: -10 }); this.markup({ distanceField, neighbors, start: this.DEEP_WATER, increment: -1, limit: -10 });
this.grid.cells.t = distanceField; this.grid.cells.t = distanceField;
this.grid.cells.f = featureIds; this.grid.cells.f = featureIds;
this.grid.features = features; this.grid.features = [0, ...features];
TIME && console.timeEnd("markupGrid"); TIME && console.timeEnd("markupGrid");
} }
@ -174,14 +183,14 @@ class FeatureModule {
} }
} }
const addFeature = ({ firstCell, land, border, featureId, totalCells }: { firstCell: number; land: boolean; border: boolean; featureId: number; totalCells: number }): Feature => { const addFeature = ({ firstCell, land, border, featureId, totalCells }: { firstCell: number; land: boolean; border: boolean; featureId: number; totalCells: number }): PackedGraphFeature => {
const type = land ? "island" : border ? "ocean" : "lake"; const type = land ? "island" : border ? "ocean" : "lake";
const [startCell, featureVertices] = getCellsData(type, firstCell); const [startCell, featureVertices] = getCellsData(type, firstCell);
const points = clipPoly(featureVertices.map((vertex: number) => vertices.p[vertex])); const points = clipPoly(featureVertices.map((vertex: number) => vertices.p[vertex]));
const area = polygonArea(points); // feature perimiter area const area = polygonArea(points); // feature perimiter area
const absArea = Math.abs(rn(area)); const absArea = Math.abs(rn(area));
const feature: Partial<Feature> = { const feature: PackedGraphFeature = {
i: featureId, i: featureId,
type, type,
land, land,
@ -189,16 +198,18 @@ class FeatureModule {
cells: totalCells, cells: totalCells,
firstCell: startCell, firstCell: startCell,
vertices: featureVertices, vertices: featureVertices,
area: absArea area: absArea,
shoreline: [],
height: 0,
}; };
if (type === "lake") { if (type === "lake") {
if (area > 0) feature.vertices = feature.vertices?.reverse(); if (area > 0) feature.vertices = feature.vertices.reverse();
feature.shoreline = unique(feature.vertices?.map(vertex => vertices.c[vertex].filter((index: number) => isLand(index, this.packedGraph))).flat() || []); feature.shoreline = unique(feature.vertices.map(vertex => vertices.c[vertex].filter((index: number) => isLand(index, this.packedGraph))).flat() || []);
feature.height = Lakes.getHeight(feature); feature.height = Lakes.getHeight(feature);
} }
return feature as Feature; return feature;
} }
TIME && console.time("markupPack"); TIME && console.time("markupPack");
@ -212,7 +223,7 @@ class FeatureModule {
const featureIds = new Uint16Array(packCellsNumber); // pack.cells.f const featureIds = new Uint16Array(packCellsNumber); // pack.cells.f
const haven = createTypedArray({ maxValue: packCellsNumber, length: packCellsNumber }); // haven: opposite water cell const haven = createTypedArray({ maxValue: packCellsNumber, length: packCellsNumber }); // haven: opposite water cell
const harbor = new Uint8Array(packCellsNumber); // harbor: number of adjacent water cells const harbor = new Uint8Array(packCellsNumber); // harbor: number of adjacent water cells
const features: Feature[] = []; const features: PackedGraphFeature[] = [];
const queue = [0]; const queue = [0];
for (let featureId = 1; queue[0] !== -1; featureId++) { for (let featureId = 1; queue[0] !== -1; featureId++) {