mirror of
https://github.com/yairm210/Unciv.git
synced 2025-02-11 11:28:03 +07:00
chore: Split MapGenerationRandomness from MapGenerator
This commit is contained in:
Yair Morgenstern
parent
15c8f808c4
commit
7185fea243
@ -0,0 +1,90 @@
|
||||
package com.unciv.logic.map.mapgenerator
|
||||
|
||||
import com.unciv.logic.map.HexMath
|
||||
import com.unciv.logic.map.tile.Tile
|
||||
import com.unciv.utils.Log
|
||||
import com.unciv.utils.debug
|
||||
import kotlin.math.max
|
||||
import kotlin.math.pow
|
||||
import kotlin.random.Random
|
||||
|
||||
class MapGenerationRandomness {
|
||||
var RNG = Random(42)
|
||||
|
||||
fun seedRNG(seed: Long = 42) {
|
||||
RNG = Random(seed)
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates a perlin noise channel combining multiple octaves
|
||||
* Default settings generate mostly within [-0.55, 0.55], but clustered around 0.0
|
||||
* About 28% are < -0.1 and 28% are > 0.1
|
||||
*
|
||||
* @param tile Source for x / x coordinates.
|
||||
* @param seed Misnomer: actually the z value the Perlin cloud is 'cut' on.
|
||||
* @param nOctaves is the number of octaves.
|
||||
* @param persistence is the scaling factor of octave amplitudes.
|
||||
* @param lacunarity is the scaling factor of octave frequencies.
|
||||
* @param scale is the distance the noise is observed from.
|
||||
*/
|
||||
fun getPerlinNoise(
|
||||
tile: Tile,
|
||||
seed: Double,
|
||||
nOctaves: Int = 6,
|
||||
persistence: Double = 0.5,
|
||||
lacunarity: Double = 2.0,
|
||||
scale: Double = 30.0
|
||||
): Double {
|
||||
val worldCoords = HexMath.hex2WorldCoords(tile.position)
|
||||
return Perlin.noise3d(worldCoords.x.toDouble(), worldCoords.y.toDouble(), seed, nOctaves, persistence, lacunarity, scale)
|
||||
}
|
||||
|
||||
|
||||
fun chooseSpreadOutLocations(number: Int, suitableTiles: List<Tile>, mapRadius: Int): ArrayList<Tile> {
|
||||
if (number <= 0) return ArrayList(0)
|
||||
|
||||
// Determine sensible initial distance from number of desired placements and mapRadius
|
||||
// empiric formula comes very close to eliminating retries for distance.
|
||||
// The `if` means if we need to fill 60% or more of the available tiles, no sense starting with minimum distance 2.
|
||||
val sparsityFactor = (HexMath.getHexagonalRadiusForArea(suitableTiles.size) / mapRadius).pow(0.333f)
|
||||
val initialDistance = if (number == 1 || number * 5 >= suitableTiles.size * 3) 1
|
||||
else max(1, (mapRadius * 0.666f / HexMath.getHexagonalRadiusForArea(number).pow(0.9f) * sparsityFactor + 0.5).toInt())
|
||||
|
||||
// If possible, we want to equalize the base terrains upon which
|
||||
// the resources are found, so we save how many have been
|
||||
// found for each base terrain and try to get one from the lowest
|
||||
val baseTerrainsToChosenTiles = HashMap<String, Int>()
|
||||
for (tileInfo in suitableTiles){
|
||||
if (tileInfo.baseTerrain !in baseTerrainsToChosenTiles)
|
||||
baseTerrainsToChosenTiles[tileInfo.baseTerrain] = 0
|
||||
}
|
||||
|
||||
for (distanceBetweenResources in initialDistance downTo 1) {
|
||||
var availableTiles = suitableTiles
|
||||
val chosenTiles = ArrayList<Tile>(number)
|
||||
|
||||
for (terrain in baseTerrainsToChosenTiles.keys)
|
||||
baseTerrainsToChosenTiles[terrain] = 0
|
||||
|
||||
for (i in 1..number) {
|
||||
if (availableTiles.isEmpty()) break
|
||||
val orderedKeys = baseTerrainsToChosenTiles.entries
|
||||
.sortedBy { it.value }.map { it.key }
|
||||
val firstKeyWithTilesLeft = orderedKeys
|
||||
.first { availableTiles.any { tile -> tile.baseTerrain == it} }
|
||||
val chosenTile = availableTiles.filter { it.baseTerrain == firstKeyWithTilesLeft }.random(RNG)
|
||||
availableTiles = availableTiles.filter { it.aerialDistanceTo(chosenTile) > distanceBetweenResources }
|
||||
chosenTiles.add(chosenTile)
|
||||
baseTerrainsToChosenTiles[firstKeyWithTilesLeft] = baseTerrainsToChosenTiles[firstKeyWithTilesLeft]!! + 1
|
||||
}
|
||||
if (chosenTiles.size == number || distanceBetweenResources == 1) {
|
||||
// Either we got them all, or we're not going to get anything better
|
||||
if (Log.shouldLog() && distanceBetweenResources < initialDistance)
|
||||
debug("chooseSpreadOutLocations: distance $distanceBetweenResources < initial $initialDistance")
|
||||
return chosenTiles
|
||||
}
|
||||
}
|
||||
// unreachable due to last loop iteration always returning and initialDistance >= 1
|
||||
throw Exception("Unreachable code reached!")
|
||||
}
|
||||
}
|
||||
@ -3,7 +3,6 @@ package com.unciv.logic.map.mapgenerator
|
||||
import com.unciv.Constants
|
||||
import com.unciv.UncivGame
|
||||
import com.unciv.logic.civilization.Civilization
|
||||
import com.unciv.logic.map.HexMath
|
||||
import com.unciv.logic.map.MapParameters
|
||||
import com.unciv.logic.map.MapShape
|
||||
import com.unciv.logic.map.MapType
|
||||
@ -20,7 +19,6 @@ import com.unciv.models.ruleset.unique.Unique
|
||||
import com.unciv.models.ruleset.unique.UniqueType
|
||||
import com.unciv.ui.screens.mapeditorscreen.MapGeneratorSteps
|
||||
import com.unciv.ui.screens.mapeditorscreen.TileInfoNormalizer
|
||||
import com.unciv.utils.Log
|
||||
import com.unciv.utils.debug
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.isActive
|
||||
@ -31,7 +29,6 @@ import kotlin.math.roundToInt
|
||||
import kotlin.math.sign
|
||||
import kotlin.math.sqrt
|
||||
import kotlin.math.ulp
|
||||
import kotlin.random.Random
|
||||
|
||||
|
||||
/** Map generator, used by new game, map editor and main menu background
|
||||
@ -899,83 +896,3 @@ class MapGenerator(val ruleset: Ruleset, private val coroutineScope: CoroutineSc
|
||||
}
|
||||
}
|
||||
|
||||
class MapGenerationRandomness {
|
||||
var RNG = Random(42)
|
||||
|
||||
fun seedRNG(seed: Long = 42) {
|
||||
RNG = Random(seed)
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates a perlin noise channel combining multiple octaves
|
||||
* Default settings generate mostly within [-0.55, 0.55], but clustered around 0.0
|
||||
* About 28% are < -0.1 and 28% are > 0.1
|
||||
*
|
||||
* @param tile Source for x / x coordinates.
|
||||
* @param seed Misnomer: actually the z value the Perlin cloud is 'cut' on.
|
||||
* @param nOctaves is the number of octaves.
|
||||
* @param persistence is the scaling factor of octave amplitudes.
|
||||
* @param lacunarity is the scaling factor of octave frequencies.
|
||||
* @param scale is the distance the noise is observed from.
|
||||
*/
|
||||
fun getPerlinNoise(
|
||||
tile: Tile,
|
||||
seed: Double,
|
||||
nOctaves: Int = 6,
|
||||
persistence: Double = 0.5,
|
||||
lacunarity: Double = 2.0,
|
||||
scale: Double = 30.0
|
||||
): Double {
|
||||
val worldCoords = HexMath.hex2WorldCoords(tile.position)
|
||||
return Perlin.noise3d(worldCoords.x.toDouble(), worldCoords.y.toDouble(), seed, nOctaves, persistence, lacunarity, scale)
|
||||
}
|
||||
|
||||
|
||||
fun chooseSpreadOutLocations(number: Int, suitableTiles: List<Tile>, mapRadius: Int): ArrayList<Tile> {
|
||||
if (number <= 0) return ArrayList(0)
|
||||
|
||||
// Determine sensible initial distance from number of desired placements and mapRadius
|
||||
// empiric formula comes very close to eliminating retries for distance.
|
||||
// The `if` means if we need to fill 60% or more of the available tiles, no sense starting with minimum distance 2.
|
||||
val sparsityFactor = (HexMath.getHexagonalRadiusForArea(suitableTiles.size) / mapRadius).pow(0.333f)
|
||||
val initialDistance = if (number == 1 || number * 5 >= suitableTiles.size * 3) 1
|
||||
else max(1, (mapRadius * 0.666f / HexMath.getHexagonalRadiusForArea(number).pow(0.9f) * sparsityFactor + 0.5).toInt())
|
||||
|
||||
// If possible, we want to equalize the base terrains upon which
|
||||
// the resources are found, so we save how many have been
|
||||
// found for each base terrain and try to get one from the lowest
|
||||
val baseTerrainsToChosenTiles = HashMap<String, Int>()
|
||||
for (tileInfo in suitableTiles){
|
||||
if (tileInfo.baseTerrain !in baseTerrainsToChosenTiles)
|
||||
baseTerrainsToChosenTiles[tileInfo.baseTerrain] = 0
|
||||
}
|
||||
|
||||
for (distanceBetweenResources in initialDistance downTo 1) {
|
||||
var availableTiles = suitableTiles
|
||||
val chosenTiles = ArrayList<Tile>(number)
|
||||
|
||||
for (terrain in baseTerrainsToChosenTiles.keys)
|
||||
baseTerrainsToChosenTiles[terrain] = 0
|
||||
|
||||
for (i in 1..number) {
|
||||
if (availableTiles.isEmpty()) break
|
||||
val orderedKeys = baseTerrainsToChosenTiles.entries
|
||||
.sortedBy { it.value }.map { it.key }
|
||||
val firstKeyWithTilesLeft = orderedKeys
|
||||
.first { availableTiles.any { tile -> tile.baseTerrain == it} }
|
||||
val chosenTile = availableTiles.filter { it.baseTerrain == firstKeyWithTilesLeft }.random(RNG)
|
||||
availableTiles = availableTiles.filter { it.aerialDistanceTo(chosenTile) > distanceBetweenResources }
|
||||
chosenTiles.add(chosenTile)
|
||||
baseTerrainsToChosenTiles[firstKeyWithTilesLeft] = baseTerrainsToChosenTiles[firstKeyWithTilesLeft]!! + 1
|
||||
}
|
||||
if (chosenTiles.size == number || distanceBetweenResources == 1) {
|
||||
// Either we got them all, or we're not going to get anything better
|
||||
if (Log.shouldLog() && distanceBetweenResources < initialDistance)
|
||||
debug("chooseSpreadOutLocations: distance $distanceBetweenResources < initial $initialDistance")
|
||||
return chosenTiles
|
||||
}
|
||||
}
|
||||
// unreachable due to last loop iteration always returning and initialDistance >= 1
|
||||
throw Exception("Unreachable code reached!")
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user