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

fix: tile randomiser breaks on world seam again

Browse Source
This commit is contained in:
minjaesong
2023-11-11 12:17:25 +09:00
parent 5fcaec2c74
commit 6291c799cf
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/net/torvald/terrarum/modulebasegame/worldgenerator/OregenAutotiling.kt
View File

@@ -34,7 +34,10 @@ class OregenAutotiling(world: GameWorld, seed: Long, val tilingModes: HashMap<It
Worldgen.threadExecutor.join() Worldgen.threadExecutor.join()
} }
private fun getHashCoord(x: Int, y: Int, mod: Int) = (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), ((x*16777619) xor (y+1073)).toLong()) fmod mod.toLong()).toInt() private fun getHashCoord(x: Int, y: Int, mod: Int): Int {
val (x, y) = world.coerceXY(x, y)
return (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), ((x*16777619) xor (y+1073)).toLong()) fmod mod.toLong()).toInt()
}
private fun draw(x: Int) { private fun draw(x: Int) {
for (y in 0 until world.height) { for (y in 0 until world.height) {

6
src/net/torvald/terrarum/modulebasegame/worldgenerator/Treegen.kt Normal file
View File

@@ -0,0 +1,6 @@
package net.torvald.terrarum.modulebasegame.worldgenerator
/**
* Created by minjaesong on 2023-11-10.
*/class Treegen {
}

5
src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
View File

@@ -307,7 +307,10 @@ internal object BlocksDrawer {
} }
private fun getHashCoord(x: Int, y: Int, mod: Int, layer: Int) = (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), ((x*16777619) xor (y+1+layer)).toLong()) fmod mod.toLong()).toInt() private fun getHashCoord(x: Int, y: Int, mod: Int, layer: Int): Int {
val (x, y) = world.coerceXY(x, y)
return (XXHash64.hash(LandUtil.getBlockAddr(world, x, y).toBig64(), ((x*16777619) xor (y+1+layer)).toLong()) fmod mod.toLong()).toInt()
}
/** /**
* Autotiling; writes to buffer. Actual draw code must be called after this operation. * Autotiling; writes to buffer. Actual draw code must be called after this operation.