From fac99f945a0cf7644095455c0288f85ce9e2bb99 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Sat, 6 May 2023 11:22:55 +0200 Subject: [PATCH] fix baking util test --- .../models/block/state/apply/SingleBlockStateApply.kt | 3 +-- .../gui/rendering/models/block/state/baked/BakingUtilTest.kt | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/apply/SingleBlockStateApply.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/apply/SingleBlockStateApply.kt index 7c0f3089c..ea3ad0a87 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/apply/SingleBlockStateApply.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/apply/SingleBlockStateApply.kt @@ -30,7 +30,6 @@ import de.bixilon.minosoft.gui.rendering.models.block.state.baked.SideSize import de.bixilon.minosoft.gui.rendering.models.loader.BlockLoader import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureManager import de.bixilon.minosoft.util.KUtil.toResourceLocation -import java.util.* data class SingleBlockStateApply( val model: BlockModel, @@ -112,7 +111,7 @@ data class SingleBlockStateApply( if (model.elements == null) return null val bakedFaces: Array> = Array(Directions.SIZE) { mutableListOf() } - val sizes: MutableMap> = EnumMap(Directions::class.java) + val sizes: Array> = Array(Directions.SIZE) { mutableListOf() } // TODO for (element in model.elements) { for ((direction, face) in element.faces) { diff --git a/src/test/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakingUtilTest.kt b/src/test/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakingUtilTest.kt index 2e4a28d6f..fe9d176d7 100644 --- a/src/test/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakingUtilTest.kt +++ b/src/test/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakingUtilTest.kt @@ -28,7 +28,7 @@ class BakingUtilTest { fun positionsDown() { assertContentEquals( BakingUtil.positions(Directions.DOWN, from, to), - floatArrayOf(1.0f, 2.0f, 3.0f, 6.0f, 2.0f, 3.0f, 6.0f, 2.0f, 4.0f, 1.0f, 2.0f, 4.0f) + floatArrayOf(1.0f, 2.0f, 3.0f, 1.0f, 2.0f, 4.0f, 6.0f, 2.0f, 4.0f, 6.0f, 2.0f, 3.0f) ) } @@ -36,7 +36,7 @@ class BakingUtilTest { fun positionsUp() { assertContentEquals( BakingUtil.positions(Directions.UP, from, to), - floatArrayOf(1.0f, 5.0f, 3.0f, 1.0f, 5.0f, 4.0f, 6.0f, 5.0f, 4.0f, 6.0f, 5.0f, 3.0f) + floatArrayOf(1.0f, 5.0f, 3.0f, 6.0f, 5.0f, 3.0f, 6.0f, 5.0f, 4.0f, 1.0f, 5.0f, 4.0f) ) }