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

more testing on resolving noisy artefact in worldgen

Browse Source
This commit is contained in:
minjaesong
2020-04-29 08:15:40 +09:00
parent 1a98292b92
commit 25043cb36e
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/tests/CIESpectralTest.kt Normal file
View File

@@ -0,0 +1,2 @@
package net.torvald.terrarum.tests

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

@@ -164,6 +164,8 @@ class WorldgenNoiseSandbox : ApplicationAdapter() {
//private val xSlices = (0 until WIDTH).sliceEvenly(ThreadExecutor.threadCount) //private val xSlices = (0 until WIDTH).sliceEvenly(ThreadExecutor.threadCount)
private val xSlices = (0 until WIDTH).sliceEvenly(WIDTH / 8) private val xSlices = (0 until WIDTH).sliceEvenly(WIDTH / 8)
private val runs = (0 until WIDTH).map { x -> (x until WIDTH * HEIGHT step WIDTH) }.flatten()
private lateinit var coroutineJobs: List<Job> private lateinit var coroutineJobs: List<Job>
private fun renderNoise() { private fun renderNoise() {
@@ -177,8 +179,21 @@ class WorldgenNoiseSandbox : ApplicationAdapter() {
testColSet.shuffle() testColSet.shuffle()
testColSet2.shuffle() testColSet2.shuffle()
/*
I've got two ideas to resolve noisy artefact when noise generation runs concurrently:
1) 1 block = 1 coroutine
2) 1 thread has its own copy of Joise (threads have different INSTANCEs of Joise with same params)
Method 1) seemingly works but may break if the operation is more complex
Method 2) needs testing
--CuriousTorvald, 2020-04-29
*/
// render noisemap to pixmap // render noisemap to pixmap
val runnables: List<RunnableFun> = xSlices.mapIndexed { index, range -> // 0. naive coucurrent approach
/*val runnables: List<RunnableFun> = xSlices.map { range ->
{ {
for (x in range) { for (x in range) {
for (y in 0 until HEIGHT) { for (y in 0 until HEIGHT) {
@@ -187,23 +202,24 @@ class WorldgenNoiseSandbox : ApplicationAdapter() {
val sampleZ = cos(sampleTheta) * sampleOffset + sampleOffset // positive points are to be sampled val sampleZ = cos(sampleTheta) * sampleOffset + sampleOffset // positive points are to be sampled
val sampleY = y.toDouble() val sampleY = y.toDouble()
NOISE_MAKER.draw(x, y, joise.map { it.get(sampleX, sampleY, sampleZ) }, testTex)
NOISE_MAKER.draw(range, x, y, joise.map { it.get(sampleX, sampleY, sampleZ) }, testTex)
//joise.map { it.get(sampleX, sampleY, sampleZ) }
//testTex.drawPixel(x, y, testColSet2[index])
//testTex.setColor(testColSet2[index])
//testTex.drawPixel(x, y)
} }
} }
} }
}
/*runnables.forEachIndexed { index, function ->
threadExecFuture[index] = ThreadExecutor.submit(function)
}*/ }*/
// 1. stupid one-block-is-one-coroutine approach (seemingly works?)
val runnables: List<RunnableFun> = runs.map { i -> {
val (x, y) = (i % WIDTH) to (i / WIDTH)
val sampleTheta = (x.toDouble() / WIDTH) * TWO_PI
val sampleX = sin(sampleTheta) * sampleOffset + sampleOffset // plus sampleOffset to make only
val sampleZ = cos(sampleTheta) * sampleOffset + sampleOffset // positive points are to be sampled
val sampleY = y.toDouble()
NOISE_MAKER.draw(x, y, joise.map { it.get(sampleX, sampleY, sampleZ) }, testTex)
} }
coroutineJobs = runnables.map { r -> GlobalScope.launch { r() } } coroutineJobs = runnables.map { r -> GlobalScope.launch { r() } }
initialGenDone = true initialGenDone = true
@@ -299,7 +315,7 @@ internal object AccidentalCave {
Color(0.97f, 0.6f, 0.56f, 1f) Color(0.97f, 0.6f, 0.56f, 1f)
) )
fun draw(xs: IntProgression, x: Int, y: Int, noiseValue: List<Double>, outTex: Pixmap) { fun draw(x: Int, y: Int, noiseValue: List<Double>, outTex: Pixmap) {
// simple one-source draw // simple one-source draw
/*val c = noiseValue[0].toFloat() /*val c = noiseValue[0].toFloat()
val selector = c.minus(0.0001).floorInt() fmod notationColours.size val selector = c.minus(0.0001).floorInt() fmod notationColours.size