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

Cleanup

Browse source
This commit is contained in:
Mészáros Gergely 2021-09-15 22:38:46 +02:00
parent 2b1dd01a1e
commit 8c1fd3b6e4
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/submap.js
View file

@ -135,8 +135,6 @@ window.Submap = (function () {
cells.province = new Uint16Array(pn); cells.province = new Uint16Array(pn);
stage("Resampling culture, state and religion map.") stage("Resampling culture, state and religion map.")
for(const [id, gridCellId] of cells.g.entries()) { for(const [id, gridCellId] of cells.g.entries()) {
const oldGridId = reverseGridMap[gridCellId]; const oldGridId = reverseGridMap[gridCellId];
if (!oldGridId) throw new Error("Old grid Id must be defined!") if (!oldGridId) throw new Error("Old grid Id must be defined!")
@ -164,7 +162,7 @@ window.Submap = (function () {
const distance = x => (x[0]-cells.p[id][0])**2 + (x[1]-cells.p[id][1])**2; const distance = x => (x[0]-cells.p[id][0])**2 + (x[1]-cells.p[id][1])**2;
let d = Infinity; let d = Infinity;
oldChildren.forEach(oid => { oldChildren.forEach(oid => {
// must be the same type (it should be always true!) // must be the same type (this should be always true!)
if (isWater(oldCells.t[oid]) !== isWater(cells.t[id])) { if (isWater(oldCells.t[oid]) !== isWater(cells.t[id])) {
console.error( console.error(
"should be the same", oid, id, oldCells.t[oid], cells.t[id], "should be the same", oid, id, oldCells.t[oid], cells.t[id],
@ -290,7 +288,7 @@ window.Submap = (function () {
* returns [cellid, neighbor] tuple or undefined if no such cell. * returns [cellid, neighbor] tuple or undefined if no such cell.
*/ */
const findNearest = (f, max=3) => centerId => { const findNearest = (f, max=3) => centerId => {
const met = new Set([centerId]); // f might be expensive const met = new Set([centerId]); // cache, f might be expensive
const kernel = (c, dist) => { const kernel = (c, dist) => {
const ncs = pack.cells.c[c].filter(nc => !met.has(nc)); const ncs = pack.cells.c[c].filter(nc => !met.has(nc));
const n = ncs.find(f); const n = ncs.find(f);
@ -305,8 +303,7 @@ window.Submap = (function () {
} }
function copyBurgs(parentMap, projection, options) { function copyBurgs(parentMap, projection, options) {
const [[xmin, ymin], [xmax, ymax]] = getViewBoxExtent(); const inMap = (x,y) => x>0 && x<graphWidth && y>0 && y<graphHeight;
const inMap = (x,y) => x>xmin && x<xmax && y>ymin && y<ymax;
const cells = pack.cells; const cells = pack.cells;
pack.burgs = parentMap.pack.burgs; pack.burgs = parentMap.pack.burgs;