diff --git a/src/main/java/de/bixilon/minosoft/data/registries/blocks/state/BlockState.kt b/src/main/java/de/bixilon/minosoft/data/registries/blocks/state/BlockState.kt index bb3faff9a..3c48b542c 100644 --- a/src/main/java/de/bixilon/minosoft/data/registries/blocks/state/BlockState.kt +++ b/src/main/java/de/bixilon/minosoft/data/registries/blocks/state/BlockState.kt @@ -20,10 +20,10 @@ import de.bixilon.minosoft.data.registries.identified.ResourceLocation import de.bixilon.minosoft.gui.rendering.models.block.state.render.BlockRender open class BlockState( - val block: Block, + @JvmField val block: Block, val luminance: Int, ) { - var model: BlockRender? = null + @JvmField var model: BlockRender? = null constructor(block: Block, settings: BlockStateSettings) : this(block, settings.luminance) diff --git a/src/main/java/de/bixilon/minosoft/data/world/chunk/light/SectionLight.kt b/src/main/java/de/bixilon/minosoft/data/world/chunk/light/SectionLight.kt index d700b35ad..9bc1c05bf 100644 --- a/src/main/java/de/bixilon/minosoft/data/world/chunk/light/SectionLight.kt +++ b/src/main/java/de/bixilon/minosoft/data/world/chunk/light/SectionLight.kt @@ -25,7 +25,7 @@ import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition class SectionLight( val section: ChunkSection, - var light: ByteArray = ByteArray(ProtocolDefinition.BLOCKS_PER_SECTION), // packed (skyLight: 0xF0, blockLight: 0x0F) + @JvmField var light: ByteArray = ByteArray(ProtocolDefinition.BLOCKS_PER_SECTION), // packed (skyLight: 0xF0, blockLight: 0x0F) ) : AbstractSectionLight() { fun onBlockChange(x: Int, y: Int, z: Int, previous: BlockState?, state: BlockState?) { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FaceCulling.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FaceCulling.kt index e5e2b5b24..9b1bcf2fb 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FaceCulling.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FaceCulling.kt @@ -69,6 +69,16 @@ object FaceCulling { return area } + private inline fun minOf(a: Float, b: Float): Float { + if (a < b) return a + return b + } + + private inline fun maxOf(a: Float, b: Float): Float { + if (a > b) return a + return b + } + private fun FaceProperties.getSideArea(target: FaceProperties): Float { val start = start.array val targetStart = target.start.array