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

fix build

Browse Source
This commit is contained in:
Moritz Zwerger 2023-11-15 18:12:13 +01:00
parent 2fa06dba62
commit 5ce5a9df45
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/block/state/baked/cull/FaceCullingTest.kt
View File

@ -47,7 +47,7 @@ class FaceCullingTest {
private fun createBlock(block: Block, transparency: TextureTransparencies = TextureTransparencies.OPAQUE, properties: SideProperties? = SideProperties(arrayOf(FaceProperties(Vec2(0), Vec2(1), transparency)), transparency)): BlockState {
val state = BlockState(block, 0)
state.model = BakedModel(Array(Directions.SIZE) { emptyArray() }, arrayOf(properties, properties, properties, properties, properties, properties), null)
state.model = BakedModel(Array(Directions.SIZE) { emptyArray() }, arrayOf(properties, properties, properties, properties, properties, properties), null, null)
return state
}

10
src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/builder/BuilderApply.kt
View File

@ -21,6 +21,8 @@ import de.bixilon.minosoft.gui.rendering.models.block.state.baked.BakingUtil.com
import de.bixilon.minosoft.gui.rendering.models.block.state.baked.BakingUtil.compactProperties
import de.bixilon.minosoft.gui.rendering.models.block.state.baked.cull.side.FaceProperties
import de.bixilon.minosoft.gui.rendering.models.block.state.render.BlockRender
import de.bixilon.minosoft.gui.rendering.models.raw.display.DisplayPositions
import de.bixilon.minosoft.gui.rendering.models.raw.display.ModelDisplay
import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureManager
import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.Texture
@ -62,11 +64,11 @@ class BuilderApply(
val faces: Array<MutableList<BakedFace>> = Array(Directions.SIZE) { mutableListOf() }
val properties: Array<MutableList<FaceProperties>> = Array(Directions.SIZE) { mutableListOf() }
var particle: Texture? = null
var display: Map<DisplayPositions, ModelDisplay>? = null
for (model in this) {
if (particle == null) {
particle = model.particle
}
if (particle == null) particle = model.particle
if (display == null) display = model.display
for (direction in Directions) {
faces[direction.ordinal] += model.faces[direction.ordinal]
@ -74,6 +76,6 @@ class BuilderApply(
}
}
return BakedModel(faces.compact(), properties.compactProperties(), particle)
return BakedModel(faces.compact(), properties.compactProperties(), display, particle)
}
}