From 8101e75f3d735f629e066f5d81f364c91113d984 Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Mon, 6 Nov 2023 00:04:53 +0400
Subject: [PATCH] hotfix: define color scheme on heightmap edit

---
 index.html                             | 17 +++++------------
 modules/dynamic/heightmap-selection.js | 16 ++++++----------
 modules/ui/layers.js                   | 15 +++------------
 modules/ui/options.js                  |  2 +-
 modules/ui/style.js                    | 14 ++++++++++++++
 modules/ui/stylePresets.js             |  7 +++++++
 versioning.js                          |  2 +-
 7 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/index.html b/index.html
index 1a109467..c7a156c7 100644
--- a/index.html
+++ b/index.html
@@ -1278,14 +1278,7 @@
               <tr data-tip="Select color scheme for the element">
                 <td>Color scheme</td>
                 <td>
-                  <select id="styleHeightmapScheme">
-                    <option value="bright" selected>Bright</option>
-                    <option value="light">Light</option>
-                    <option value="natural">Natural</option>
-                    <option value="green">Green</option>
-                    <option value="livid">Livid</option>
-                    <option value="monochrome">Monochrome</option>
-                  </select>
+                  <select id="styleHeightmapScheme"></select>
                 </td>
               </tr>
 
@@ -7975,7 +7968,7 @@
     <script src="config/heightmap-templates.js"></script>
     <script src="config/precreated-heightmaps.js"></script>
     <script src="modules/heightmap-generator.js?v=1.88.00"></script>
-    <script src="modules/ocean-layers.js?v=1.91.02"></script>
+    <script src="modules/ocean-layers.js?v=1.93.07"></script>
     <script src="modules/river-generator.js?v=1.89.13"></script>
     <script src="modules/lakes.js"></script>
     <script src="modules/biomes.js"></script>
@@ -7995,14 +7988,14 @@
     <script src="modules/fonts.js?v=1.89.18"></script>
     <script src="modules/ui/layers.js?v=1.93.06"></script>
     <script src="modules/ui/measurers.js?v=1.87.02"></script>
-    <script src="modules/ui/stylePresets.js?v=1.93.06"></script>
+    <script src="modules/ui/stylePresets.js?v=1.93.07"></script>
 
     <script src="modules/ui/general.js?v=1.93.04"></script>
-    <script src="modules/ui/options.js?v=1.93.03"></script>
+    <script src="modules/ui/options.js?v=1.93.07"></script>
     <script src="main.js?v=1.93.02"></script>
 
     <script defer src="modules/relief-icons.js"></script>
-    <script defer src="modules/ui/style.js"></script>
+    <script defer src="modules/ui/style.js?v=1.93.07"></script>
     <script defer src="modules/ui/editors.js?v=1.92.00"></script>
     <script defer src="modules/ui/tools.js?v=1.92.00"></script>
     <script defer src="modules/ui/world-configurator.js?v=1.91.05"></script>
diff --git a/modules/dynamic/heightmap-selection.js b/modules/dynamic/heightmap-selection.js
index e66ff44a..1fa65e5e 100644
--- a/modules/dynamic/heightmap-selection.js
+++ b/modules/dynamic/heightmap-selection.js
@@ -150,6 +150,10 @@ function appendStyleSheet() {
 }
 
 function insertHtml() {
+  const heightmapColorSchemeOptions = Object.keys(heightmapColorSchemes)
+    .map(scheme => `<option value="${scheme}">${scheme}</option>`)
+    .join("");
+
   const heightmapSelectionHtml = /* html */ `<div id="heightmapSelection" class="dialog stable">
     <div class="heightmap-selection">
       <section data-tip="Select heightmap template – template provides unique, but similar-looking maps on generation">
@@ -174,14 +178,7 @@ function insertHtml() {
             </div>
             <div data-tip="Color scheme used for heightmap preview">
               Color scheme
-              <select id="heightmapSelectionColorScheme">
-                <option value="bright" selected>Bright</option>
-                <option value="light">Light</option>
-                <option value="natural">Natural</option>
-                <option value="green">Green</option>
-                <option value="livid">Livid</option>
-                <option value="monochrome">Monochrome</option>
-              </select>
+              <select id="heightmapSelectionColorScheme">${heightmapColorSchemeOptions}</select>
             </div>
           </div>
           <div>
@@ -276,8 +273,7 @@ function drawHeights(heights) {
   const ctx = canvas.getContext("2d");
   const imageData = ctx.createImageData(graph.cellsX, graph.cellsY);
 
-  const schemeId = byId("heightmapSelectionColorScheme").value;
-  const scheme = getColorScheme(schemeId);
+  const scheme = getColorScheme(byId("heightmapSelectionColorScheme").value);
   const renderOcean = byId("heightmapSelectionRenderOcean").checked;
   const getHeight = height => (height < 20 ? (renderOcean ? height : 0) : height);
 
diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index 05d1fbc3..09d7a66a 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -297,21 +297,12 @@ function drawHeightmap() {
   TIME && console.timeEnd("drawHeightmap");
 }
 
-const colorSchemes = {
-  bright: d3.scaleSequential(d3.interpolateSpectral),
-  light: d3.scaleSequential(d3.interpolateRdYlGn),
-  natural: d3.scaleSequential(d3.interpolateRgbBasis(["white", "#EEEECC", "tan", "green", "teal"])),
-  green: d3.scaleSequential(d3.interpolateGreens),
-  livid: d3.scaleSequential(d3.interpolateRgbBasis(["#BBBBDD", "#2A3440", "#17343B", "#0A1E24"])),
-  monochrome: d3.scaleSequential(d3.interpolateGreys)
-};
-
-function getColorScheme(scheme) {
-  if (scheme in colorSchemes) return colorSchemes[scheme];
+function getColorScheme(scheme = "bright") {
+  if (scheme in heightmapColorSchemes) return heightmapColorSchemes[scheme];
   throw new Error(`Unsupported color scheme: ${scheme}`);
 }
 
-function getColor(value, scheme = getColorScheme()) {
+function getColor(value, scheme = getColorScheme("bright")) {
   return scheme(1 - (value < 20 ? value - 5 : value) / 100);
 }
 
diff --git a/modules/ui/options.js b/modules/ui/options.js
index 403bdef1..88dc380b 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -702,7 +702,7 @@ function changeEra() {
 }
 
 async function openTemplateSelectionDialog() {
-  const HeightmapSelectionDialog = await import("../dynamic/heightmap-selection.js?v=1.93.06");
+  const HeightmapSelectionDialog = await import("../dynamic/heightmap-selection.js?v=1.93.07");
   HeightmapSelectionDialog.open();
 }
 
diff --git a/modules/ui/style.js b/modules/ui/style.js
index 94331a11..5217d9cb 100644
--- a/modules/ui/style.js
+++ b/modules/ui/style.js
@@ -37,6 +37,20 @@ function editStyle(element, group) {
   }, 1500);
 }
 
+const heightmapColorSchemes = {
+  bright: d3.scaleSequential(d3.interpolateSpectral),
+  light: d3.scaleSequential(d3.interpolateRdYlGn),
+  natural: d3.scaleSequential(d3.interpolateRgbBasis(["white", "#EEEECC", "tan", "green", "teal"])),
+  green: d3.scaleSequential(d3.interpolateGreens),
+  livid: d3.scaleSequential(d3.interpolateRgbBasis(["#BBBBDD", "#2A3440", "#17343B", "#0A1E24"])),
+  monochrome: d3.scaleSequential(d3.interpolateGreys)
+};
+
+// add color schemes to the lists
+document.getElementById("styleHeightmapScheme").innerHTML = Object.keys(heightmapColorSchemes)
+  .map(scheme => `<option value="${scheme}">${scheme}</option>`)
+  .join("");
+
 // Toggle style sections on element select
 styleElementSelect.addEventListener("change", selectStyleElement);
 function selectStyleElement() {
diff --git a/modules/ui/stylePresets.js b/modules/ui/stylePresets.js
index 5b5ad64c..0ba995d4 100644
--- a/modules/ui/stylePresets.js
+++ b/modules/ui/stylePresets.js
@@ -94,6 +94,13 @@ function applyStyle(style) {
       if (layerIsOn("toggleTexture") && selector === "#textureImage" && attribute === "src") {
         el.setAttribute("href", value);
       }
+
+      // add custom heightmap color scheme
+      if (selector === "#terrs" && attribute === "scheme" && !(value in heightmapColorSchemes)) {
+        const colors = value.split(",");
+        heightmapColorSchemes[value] = d3.scaleSequential(d3.interpolateRgbBasis(colors));
+        document.getElementById("styleHeightmapScheme").options.add(new Option(value, value));
+      }
     }
   }
 }
diff --git a/versioning.js b/versioning.js
index 64e3523a..5977d37d 100644
--- a/versioning.js
+++ b/versioning.js
@@ -1,7 +1,7 @@
 "use strict";
 
 // version and caching control
-const version = "1.93.06"; // generator version, update each time
+const version = "1.93.07"; // generator version, update each time
 
 {
   document.title += " v" + version;