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

fix some sky light neighbour tracing bugs

Browse Source
This commit is contained in:
Moritz Zwerger 2023-07-29 00:34:05 +02:00
parent 358b578ba6
commit 9e08ec7079
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -222,7 +222,7 @@ testing {
options { options {
val options = this as TestNGOptions val options = this as TestNGOptions
options.preserveOrder = true options.preserveOrder = true
options.excludeGroups("input", "font", "command", "registry", "biome", "version", "fluid", "world", "raycasting", "pixlyzer", "item", "physics", "packet", "container", "item_stack", "signature", "private_key", "interaction", "item_digging", "world_renderer", "rendering") // options.excludeGroups("input", "font", "command", "registry", "biome", "version", "fluid", "world", "raycasting", "pixlyzer", "item", "physics", "packet", "container", "item_stack", "signature", "private_key", "interaction", "item_digging", "world_renderer", "rendering")
} }
} }
} }

2
src/integration-test/kotlin/de/bixilon/minosoft/data/world/chunk/light/place/SkyLightPlaceIT.kt
View File

@ -73,6 +73,8 @@ class SkyLightPlaceIT {
fun belowBlock3() { fun belowBlock3() {
val world = createConnection(3, light = true).world val world = createConnection(3, light = true).world
world.fill(7, 10, 7, 9, 10, 9, StoneTest0.state, false) world.fill(7, 10, 7, 9, 10, 9, StoneTest0.state, false)
// world.chunks[0,0]!!.light.reset()
// world.chunks[0,0]!!.light.sky.calculate()
world.assertLight(8, 9, 8, 0xD0) world.assertLight(8, 9, 8, 0xD0)
} }

28
src/main/java/de/bixilon/minosoft/data/world/chunk/light/ChunkSkyLight.kt
View File

@ -34,17 +34,17 @@ class ChunkSkyLight(val light: ChunkLight) {
floodFill() floodFill()
} }
private fun traceSection(sectionHeight: SectionHeight, x: Int, topY: Int, bottomY: Int, z: Int, source: Directions) { private fun traceSection(sectionHeight: SectionHeight, x: Int, topY: Int, bottomY: Int, z: Int, target: Directions) {
val section = chunk.getOrPut(sectionHeight) ?: return val section = chunk.getOrPut(sectionHeight) ?: return
val baseY = sectionHeight * ProtocolDefinition.SECTION_HEIGHT_Y val baseY = sectionHeight * ProtocolDefinition.SECTION_HEIGHT_Y
for (y in topY downTo bottomY) { for (y in topY downTo bottomY) {
section.light.traceSkyLightIncrease(x, y, z, NEIGHBOUR_TRACE_LEVEL, source, baseY + y, false) section.light.traceSkyLightIncrease(x, y, z, NEIGHBOUR_TRACE_LEVEL, target, baseY + y, false)
} }
section.light.update = true section.light.update = true
} }
private fun trace(x: Int, topY: Int, bottomY: Int, z: Int, source: Directions) { private fun trace(x: Int, topY: Int, bottomY: Int, z: Int, target: Directions) {
if (topY == Int.MIN_VALUE) return // no blocks are set in that column, no need to trace. all levels are MAX if (topY == Int.MIN_VALUE) return // no blocks are set in that column, no need to trace. all levels are MAX
if (bottomY > topY) return // started position is higher than at this, no need to trace if (bottomY > topY) return // started position is higher than at this, no need to trace
@ -57,16 +57,16 @@ class ChunkSkyLight(val light: ChunkLight) {
// top section // top section
if (sections > 1) { if (sections > 1) {
traceSection(topSection, x, topY.inSectionHeight, 0, z, source) traceSection(topSection, x, topY.inSectionHeight, 0, z, target)
} }
// middle sections // middle sections
for (sectionHeight in (topSection - 1) downTo maxOf(chunk.minSection, bottomSection) + 1) { for (sectionHeight in (topSection - 1) downTo maxOf(chunk.minSection, bottomSection) + 1) {
traceSection(sectionHeight, x, ProtocolDefinition.SECTION_MAX_Y, 0, z, source) traceSection(sectionHeight, x, ProtocolDefinition.SECTION_MAX_Y, 0, z, target)
} }
// lowest section // lowest section
traceSection(if (bottomY == Int.MIN_VALUE) chunk.minSection else bottomSection, x, if (topSection == bottomSection) topY.inSectionHeight else ProtocolDefinition.SECTION_MAX_Y, if (bottomY == Int.MIN_VALUE) 0 else bottomY.inSectionHeight, z, source) traceSection(if (bottomY == Int.MIN_VALUE) chunk.minSection else bottomSection, x, if (topSection == bottomSection) topY.inSectionHeight else ProtocolDefinition.SECTION_MAX_Y, if (bottomY == Int.MIN_VALUE) 0 else bottomY.inSectionHeight, z, target)
if (bottomY == Int.MIN_VALUE) { if (bottomY == Int.MIN_VALUE) {
chunk.light.bottom.traceSkyIncrease(x, z, NEIGHBOUR_TRACE_LEVEL) chunk.light.bottom.traceSkyIncrease(x, z, NEIGHBOUR_TRACE_LEVEL)
@ -91,31 +91,31 @@ class ChunkSkyLight(val light: ChunkLight) {
traceDown(x, maxHeight, z) traceDown(x, maxHeight, z)
if (x > 0) { if (x > 0) {
trace(x - 1, light.heightmap[heightmapIndex - 1], maxHeight, z, Directions.EAST) trace(x - 1, light.heightmap[heightmapIndex - 1], maxHeight, z, Directions.WEST)
} else { } else {
val neighbour = neighbours[ChunkNeighbours.WEST].light val neighbour = neighbours[ChunkNeighbours.WEST].light
neighbour.sky.trace(ProtocolDefinition.SECTION_MAX_X, neighbour.heightmap[(z shl 4) or ProtocolDefinition.SECTION_MAX_X], maxHeight, z, Directions.EAST) neighbour.sky.trace(ProtocolDefinition.SECTION_MAX_X, neighbour.heightmap[(z shl 4) or ProtocolDefinition.SECTION_MAX_X], maxHeight, z, Directions.WEST)
} }
if (x < ProtocolDefinition.SECTION_MAX_X) { if (x < ProtocolDefinition.SECTION_MAX_X) {
trace(x + 1, light.heightmap[heightmapIndex + 1], maxHeight, z, Directions.WEST) trace(x + 1, light.heightmap[heightmapIndex + 1], maxHeight, z, Directions.EAST)
} else { } else {
val neighbour = neighbours[ChunkNeighbours.EAST].light val neighbour = neighbours[ChunkNeighbours.EAST].light
neighbour.sky.trace(0, neighbour.heightmap[(z shl 4) or 0], maxHeight, z, Directions.WEST) neighbour.sky.trace(0, neighbour.heightmap[(z shl 4) or 0], maxHeight, z, Directions.EAST)
} }
if (z > 0) { if (z > 0) {
trace(x, light.heightmap[((z - 1) shl 4) or x], maxHeight, z - 1, Directions.SOUTH) trace(x, light.heightmap[((z - 1) shl 4) or x], maxHeight, z - 1, Directions.NORTH)
} else { } else {
val neighbour = neighbours[ChunkNeighbours.NORTH].light val neighbour = neighbours[ChunkNeighbours.NORTH].light
neighbour.sky.trace(x, neighbour.heightmap[(ProtocolDefinition.SECTION_MAX_Z shl 4) or x], maxHeight, ProtocolDefinition.SECTION_MAX_Z, Directions.SOUTH) neighbour.sky.trace(x, neighbour.heightmap[(ProtocolDefinition.SECTION_MAX_Z shl 4) or x], maxHeight, ProtocolDefinition.SECTION_MAX_Z, Directions.NORTH)
} }
if (z < ProtocolDefinition.SECTION_MAX_Z) { if (z < ProtocolDefinition.SECTION_MAX_Z) {
trace(x, light.heightmap[((z + 1) shl 4) or x], maxHeight, z + 1, Directions.NORTH) trace(x, light.heightmap[((z + 1) shl 4) or x], maxHeight, z + 1, Directions.SOUTH)
} else { } else {
val neighbour = neighbours[ChunkNeighbours.SOUTH].light val neighbour = neighbours[ChunkNeighbours.SOUTH].light
neighbour.sky.trace(x, neighbour.heightmap[(0 shl 4) or x], maxHeight, 0, Directions.NORTH) neighbour.sky.trace(x, neighbour.heightmap[(0 shl 4) or x], maxHeight, 0, Directions.SOUTH)
} }
} }