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

Fix repeating chunks not being put into collect

Browse Source
This commit is contained in:
DBotThePony 2023-09-04 11:05:42 +07:00
parent dc72bf1b18
commit 07ba48c121
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
abstract fun chunk(value: Double): Double
abstract fun inBounds(value: Int): Boolean
abstract fun inBoundsChunk(value: Int): Boolean
protected fun positiveModulo(a: Int, b: Int): Int {
val result = a % b
@ -67,6 +68,7 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
override fun chunk(value: Double): Double = value
override fun inBounds(value: Int) = true
override fun inBoundsChunk(value: Int) = true
}
class CoordinatesWrapper(private val cell: Int, private val chunk: Int) : AbstractCoordinatesWrapper() {
@ -74,6 +76,10 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
return value in 0 until cell
}
override fun inBoundsChunk(value: Int): Boolean {
return value in 0 until chunk
}
override fun cell(value: Int): Int {
return positiveModulo(value, cell)
}
@ -100,6 +106,10 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
return value in 0 until cell
}
override fun inBoundsChunk(value: Int): Boolean {
return value in 0 until chunk
}
override fun cell(value: Int): Int {
return value.coerceIn(0, cell - 1)
}
@ -401,13 +411,13 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
/**
* Возвращает все чанки, которые пересекаются с заданным [boundingBox]
*/
open fun collect(boundingBox: AABBi): List<ChunkType> {
fun collect(boundingBox: AABBi): List<ChunkType> {
val output = ArrayList<ChunkType>()
for (pos in boundingBox.chunkPositions) {
val chunk = chunkMap[pos]
if (chunk != null && chunk !in output) {
if (chunk != null && (loopX || chunkMap.x.inBoundsChunk(pos.x)) && (loopY || chunkMap.y.inBoundsChunk(pos.y))) {
output.add(chunk)
}
}
@ -418,13 +428,13 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
/**
* Возвращает все чанки, которые пересекаются с заданным [boundingBox]
*/
open fun collectPositionAware(boundingBox: AABBi): List<Pair<ChunkPos, ChunkType>> {
fun collectPositionAware(boundingBox: AABBi): List<Pair<ChunkPos, ChunkType>> {
val output = ArrayList<Pair<ChunkPos, ChunkType>>()
for (pos in boundingBox.chunkPositions) {
val chunk = chunkMap[pos]
if (chunk != null && !output.any { it.second === chunk }) {
if (chunk != null && (loopX || chunkMap.x.inBoundsChunk(pos.x)) && (loopY || chunkMap.y.inBoundsChunk(pos.y))) {
output.add(pos to chunk)
}
}