curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 12:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

implementing working multithreading Terragen to the game

Browse Source
This commit is contained in:
minjaesong
2020-04-29 11:26:59 +09:00
parent 4076e6d74e
commit 096a34c6a6
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/torvald/terrarum/modulebasegame/worldgenerator/Terragen.kt
View File

@@ -18,21 +18,21 @@ import kotlin.math.sin
*/
class Terragen(world: GameWorld, seed: Long, params: Any) : Gen(world, seed, params) {
private val genSlices = 1 // world.width / 64
private val genSlices = world.width / 8
private var genFutures: Array<Future<*>?> = arrayOfNulls(genSlices)
override var generationStarted: Boolean = false
override val generationDone: Boolean
get() = generationStarted && genFutures.fold(1) { acc, f -> acc * (f?.isDone ?: true).toInt() } == 1
get() = generationStarted && genFutures.fold(true) { acc, f -> acc and (f?.isDone ?: true) }
override fun run() {
val joise = getGenerator(seed, params as TerragenParams)
generationStarted = true
// single-threaded impl because I couldn't resolve multithread memory corruption issue...
(0 until world.width).sliceEvenly(genSlices).mapIndexed { i, xs ->
genFutures[i] = ThreadExecutor.submit {
val localJoise = getGenerator(seed, params as TerragenParams)
for (x in xs) {
for (y in 0 until world.height) {
val sampleTheta = (x.toDouble() / world.width) * TWO_PI
@@ -40,7 +40,7 @@ class Terragen(world: GameWorld, seed: Long, params: Any) : Gen(world, seed, par
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()
val noise = joise.map { it.get(sampleX, sampleY, sampleZ) }
val noise = localJoise.map { it.get(sampleX, sampleY, sampleZ) }
draw(x, y, noise, world)
}

1
src/net/torvald/terrarum/modulebasegame/worldgenerator/WorldGenerator.kt
View File

@@ -13,6 +13,7 @@ import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.roundInt
import java.util.*
@Deprecated("Old non-thread-safe version", ReplaceWith("Terragen", "net.torvald.terrarum.modulebasegame.worldgenerator"))
object WorldGenerator {
internal lateinit var world: GameWorld

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

@@ -91,7 +91,7 @@ class WorldgenNoiseSandbox : ApplicationAdapter() {
renderNoise()
}
val coroutineExecFinished = (coroutineJobs.fold(true) { acc, it -> acc and it.isCompleted })
val coroutineExecFinished = coroutineJobs.fold(true) { acc, it -> acc and it.isCompleted }
// check if generation is done
if (coroutineExecFinished) {
generateKeyLatched = false