curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-11 11:04:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

terragen: rock band generator wip

Browse Source
This commit is contained in:
minjaesong
2023-11-15 13:07:40 +09:00
parent 1affb24cae
commit 3707abcb3a
3 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/console/ExportMap2.kt
View File

@@ -42,7 +42,7 @@ internal object ExportMap2 : ConsoleCommand {
private fun Float.toDitherredByte(): Byte { private fun Float.toDitherredByte(): Byte {
val byteVal = this.times(255f).roundToInt() val byteVal = this.times(255f).roundToInt()
val error = this - byteVal val error = this - byteVal
val errorInt = if (Math.random() < (1 - error.absoluteValue)) 0 else (1 * error.sign).toInt() val errorInt = if (Math.random() < error.absoluteValue) 0 else error.sign.toInt()
return (byteVal + errorInt).coerceIn(0..255).toByte() return (byteVal + errorInt).coerceIn(0..255).toByte()
} }

2
src/net/torvald/terrarum/modulebasegame/worldgenerator/Treegen.kt
View File

@@ -70,7 +70,7 @@ class Treegen(world: GameWorld, seed: Long, val terragenParams: TerragenParams,
private fun Double.toDitherredInt(rng: HQRNG): Int { private fun Double.toDitherredInt(rng: HQRNG): Int {
val ibase = this.floorToInt() val ibase = this.floorToInt()
val thre = this - ibase val thre = this - ibase
return if (rng.nextDouble() < (1.0 - thre)) ibase else ibase + 1 return if (rng.nextDouble() < 1.0 - thre) ibase else ibase + 1
} }
private fun tryToPlant(xs: IntProgression, grassMap: Array<List<Int>>, rng: HQRNG) { private fun tryToPlant(xs: IntProgression, grassMap: Array<List<Int>>, rng: HQRNG) {

47
src/net/torvald/terrarum/tests/WorldgenNoiseSandbox.kt
View File

@@ -381,15 +381,17 @@ internal object TerragenTest : NoiseMaker {
private val terragenTiers = listOf(.0, .5, 1.0, 2.5).map { it * (NOISEBOX_HEIGHT / 2400.0).pow(0.75) } // pow 1.0 for 1-to-1 scaling; 0.75 is used to make deep-rock layers actually deep for huge world size private val terragenTiers = listOf(.0, .5, 1.0, 2.5).map { it * (NOISEBOX_HEIGHT / 2400.0).pow(0.75) } // pow 1.0 for 1-to-1 scaling; 0.75 is used to make deep-rock layers actually deep for huge world size
private fun Double.dither() = Math.random() < this
override fun draw(x: Int, y: Int, noiseValue: List<Double>, outTex: Pixmap) { override fun draw(x: Int, y: Int, noiseValue: List<Double>, outTex: Pixmap) {
val terr = noiseValue[0].tiered(terragenTiers) val terr = noiseValue[0].tiered(terragenTiers)
val cave = if (noiseValue[1] < 0.5) 0 else 1 val cave = if (noiseValue[1] < 0.5) 0 else 1
val ore = (noiseValue.subList(2, noiseValue.size)).zip(oreCols).firstNotNullOfOrNull { (n, colour) -> if (n > 0.5) colour else null } val ore = (noiseValue.subList(2, noiseValue.size)).zip(oreCols).firstNotNullOfOrNull { (n, colour) -> if (n > 0.5) colour else null }
val marbleLayerThre = noiseValue[10]..noiseValue[11] val isMarble = noiseValue[10] > 0.5
val wallBlock = if (noiseValue[0] in marbleLayerThre) Block.STONE_MARBLE else groundDepthBlock[terr] val wallBlock = if (isMarble) Block.STONE_MARBLE else groundDepthBlock[terr]
val terrBlock = if (cave == 0) Block.AIR else if (noiseValue[0] in marbleLayerThre) Block.STONE_MARBLE else wallBlock val terrBlock = if (cave == 0) Block.AIR else if (isMarble) Block.STONE_MARBLE else wallBlock
outTex.drawPixel(x, y, outTex.drawPixel(x, y,
@@ -714,25 +716,36 @@ internal object TerragenTest : NoiseMaker {
Joise(generateOreVeinModule(caveAttenuateBiasScaled, seed shake "ores@basegame:7", 0.013, 0.300, 0.476, 1.0)), Joise(generateOreVeinModule(caveAttenuateBiasScaled, seed shake "ores@basegame:7", 0.013, 0.300, 0.476, 1.0)),
Joise(generateOreVeinModule(caveAttenuateBiasScaled, seed shake "ores@basegame:8", 0.017, 0.020, 0.511, 1.0)), Joise(generateOreVeinModule(caveAttenuateBiasScaled, seed shake "ores@basegame:8", 0.017, 0.020, 0.511, 1.0)),
Joise(generate1Dline(seed shake 10, 2.6)), Joise(generateRockLayer(groundScaling, seed shake 10, 2.6, 2.62)),
Joise(generate1Dline(seed shake 10, 2.62)),
) )
} }
private fun generate1Dline(seed: Long, avr: Double): Module { private fun generateRockLayer(ground: Module, seed: Long, rangeStart: Double, rangeEnd: Double): Module {
return ModuleScaleOffset().also { val thresholdLow = ModuleSelect().also {
it.setSource(ModuleFractal().also { it.setLowSource(0.0)
it.setType(ModuleFractal.FractalType.RIDGEMULTI) it.setHighSource(1.0)
it.setAllSourceBasisTypes(ModuleBasisFunction.BasisType.SIMPLEX) it.setControlSource(ground)
it.setAllSourceInterpolationTypes(ModuleBasisFunction.InterpolationType.QUINTIC) it.setThreshold(rangeStart)
it.setNumOctaves(1) it.setFalloff(0.0)
it.setFrequency(0.0)
it.seed = seed
})
it.setScale(1.0)
it.setOffset(avr - 1.0)
} }
val thresholdHigh = ModuleSelect().also {
it.setLowSource(1.0)
it.setHighSource(0.0)
it.setControlSource(ground)
it.setThreshold(rangeEnd)
it.setFalloff(0.0)
}
val band = ModuleCombiner().also {
it.setSource(0, thresholdLow)
it.setSource(1, thresholdHigh)
it.setType(ModuleCombiner.CombinerType.MULT)
}
return band
// TODO combine another noise generator to cut off the otherwise continuous line of stone layer // TODO combine another noise generator to cut off the otherwise continuous line of stone layer
} }