From 3827a50bee5c408061fb141ed7e457eb74b34291 Mon Sep 17 00:00:00 2001
From: GoteGuru <meszaros.gergely@gmail.com>
Date: Wed, 8 Jun 2022 01:10:13 +0200
Subject: [PATCH] alternative grid generators

---
 index.html          | 13 ++++++++++
 main.js             |  4 ++-
 utils/graphUtils.js | 61 +++++++++++++++++++++++++++++++++++++++------
 3 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index 60807aa0..c55f5cd9 100644
--- a/index.html
+++ b/index.html
@@ -1293,6 +1293,19 @@
               </td>
             </tr>
 
+            <tr data-tip="Select grid generation algorithm">
+              <td></td>
+              <td>Grid algorithm</td>
+              <td>
+                <select id="gridAlgorithm">
+                  <option value="voronoiPoints" selected>Voronoi</option>
+                  <option value="hexPoints">Hex Grid</option>
+                  <option value="squarePoints">Square Grid</option>
+                </select>
+              </td>
+              <td></td>
+            </tr>
+
             <tr data-tip="Define map name (will be used to name downloaded files)">
               <td>
                 <i data-locked="0" id="lock_mapName" class="icon-lock-open"></i>
diff --git a/main.js b/main.js
index f443111d..8633cf4d 100644
--- a/main.js
+++ b/main.js
@@ -642,8 +642,10 @@ async function generate(options) {
 
     applyMapSize();
     randomizeOptions();
+    const method = window[document.getElementById('gridAlgorithm').value];
+    console.log('gird generation method', method);
 
-    if (shouldRegenerateGrid(grid)) grid = precreatedGraph || generateGrid();
+    if (shouldRegenerateGrid(grid, method)) grid = precreatedGraph || generateGrid(method);
     else delete grid.cells.h;
     grid.cells.h = await HeightmapGenerator.generate(grid);
 
diff --git a/utils/graphUtils.js b/utils/graphUtils.js
index 75b64253..d357ff67 100644
--- a/utils/graphUtils.js
+++ b/utils/graphUtils.js
@@ -2,7 +2,7 @@
 // FMG utils related to graph
 
 // check if new grid graph should be generated or we can use the existing one
-function shouldRegenerateGrid(grid) {
+function shouldRegenerateGrid(grid, method) {
   const cellsDesired = +byId("pointsInput").dataset.cells;
   if (cellsDesired !== grid.cellsDesired) return true;
 
@@ -10,21 +10,22 @@ function shouldRegenerateGrid(grid) {
   const newCellsX = Math.floor((graphWidth + 0.5 * newSpacing - 1e-10) / newSpacing);
   const newCellsY = Math.floor((graphHeight + 0.5 * newSpacing - 1e-10) / newSpacing);
 
-  return grid.spacing !== newSpacing || grid.cellsX !== newCellsX || grid.cellsY !== newCellsY;
+  return grid.generator !== method || grid.spacing !== newSpacing || grid.cellsX !== newCellsX || grid.cellsY !== newCellsY;
 }
 
-function generateGrid() {
+function generateGrid(generator = voronoiPoints) {
   Math.random = aleaPRNG(seed); // reset PRNG
-  const {spacing, cellsDesired, boundary, points, cellsX, cellsY} = placePoints();
+  //const {spacing, cellsDesired, boundary, points, cellsX, cellsY} = placePoints();
+  const {spacing, cellsDesired, boundary, points, cellsX, cellsY} = generator();
   const {cells, vertices} = calculateVoronoi(points, boundary);
-  return {spacing, cellsDesired, boundary, points, cellsX, cellsY, cells, vertices};
+  return {spacing, cellsDesired, boundary, points, cellsX, cellsY, cells, vertices, generator};
 }
 
 // place random points to calculate Voronoi diagram
-function placePoints() {
+function voronoiPoints() {
   TIME && console.time("placePoints");
   const cellsDesired = +byId("pointsInput").dataset.cells;
-  const spacing = rn(Math.sqrt((graphWidth * graphHeight) / cellsDesired), 2); // spacing between points before jirrering
+  const spacing = rn(Math.sqrt((graphWidth * graphHeight) / cellsDesired), 2); // spacing between points before jittering
 
   const boundary = getBoundaryPoints(graphWidth, graphHeight, spacing);
   const points = getJitteredGrid(graphWidth, graphHeight, spacing); // points of jittered square grid
@@ -35,6 +36,52 @@ function placePoints() {
   return {spacing, cellsDesired, boundary, points, cellsX, cellsY};
 }
 
+// alternatively generate hex-grid
+function hexPoints() {
+  TIME && console.time("hexPoints");
+  const cellsDesired = +byId("pointsInput").dataset.cells;
+  const hexRatio = 0.86602540378;
+  const spacing = rn(Math.sqrt(graphWidth * graphHeight / hexRatio / cellsDesired), 2); // spacing between points
+  const lineOffset = spacing * hexRatio;
+
+  const boundary = getBoundaryPoints(graphWidth, graphHeight, spacing);
+  const cellsX = Math.floor((graphWidth + 0.5 * spacing - 1e-10) / spacing);
+  const cellsY = Math.floor((graphHeight + 0.5 * lineOffset - 1e-10) / lineOffset);
+  console.log('desired hexgrid:', cellsX, cellsY);
+
+  let points = [];
+
+  for (let y = lineOffset / 2, lc = 0 ; y < graphHeight; y += lineOffset, lc++) {
+    for (let x = lc % 2 ? 0 : spacing / 2; x < graphWidth; x += spacing) {
+      points.push([x, y]);
+    }
+  }
+
+  TIME && console.timeEnd("hexPoints");
+  return {spacing, cellsDesired, boundary, points, cellsX, cellsY};
+}
+
+// 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);
+  const cellsX = Math.floor((graphWidth + 0.5 * spacing - 1e-10) / spacing);
+  const cellsY = Math.floor((graphHeight + 0.5 * spacing - 1e-10) / spacing);
+
+  const radius = spacing / 2;
+
+  let points = [];
+  for (let y = radius; y < graphHeight; y += spacing)
+    for (let x = radius; x < graphWidth; x += spacing)
+      points.push([x, y]);
+
+  TIME && console.timeEnd("squarePoints");
+  return {spacing, cellsDesired, boundary, points, cellsX, cellsY};
+}
+
 // calculate Delaunay and then Voronoi diagram
 function calculateVoronoi(points, boundary) {
   TIME && console.time("calculateDelaunay");