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

light: shade

Browse Source
This commit is contained in:
Bixilon 2021-06-30 18:44:04 +02:00
parent 4cf21f5271
commit bef3e051fb
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/de/bixilon/minosoft/gui/rendering/block/renderable/block/ElementRenderer.kt
View File

@ -17,6 +17,7 @@ import com.google.common.collect.HashBiMap
import com.google.gson.JsonObject import com.google.gson.JsonObject
import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.Axes
import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.direction.Directions
import de.bixilon.minosoft.data.text.ChatColors
import de.bixilon.minosoft.data.text.RGBColor import de.bixilon.minosoft.data.text.RGBColor
import de.bixilon.minosoft.gui.rendering.block.mesh.ChunkSectionArrayMesh import de.bixilon.minosoft.gui.rendering.block.mesh.ChunkSectionArrayMesh
import de.bixilon.minosoft.gui.rendering.block.mesh.ChunkSectionMeshCollection import de.bixilon.minosoft.gui.rendering.block.mesh.ChunkSectionMeshCollection
@ -76,6 +77,23 @@ class ElementRenderer(
val texture = textureMapping[face.textureName] ?: TODO("Unknown texture used ${face.textureName}") // ToDo: can be replaced with RenderConstants.DEBUG_TEXTURE_ID? val texture = textureMapping[face.textureName] ?: TODO("Unknown texture used ${face.textureName}") // ToDo: can be replaced with RenderConstants.DEBUG_TEXTURE_ID?
val shadeLevel = when {
!element.shade -> 1.0f
direction == Directions.UP -> 1.0f
direction == Directions.DOWN -> 0.5f
direction == Directions.EAST || direction == Directions.WEST -> 0.6f
direction == Directions.NORTH || direction == Directions.SOUTH -> 0.8f
else -> TODO()
}
var finalColor = if (face.tint && tintColor != null) {
tintColor
} else {
ChatColors.WHITE
}
finalColor = finalColor.with(finalColor.floatRed * shadeLevel, finalColor.floatGreen * shadeLevel, finalColor.floatBlue * shadeLevel)
val lightLevel = context.lightAccessor.getLightLevel(context.blockPosition + face.cullFace?.let { directionMapping[it] }) // ToDo: rotate cullface val lightLevel = context.lightAccessor.getLightLevel(context.blockPosition + face.cullFace?.let { directionMapping[it] }) // ToDo: rotate cullface
val drawPositions = mutableListOf<Vec3>() val drawPositions = mutableListOf<Vec3>()
@ -89,15 +107,12 @@ class ElementRenderer(
for ((drawPositionIndex, texturePositionIndex) in DRAW_ODER) { for ((drawPositionIndex, texturePositionIndex) in DRAW_ODER) {
val input = drawPositions[drawPositionIndex] val input = drawPositions[drawPositionIndex]
val output = context.blockPosition.toVec3 + input + DRAW_OFFSET + context.offset val output = context.blockPosition.toVec3 + input + DRAW_OFFSET + context.offset
mesh.addVertex( mesh.addVertex(
position = output, position = output,
textureCoordinates = texturePositions[texturePositionIndex]!!, textureCoordinates = texturePositions[texturePositionIndex]!!,
texture = texture, texture = texture,
tintColor = if (face.tint) { tintColor = finalColor,
tintColor
} else {
null
},
lightLevel = lightLevel, lightLevel = lightLevel,
) )
} }