DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Use hash table for chunk map

Browse Source
This commit is contained in:
DBotThePony 2022-12-02 15:00:31 +07:00
parent 64b777c11a
commit 8a03d326f4
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/ru/dbotthepony/kstarbound/world/ChunkPos.kt
View File

@ -117,9 +117,17 @@ class ChunkPos(val x: Int, val y: Int) : Comparable<ChunkPos> {
return ChunkPos(x, y) return ChunkPos(x, y)
} }
fun toLong(): Long {
return toLong(x, y)
}
companion object { companion object {
val ZERO = ChunkPos(0, 0) val ZERO = ChunkPos(0, 0)
fun toLong(x: Int, y: Int): Long {
return x.toLong() or (y.toLong() shl 32)
}
fun fromTilePosition(input: IStruct2i): ChunkPos { fun fromTilePosition(input: IStruct2i): ChunkPos {
val (x, y) = input val (x, y) = input
return ChunkPos(tileToChunkComponent(x), tileToChunkComponent(y)) return ChunkPos(tileToChunkComponent(x), tileToChunkComponent(y))

7
src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
View File

@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableList
import it.unimi.dsi.fastutil.objects.Object2DoubleAVLTreeMap import it.unimi.dsi.fastutil.objects.Object2DoubleAVLTreeMap
import it.unimi.dsi.fastutil.objects.Object2ObjectAVLTreeMap import it.unimi.dsi.fastutil.objects.Object2ObjectAVLTreeMap
import it.unimi.dsi.fastutil.objects.Object2ObjectFunction import it.unimi.dsi.fastutil.objects.Object2ObjectFunction
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
import ru.dbotthepony.kbox2d.api.ContactImpulse import ru.dbotthepony.kbox2d.api.ContactImpulse
import ru.dbotthepony.kbox2d.api.IContactFilter import ru.dbotthepony.kbox2d.api.IContactFilter
import ru.dbotthepony.kbox2d.api.IContactListener import ru.dbotthepony.kbox2d.api.IContactListener
@ -129,11 +130,7 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
val seed: Long, val seed: Long,
val widthInChunks: Int val widthInChunks: Int
) { ) {
protected val chunkMap = Object2ObjectAVLTreeMap<ChunkPos, ChunkType> cmp@{ a, b -> protected val chunkMap = Object2ObjectOpenHashMap<ChunkPos, ChunkType>()
return@cmp a.compareTo(b)
}
//protected val chunkMap = HashMap<ChunkPos, ChunkType>()
/** /**
* Является ли мир "сферическим" * Является ли мир "сферическим"