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

rendering: improve appearance of water

Browse Source
This commit is contained in:
Lukas 2021-04-04 18:04:20 +02:00
parent 41b32fb466
commit cb85c59512
3 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/loading/BlockModelFace.kt
View File

@ -81,6 +81,25 @@ class BlockModelFace {
positions = calculateTexturePositions(null, from, to, direction)
}
constructor(vertexPositions: List<Vec3>, direction: Directions) {
textureName = null
cullFace = null
tint = false
val template = BlockModelElement.FACE_POSITION_MAP_TEMPLATE[direction.ordinal]
positions = mutableListOf()
for (templatePosition in template) {
positions.add(calculateTexturePosition(vertexPositions[templatePosition], direction))
}
}
private fun calculateTexturePosition(position: Vec3, direction: Directions): Vec2 {
return when (direction) {
Directions.UP, Directions.DOWN -> Vec2(position.x, BlockModelElement.BLOCK_RESOLUTION - position.z)
Directions.NORTH, Directions.SOUTH -> Vec2(position.x, position.y)
Directions.EAST, Directions.WEST -> Vec2(position.z, BlockModelElement.BLOCK_RESOLUTION - position.y)
}
}
fun getTexturePositionArray(direction: Directions): Array<Vec2?> {
val template = textureTemplate[direction.ordinal]
val result = arrayOfNulls<Vec2>(template.size)

2
src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/BlockRenderer.kt
View File

@ -55,7 +55,7 @@ class BlockRenderer : BlockRenderInterface {
for (direction in Directions.DIRECTIONS) {
try {
directionMapping[direction] = ElementRenderer.getRotatedDirection(rotation, direction)
} catch (e: Exception) {
} catch (_: IllegalArgumentException) {
}
}
}

30
src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/FluidRenderer.kt
View File

@ -12,7 +12,6 @@ import de.bixilon.minosoft.gui.rendering.chunk.models.FaceSize
import de.bixilon.minosoft.gui.rendering.chunk.models.loading.BlockModelElement
import de.bixilon.minosoft.gui.rendering.chunk.models.loading.BlockModelFace
import de.bixilon.minosoft.gui.rendering.textures.Texture
import de.bixilon.minosoft.gui.rendering.util.VecUtil
import de.bixilon.minosoft.gui.rendering.util.VecUtil.plus
import glm_.glm
import glm_.vec2.Vec2
@ -37,26 +36,24 @@ class FluidRenderer(
val heights = calculateHeights(neighbourBlocks, blockState, world, blockPosition)
val isFlowing = isLiquidFlowing(heights)
val texture: Texture
val angle: Float
if (isFlowing) {
texture = flowingTexture
angle = getRotationAngle(heights)
} else {
texture = stillTexture
angle = 0.0f
}
var texture: Texture
val positions = calculatePositions(heights)
for (direction in Directions.DIRECTIONS) {
val face = BlockModelFace(positions, direction)
if (isFlowing || Directions.SIDES.contains(direction)) {
face.scale(0.5)
texture = flowingTexture
if (! Directions.SIDES.contains(direction)) {
val angle = getRotationAngle(heights)
face.rotate(angle)
}
} else {
texture = stillTexture
}
if (isBlockSameFluid(neighbourBlocks[direction.ordinal]) || neighbourBlocks[direction.ordinal]?.getBlockRenderer(blockPosition + direction)?.faceBorderSizes?.let { it[direction.inverse.ordinal] != null } == true && direction != Directions.UP) {
continue
}
val face = BlockModelFace(VecUtil.EMPTY_VEC3, Vec3(VecUtil.BLOCK_SIZE_VEC3.x, positions[7].y * 8, VecUtil.BLOCK_SIZE_VEC3.z), direction)
if (isFlowing) {
face.scale(0.5)
}
face.rotate(angle)
val positionTemplate = BlockModelElement.FACE_POSITION_MAP_TEMPLATE[direction.ordinal]
val drawPositions = arrayOf(positions[positionTemplate[0]], positions[positionTemplate[1]], positions[positionTemplate[2]], positions[positionTemplate[3]])
createQuad(drawPositions, face.getTexturePositionArray(direction), texture, blockPosition, meshCollection, tintColor, lightLevel)
@ -131,6 +128,9 @@ class FluidRenderer(
}
private fun calculateHeights(neighbourBlocks: Array<BlockState?>, blockState: BlockState, world: World, position: Vec3i): FloatArray {
if (isBlockSameFluid(neighbourBlocks[Directions.UP.ordinal])) {
return floatArrayOf(1f, 1f, 1f, 1f)
}
val height = getLevel(blockState)
val heights = floatArrayOf(height, height, height, height)
for (direction in Directions.SIDES) {