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

height generation - ability to pass cells number

Browse source
This commit is contained in:
Azgaar 2022-05-29 14:33:07 +03:00
parent ab160e609c
commit 4f372c7a46
3 changed files with 66 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/dynamic/heightmap-selection.js
View file

@ -282,10 +282,14 @@ function drawHeights(heights) {
} }
function generateHeightmap(id) { function generateHeightmap(id) {
HeightmapGenerator.resetHeights(); const heights = new Uint8Array(grid.points.length);
const heights = HeightmapGenerator.fromTemplate(id); // use cells number of the current graph, no matter what UI input value is
const cellsDesired = rn((graphWidth * graphHeight) / grid.spacing ** 2, -3);
HeightmapGenerator.setHeights(heights, cellsDesired);
const newHeights = HeightmapGenerator.fromTemplate(id);
HeightmapGenerator.cleanup(); HeightmapGenerator.cleanup();
return heights; return newHeights;
} }
function drawTemplatePreview(id) { function drawTemplatePreview(id) {

92
modules/heightmap-generator.js
View file

@ -2,9 +2,23 @@
window.HeightmapGenerator = (function () { window.HeightmapGenerator = (function () {
let heights = null; let heights = null;
const setHeights = h => (heights = h); let blobPower;
const resetHeights = () => (heights = new Uint8Array(grid.points.length)); let linePower;
const setHeights = (savedHeights, cellsNumber) => {
heights = savedHeights;
blobPower = getBlobPower(cellsNumber);
linePower = getLinePower(cellsNumber);
};
const resetHeights = () => {
heights = new Uint8Array(grid.points.length);
const cellsNumber = +byId("pointsInput").dataset.cells;
blobPower = getBlobPower(cellsNumber);
linePower = getLinePower(cellsNumber);
};
const getHeights = () => heights; const getHeights = () => heights;
const cleanup = () => (heights = null); const cleanup = () => (heights = null);
const fromTemplate = template => { const fromTemplate = template => {
@ -72,43 +86,47 @@ window.HeightmapGenerator = (function () {
if (tool === "Smooth") return smooth(a2); if (tool === "Smooth") return smooth(a2);
} }
function getBlobPower() { function getBlobPower(cells) {
const cells = +byId("pointsInput").dataset.cells; const blobPowerMap = {
if (cells === 1000) return 0.93; 1000: 0.93,
if (cells === 2000) return 0.95; 2000: 0.95,
if (cells === 5000) return 0.96; 5000: 0.96,
if (cells === 10000) return 0.98; 10000: 0.98,
if (cells === 20000) return 0.985; 20000: 0.985,
if (cells === 30000) return 0.987; 30000: 0.987,
if (cells === 40000) return 0.9892; 40000: 0.9892,
if (cells === 50000) return 0.9911; 50000: 0.9911,
if (cells === 60000) return 0.9921; 60000: 0.9921,
if (cells === 70000) return 0.9934; 70000: 0.9934,
if (cells === 80000) return 0.9942; 80000: 0.9942,
if (cells === 90000) return 0.9946; 90000: 0.9946,
if (cells === 100000) return 0.995; 100000: 0.995
};
return blobPowerMap[cells] || 0.98;
} }
function getLinePower() { function getLinePower() {
const cells = +byId("pointsInput").dataset.cells; const linePowerMap = {
if (cells === 1000) return 0.74; 1000: 0.74,
if (cells === 2000) return 0.75; 2000: 0.75,
if (cells === 5000) return 0.78; 5000: 0.78,
if (cells === 10000) return 0.81; 10000: 0.81,
if (cells === 20000) return 0.82; 20000: 0.82,
if (cells === 30000) return 0.83; 30000: 0.83,
if (cells === 40000) return 0.84; 40000: 0.84,
if (cells === 50000) return 0.855; 50000: 0.855,
if (cells === 60000) return 0.87; 60000: 0.87,
if (cells === 70000) return 0.885; 70000: 0.885,
if (cells === 80000) return 0.91; 80000: 0.91,
if (cells === 90000) return 0.92; 90000: 0.92,
if (cells === 100000) return 0.93; 100000: 0.93
};
return linePowerMap[cells] || 0.81;
} }
const addHill = (count, height, rangeX, rangeY) => { const addHill = (count, height, rangeX, rangeY) => {
count = getNumberInRange(count); count = getNumberInRange(count);
const power = getBlobPower();
while (count > 0) { while (count > 0) {
addOneHill(); addOneHill();
count--; count--;
@ -134,7 +152,7 @@ window.HeightmapGenerator = (function () {
for (const c of grid.cells.c[q]) { for (const c of grid.cells.c[q]) {
if (change[c]) continue; if (change[c]) continue;
change[c] = change[q] ** power * (Math.random() * 0.2 + 0.9); change[c] = change[q] ** blobPower * (Math.random() * 0.2 + 0.9);
if (change[c] > 1) queue.push(c); if (change[c] > 1) queue.push(c);
} }
} }
@ -166,7 +184,7 @@ window.HeightmapGenerator = (function () {
const queue = [start]; const queue = [start];
while (queue.length) { while (queue.length) {
const q = queue.shift(); const q = queue.shift();
h = h ** getBlobPower() * (Math.random() * 0.2 + 0.9); h = h ** blobPower * (Math.random() * 0.2 + 0.9);
if (h < 1) return; if (h < 1) return;
grid.cells.c[q].forEach(function (c, i) { grid.cells.c[q].forEach(function (c, i) {
@ -181,7 +199,6 @@ window.HeightmapGenerator = (function () {
const addRange = (count, height, rangeX, rangeY) => { const addRange = (count, height, rangeX, rangeY) => {
count = getNumberInRange(count); count = getNumberInRange(count);
const power = getLinePower();
while (count > 0) { while (count > 0) {
addOneRange(); addOneRange();
count--; count--;
@ -242,7 +259,7 @@ window.HeightmapGenerator = (function () {
frontier.forEach(i => { frontier.forEach(i => {
heights[i] = lim(heights[i] + h * (Math.random() * 0.3 + 0.85)); heights[i] = lim(heights[i] + h * (Math.random() * 0.3 + 0.85));
}); });
h = h ** power - 1; h = h ** linePower - 1;
if (h < 2) break; if (h < 2) break;
frontier.forEach(f => { frontier.forEach(f => {
grid.cells.c[f].forEach(i => { grid.cells.c[f].forEach(i => {
@ -268,7 +285,6 @@ window.HeightmapGenerator = (function () {
const addTrough = (count, height, rangeX, rangeY) => { const addTrough = (count, height, rangeX, rangeY) => {
count = getNumberInRange(count); count = getNumberInRange(count);
const power = getLinePower();
while (count > 0) { while (count > 0) {
addOneTrough(); addOneTrough();
count--; count--;
@ -337,7 +353,7 @@ window.HeightmapGenerator = (function () {
frontier.forEach(i => { frontier.forEach(i => {
heights[i] = lim(heights[i] - h * (Math.random() * 0.3 + 0.85)); heights[i] = lim(heights[i] - h * (Math.random() * 0.3 + 0.85));
}); });
h = h ** power - 1; h = h ** linePower - 1;
if (h < 2) break; if (h < 2) break;
frontier.forEach(f => { frontier.forEach(f => {
grid.cells.c[f].forEach(i => { grid.cells.c[f].forEach(i => {

6
modules/ui/heightmap-editor.js
View file

@ -940,7 +940,11 @@ function editHeightmap(options) {
const seed = byId("templateSeed").value; const seed = byId("templateSeed").value;
if (seed) Math.random = aleaPRNG(seed); if (seed) Math.random = aleaPRNG(seed);
HeightmapGenerator.resetHeights(); const heights = new Uint8Array(grid.points.length);
// use cells number of the current graph, no matter what UI input value is
const cellsDesired = rn((graphWidth * graphHeight) / grid.spacing ** 2, -3);
HeightmapGenerator.setHeights(heights, cellsDesired);
restartHistory(); restartHistory();
for (const step of steps) { for (const step of steps) {