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

fluid mesher: remove code duplicate

Browse Source
This commit is contained in:
Bixilon 2022-09-11 22:26:46 +02:00
parent 6f4b630f4b
commit a72d03fd3c
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/de/bixilon/minosoft/gui/rendering/world/preparer/cull/FluidCullSectionPreparer.kt
View File

@ -43,6 +43,7 @@ import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2Util.EMPTY
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.rotate
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.chunkPosition
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.inChunkPosition
import de.bixilon.minosoft.gui.rendering.world.mesh.SingleWorldMesh
import de.bixilon.minosoft.gui.rendering.world.mesh.WorldMesh
import de.bixilon.minosoft.gui.rendering.world.preparer.FluidSectionPreparer
import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
@ -173,13 +174,7 @@ class FluidCullSectionPreparer(
val tint = tints?.get(FLUID_TINT_INDEX) ?: Colors.WHITE
val light = chunk.getLight(x, position.y, z)
for ((positionIndex, textureIndex) in meshToUse.order) {
meshToUse.addVertex(positions[positionIndex].array, texturePositions[textureIndex], texture, tint, light)
}
// ToDo: Sides that are connecting with non full cubes (e.g. air) also have cullface disabled
for ((positionIndex, textureIndex) in meshToUse.reversedOrder) {
meshToUse.addVertex(positions[positionIndex].array, texturePositions[textureIndex], texture, tint, light)
}
addFluidVertices(meshToUse, positions, texturePositions, texture, tint, light)
rendered = true
}
// ToDo: Sides: Minecraft uses (for water) an overlay texture (with cullface) that is used, when the face fits to a non opaque block
@ -240,12 +235,7 @@ class FluidCullSectionPreparer(
val meshToUse = flowingTexture.transparency.getMesh(mesh)
val fluidTint = tints?.get(FLUID_TINT_INDEX) ?: Colors.WHITE
val fluidLight = chunk.getLight(x, offsetY + y, z)
for ((positionIndex, textureIndex) in meshToUse.order) {
meshToUse.addVertex(positions[positionIndex].array, texturePositions[textureIndex], flowingTexture, fluidTint, fluidLight)
}
for ((positionIndex, textureIndex) in meshToUse.reversedOrder) {
meshToUse.addVertex(positions[positionIndex].array, texturePositions[textureIndex], flowingTexture, fluidTint, fluidLight)
}
addFluidVertices(meshToUse, positions, texturePositions, flowingTexture, fluidTint, fluidLight)
rendered = true
}
@ -258,6 +248,15 @@ class FluidCullSectionPreparer(
}
}
private inline fun addFluidVertices(meshToUse: SingleWorldMesh, positions: Array<Vec3>, texturePositions: Array<Vec2>, flowingTexture: AbstractTexture, fluidTint: Int, fluidLight: Int) {
for ((positionIndex, textureIndex) in meshToUse.order) {
meshToUse.addVertex(positions[positionIndex].array, texturePositions[textureIndex], flowingTexture, fluidTint, fluidLight)
}
for ((positionIndex, textureIndex) in meshToUse.reversedOrder) {
meshToUse.addVertex(positions[positionIndex].array, texturePositions[textureIndex], flowingTexture, fluidTint, fluidLight)
}
}
private fun getCornerHeight(providedChunk: Chunk, providedChunkPosition: Vec2i, position: Vec3i, fluid: Fluid): Float {
var totalHeight = 0.0f
var count = 0