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

updated Terragen.kt

Browse Source
This commit is contained in:
minjaesong
2019-12-04 15:38:32 +09:00
parent 385ea3b5a9
commit 60df739563
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,9 @@ import kotlin.math.sin
*/ */
class Terragen(world: GameWorld, seed: Long, params: Any) : Gen(world, seed, params) { class Terragen(world: GameWorld, seed: Long, params: Any) : Gen(world, seed, params) {
private var genFutures: Array<Future<*>?> = arrayOfNulls(ThreadExecutor.threadCount) private val genSlices = 1 // world.width / 64
private var genFutures: Array<Future<*>?> = arrayOfNulls(genSlices)
override var generationStarted: Boolean = false override var generationStarted: Boolean = false
override val generationDone: Boolean override val generationDone: Boolean
get() = generationStarted && genFutures.fold(1) { acc, f -> acc * (f?.isDone ?: true).toInt() } == 1 get() = generationStarted && genFutures.fold(1) { acc, f -> acc * (f?.isDone ?: true).toInt() } == 1
@@ -29,16 +31,9 @@ class Terragen(world: GameWorld, seed: Long, params: Any) : Gen(world, seed, par
generationStarted = true generationStarted = true
// single-threaded impl because I couldn't resolve multithread memory corruption issue... // single-threaded impl because I couldn't resolve multithread memory corruption issue...
val slices = 1 // ThreadExecutor.threadCount (0 until world.width).sliceEvenly(genSlices).mapIndexed { i, xs ->
(0 until world.width).sliceEvenly(slices).mapIndexed { i, xs ->
genFutures[i] = ThreadExecutor.submit { genFutures[i] = ThreadExecutor.submit {
for (x in xs) { for (x in xs) {
if (AppLoader.IS_DEVELOPMENT_BUILD) {
AppLoader.getLoadScreen().addMessage("Tile draw for x=$x")
//println("Tile draw for x=$x")
}
for (y in 0 until world.height) { for (y in 0 until world.height) {
val sampleTheta = (x.toDouble() / world.width) * TWO_PI val sampleTheta = (x.toDouble() / world.width) * TWO_PI
val sampleOffset = world.width / 8.0 val sampleOffset = world.width / 8.0