AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 11:54:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some world visibility graph calculation crashes

Browse Source
This commit is contained in:
Bixilon 2022-08-21 21:41:59 +02:00
parent b5728fcb68
commit 2ba888afe8
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/de/bixilon/minosoft/gui/rendering/world/view/WorldVisibilityGraph.kt
View File

@ -61,6 +61,7 @@ class WorldVisibilityGraph(
private var sections = 16
private var chunkMin = Vec2i.EMPTY
private var chunkMax = Vec2i.EMPTY
private var worldSize = Vec2i.EMPTY
private var graph: Array<Array<BooleanArray?>?> = arrayOfNulls(0)
@ -225,7 +226,7 @@ class WorldVisibilityGraph(
return
}
if (directionX <= 0 && (chunk.sections?.get(sectionIndex)?.blocks?.isOccluded(inverted, Directions.WEST) != true)) {
if (directionX <= 0 && (chunk.sections?.get(sectionIndex)?.blocks?.isOccluded(inverted, Directions.WEST) != true) && chunkPosition.x > chunkMin.x) {
val nextPosition = chunkPosition + Directions.WEST
val nextChunk = chunk.neighbours?.get(1)
if (nextChunk != null) {
@ -237,7 +238,7 @@ class WorldVisibilityGraph(
}
}
if (directionX >= 0 && (chunk.sections?.get(sectionIndex)?.blocks?.isOccluded(inverted, Directions.EAST) != true)) {
if (directionX >= 0 && (chunk.sections?.get(sectionIndex)?.blocks?.isOccluded(inverted, Directions.EAST) != true) && chunkPosition.x < chunkMax.x) {
val nextPosition = chunkPosition + Directions.EAST
val nextChunk = chunk.neighbours?.get(6)
if (nextChunk != null) {
@ -262,7 +263,7 @@ class WorldVisibilityGraph(
}
}
if (directionZ <= 0 && (chunk.sections?.get(sectionIndex)?.blocks?.isOccluded(inverted, Directions.NORTH) != true)) {
if (directionZ <= 0 && (chunk.sections?.get(sectionIndex)?.blocks?.isOccluded(inverted, Directions.NORTH) != true) && chunkPosition.y > chunkMin.y) {
val nextPosition = chunkPosition + Directions.NORTH
val nextChunk = chunk.neighbours?.get(3)
if (nextChunk != null) {
@ -274,7 +275,7 @@ class WorldVisibilityGraph(
}
}
if (directionZ >= 0 && (chunk.sections?.get(sectionIndex)?.blocks?.isOccluded(inverted, Directions.SOUTH) != true)) {
if (directionZ >= 0 && (chunk.sections?.get(sectionIndex)?.blocks?.isOccluded(inverted, Directions.SOUTH) != true) && chunkPosition.y < chunkMax.y) {
val nextPosition = chunkPosition + Directions.SOUTH
val nextChunk = chunk.neighbours?.get(4)
if (nextChunk != null) {
@ -287,16 +288,6 @@ class WorldVisibilityGraph(
}
}
private fun Vec3i.modify(axis: Int, value: Int): Vec3i {
val array = this.array
if (array[axis] == value) {
return this
}
val ret = Vec3i(this)
ret[axis] = value
return ret
}
@Synchronized
private fun calculateGraph() {
if (!RenderConstants.OCCLUSION_CULLING_ENABLED) {
@ -323,6 +314,7 @@ class WorldVisibilityGraph(
if (this.chunkMin != chunkMin || this.worldSize != worldSize) {
this.chunkMin = chunkMin
this.chunkMax = chunkMin + worldSize - 1
this.worldSize = worldSize
this.frustumCache = arrayOfNulls(worldSize.x)
}