From f4b3662cba0b70e5bf4a0978bb7eed25882b4e38 Mon Sep 17 00:00:00 2001
From: GoteGuru <meszaros.gergely@gmail.com>
Date: Mon, 20 Jun 2022 18:39:50 +0200
Subject: [PATCH] refactor and fix saved grid algo.

---
 index.html                             |  4 +--
 main.js                                |  8 ++---
 modules/dynamic/heightmap-selection.js |  4 ++-
 modules/io/save.js                     |  2 +-
 modules/submap.js                      |  2 +-
 modules/ui/submap.js                   |  7 +++--
 utils/graphUtils.js                    | 43 +++++++++++++-------------
 7 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/index.html b/index.html
index 5bb5f0c4..ae233534 100644
--- a/index.html
+++ b/index.html
@@ -1502,10 +1502,10 @@
 
             <tr data-tip="Select grid generation algorithm">
               <td></td>
-              <td>Grid algorithm</td>
+              <td>Grid type</td>
               <td>
                 <select id="gridAlgorithm">
-                  <option value="voronoiPoints" selected>Default</option>
+                  <option value="jitteredGridPoints" selected>Default</option>
                   <option value="hexPointsF">Hex flat</option>
                   <option value="hexPointsP">Hex pointy</option>
                   <option value="squarePoints">Squares</option>
diff --git a/main.js b/main.js
index 78c89dd1..f9c4bc46 100644
--- a/main.js
+++ b/main.js
@@ -631,7 +631,7 @@ void (function addDragToUpload() {
   });
 })();
 
-const gridOptimizationRequired = () => window[document.getElementById('gridAlgorithm').value] == voronoiPoints;
+const gridOptimizationRequired = () => globalThis[byId('gridAlgorithm').value] == jitteredGridPoints;
 async function generate(options) {
   try {
     const timeStart = performance.now();
@@ -643,10 +643,10 @@ async function generate(options) {
 
     applyMapSize();
     randomizeOptions();
-    const method = window[document.getElementById('gridAlgorithm').value];
-    console.log('gird generation method', method);
+    const method = globalThis[byId('gridAlgorithm').value];
 
-    if (shouldRegenerateGrid(grid, method)) grid = precreatedGraph || generateGrid(method);
+    const cellsDesired = +byId("pointsInput").dataset.cells;
+    if (shouldRegenerateGrid(grid, method)) grid = precreatedGraph || generateGrid(cellsDesired, method);
     else delete grid.cells.h;
     grid.cells.h = await HeightmapGenerator.generate(grid);
 
diff --git a/modules/dynamic/heightmap-selection.js b/modules/dynamic/heightmap-selection.js
index 5ca94e61..7c048d7c 100644
--- a/modules/dynamic/heightmap-selection.js
+++ b/modules/dynamic/heightmap-selection.js
@@ -263,7 +263,9 @@ function getName(id) {
 }
 
 function getGraph(currentGraph) {
-  const newGraph = shouldRegenerateGrid(currentGraph) ? generateGrid() : deepCopy(currentGraph);
+  const newGraph = shouldRegenerateGrid(currentGraph)
+    ? generateGrid(currentGraph.cellsDesired, currentGraph.generator)
+    : deepCopy(currentGraph);
   delete newGraph.cells.h;
   return newGraph;
 }
diff --git a/modules/io/save.js b/modules/io/save.js
index 211c7f6d..4c14101e 100644
--- a/modules/io/save.js
+++ b/modules/io/save.js
@@ -35,7 +35,7 @@ function getMapData() {
     stylePreset.value,
     +rescaleLabels.checked,
     urbanDensity,
-    byId('gridAlgorithm').value,
+    grid.generator.name,
   ].join("|");
   const coords = JSON.stringify(mapCoordinates);
   const biomes = [biomesData.color, biomesData.habitability, biomesData.name].join("|");
diff --git a/modules/submap.js b/modules/submap.js
index ddd195c6..71f33df0 100644
--- a/modules/submap.js
+++ b/modules/submap.js
@@ -40,7 +40,7 @@ window.Submap = (function () {
 
     // create new grid
     applyMapSize();
-    grid = generateGrid(options.gridAlgorithm);
+    grid = generateGrid(options.cellsDesired, options.gridAlgorithm);
 
     drawScaleBar(scale);
 
diff --git a/modules/ui/submap.js b/modules/ui/submap.js
index c8781d34..e367d034 100644
--- a/modules/ui/submap.js
+++ b/modules/ui/submap.js
@@ -169,7 +169,6 @@ window.UISubmap = (function () {
     WARN && console.warn("Resampling current map");
     const cellNumId = +byId("submapPointsInput").value;
     if (!cellsDensityMap[cellNumId]) return console.error("Unknown cell number!");
-    const gridAlgorithm = window[document.getElementById('gridAlgorithm').value];
 
     const {angle, shiftX, shiftY, ratio, mirrorH, mirrorV} = getTransformInput();
 
@@ -204,7 +203,8 @@ window.UISubmap = (function () {
       smoothHeightMap: false,
       rescaleStyles: false,
       scale: 1,
-      gridAlgorithm,
+      gridAlgorithm: globalThis[byId('gridAlgorithm').value],
+      cellsDesired: +byId("pointsInput").dataset.cells,
       projection,
       inverse
     });
@@ -232,7 +232,8 @@ window.UISubmap = (function () {
       inverse: (x, y) => [x / origScale + x0, y / origScale + y0],
       projection: (x, y) => [(x - x0) * origScale, (y - y0) * origScale],
       scale: origScale,
-      gridAlgorithm: window[byId('gridAlgorithm').value],
+      gridAlgorithm: globalThis[byId('gridAlgorithm').value],
+      cellsDesired: +byId("pointsInput").dataset.cells,
     };
 
     // converting map position on the planet
diff --git a/utils/graphUtils.js b/utils/graphUtils.js
index 8e033a1e..0cfc3cf5 100644
--- a/utils/graphUtils.js
+++ b/utils/graphUtils.js
@@ -13,19 +13,23 @@ function shouldRegenerateGrid(grid, method) {
   return grid.generator !== method || grid.spacing !== newSpacing || grid.cellsX !== newCellsX || grid.cellsY !== newCellsY;
 }
 
-function generateGrid(generator = voronoiPoints) {
+function generateGrid(numberOfCells, generator = jitteredGridPoints) {
   Math.random = aleaPRNG(seed); // reset PRNG
   //const {spacing, cellsDesired, boundary, points, cellsX, cellsY} = placePoints();
-  const {spacing, cellsDesired, boundary, points, cellsX, cellsY} = generator();
+  const {spacing, cellsDesired, boundary, points, cellsX, cellsY} = generator(numberOfCells);
   const {cells, vertices} = calculateVoronoi(points, boundary);
   return {spacing, cellsDesired, boundary, points, cellsX, cellsY, cells, vertices, generator};
 }
 
-// place random points to calculate Voronoi diagram
-function voronoiPoints() {
-  TIME && console.time("placePoints");
+function squareSpacing() {
   const cellsDesired = +byId("pointsInput").dataset.cells;
-  const spacing = rn(Math.sqrt((graphWidth * graphHeight) / cellsDesired), 2); // spacing between points before jittering
+  return rn(Math.sqrt((graphWidth * graphHeight) / cellsDesired), 2); // spacing between points before jittering
+}
+
+// place random points to calculate Voronoi diagram
+function jitteredGridPoints(cellsDesired) {
+  TIME && console.time("placePoints");
+  const spacing = squareSpacing();
 
   const boundary = getBoundaryPoints(graphWidth, graphHeight, spacing);
   const points = getJitteredGrid(graphWidth, graphHeight, spacing); // points of jittered square grid
@@ -37,21 +41,19 @@ function voronoiPoints() {
 }
 
 // alternatively generate hex-grid
-function hexPointsP() { return hexPoints(true) }
-function hexPointsF() { return hexPoints(false) }
 const hexRatio = Math.sqrt(3)/2;
-function hexPoints(pointy) { // pointy must be 0 or 1
+function hexPointsP(cellsDesired) {
+  const spacing = squareSpacing();
+  return hexPoints(cellsDesired, spacing / hexRatio , spacing);
+}
+function hexPointsF(cellsDesired) {
+  const spacing = squareSpacing();
+  return hexPoints(cellsDesired, spacing * 2, spacing  / hexRatio / 2);
+}
+
+function hexPoints(cellsDesired, xSpacing, ySpacing) {
   TIME && console.time("hexPoints");
-  const cellsDesired = +byId("pointsInput").dataset.cells;
-  let spacing = rn(Math.sqrt(graphWidth * graphHeight / hexRatio / cellsDesired), 2); // spacing between points
-  let xSpacing, ySpacing;
-  if (pointy) {
-    xSpacing = spacing;
-    ySpacing = spacing * hexRatio;
-  } else {
-    xSpacing = spacing * hexRatio * 2;
-    ySpacing = spacing / 2 ;
-  }
+  const spacing = (xSpacing + ySpacing) / 2;
 
   const boundary = getBoundaryPoints(graphWidth, graphHeight, spacing);
   let points = [];
@@ -70,7 +72,6 @@ function hexPoints(pointy) { // pointy must be 0 or 1
 // square grid
 function squarePoints() {
   TIME && console.time("squarePoints");
-  const cellsDesired = +byId("pointsInput").dataset.cells;
   const spacing = rn(Math.sqrt((graphWidth * graphHeight) / cellsDesired), 2);
 
   const boundary = getBoundaryPoints(graphWidth, graphHeight, spacing);
@@ -153,7 +154,7 @@ function findGridCell(x, y, grid) {
   let ySpacing = grid.spacing * Math.sqrt(3) / 2;
   const maxindex = grid.cells.i.length; // safety belt
   switch (grid.generator) {
-    case voronoiPoints:
+    case jitteredGridPoints:
     case squarePoints:
       return Math.floor(Math.min(y / grid.spacing, grid.cellsY - 1)) * grid.cellsX + Math.floor(Math.min(x / grid.spacing, grid.cellsX - 1));
     case hexPointsF: