From 104de119dcb070eb061cfd186fb17da9314c9a80 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Sun, 30 Jul 2023 22:07:18 +0200 Subject: [PATCH] tests: replace all uv coordinates with color codes Context: I created a colored debug texture that has every color in the corner. I am creating the model in minecraft, reading all sides and then writing the test from that data --- .../models/baked/FaceRotationTest.kt | 30 +++--- .../models/baked/FullCubeBakeTest.kt | 101 ++++++++++-------- .../gui/rendering/models/baked/UVLockTest.kt | 25 ++--- 3 files changed, 89 insertions(+), 67 deletions(-) diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FaceRotationTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FaceRotationTest.kt index 38c90ec44..51387064a 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FaceRotationTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FaceRotationTest.kt @@ -17,6 +17,10 @@ import de.bixilon.kotlinglm.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bake +import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bgyr +import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.gyrb +import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.rbgy +import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.yrbg import de.bixilon.minosoft.gui.rendering.models.baked.BakedModelTestUtil.assertFace import de.bixilon.minosoft.gui.rendering.models.baked.BakedModelTestUtil.createFaces import de.bixilon.minosoft.gui.rendering.models.baked.BakedModelTestUtil.createTextureManager @@ -39,12 +43,12 @@ class FaceRotationTest { // we can use positions() here, because it is not rotated and already unit tested - baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.5f) - baked.assertFace(Directions.UP, positions(Directions.UP, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 1.0f) - baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f), 0.8f) - baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.8f) - baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.6f) - baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f), 0.6f) + baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), gyrb, 0.5f) + baked.assertFace(Directions.UP, positions(Directions.UP, from, to), yrbg, 1.0f) + baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), bgyr, 0.8f) + baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), gyrb, 0.8f) + baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), gyrb, 0.6f) + baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), bgyr, 0.6f) } fun rotation1Y90() { @@ -56,12 +60,12 @@ class FaceRotationTest { // we can use positions() here, because it is not rotated and already unit tested - baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.5f) - baked.assertFace(Directions.UP, positions(Directions.UP, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 1.0f) - baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f), 0.8f) - baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.8f) - baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.6f) - baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f), 0.6f) + baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), yrbg, 0.5f) + baked.assertFace(Directions.UP, positions(Directions.UP, from, to), gyrb, 1.0f) + baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), bgyr, 0.8f) + baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), gyrb, 0.8f) + baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), gyrb, 0.6f) + baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), bgyr, 0.6f) } fun rotation3() { @@ -73,7 +77,7 @@ class FaceRotationTest { // we can use positions() here, because it is not rotated and already unit tested - baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f), 0.5f) + baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), rbgy, 0.5f) // TODO: other faces } } diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FullCubeBakeTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FullCubeBakeTest.kt index 585c3c847..426d88d5e 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FullCubeBakeTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/FullCubeBakeTest.kt @@ -17,6 +17,7 @@ import de.bixilon.kotlinglm.vec3.Vec3 import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bake +import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bgyr import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.gyrb import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.rbgy import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.yrbg @@ -58,12 +59,12 @@ class FullCubeBakeTest { // rotating 90° -> only top/bottom texture rotated, rest is the same - baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f), 0.5f) - baked.assertFace(Directions.UP, positions(Directions.UP, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 1.0f) - baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.8f) - baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.8f) - baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.6f) - baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.6f) + baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), rbgy, 0.5f) + baked.assertFace(Directions.UP, positions(Directions.UP, from, to), yrbg, 1.0f) + baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), gyrb, 0.8f) + baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), yrbg, 0.8f) + baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), yrbg, 0.6f) + baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), gyrb, 0.6f) } fun y180() { @@ -75,12 +76,12 @@ class FullCubeBakeTest { // rotating 180° -> only top/bottom texture rotated, rest is the same - baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f), 0.5f) - baked.assertFace(Directions.UP, positions(Directions.UP, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 1.0f) - baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.8f) - baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.8f) - baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.6f) - baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.6f) + baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), bgyr, 0.5f) + baked.assertFace(Directions.UP, positions(Directions.UP, from, to), gyrb, 1.0f) + baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), gyrb, 0.8f) + baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), yrbg, 0.8f) + baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), yrbg, 0.6f) + baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), gyrb, 0.6f) } fun y270() { @@ -92,12 +93,12 @@ class FullCubeBakeTest { // rotating 270° -> only top/bottom texture rotated, rest is the same - baked.assertFace(Directions.DOWN, uv = floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f)) - baked.assertFace(Directions.UP, uv = floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f)) - baked.assertFace(Directions.NORTH, uv = floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f)) - baked.assertFace(Directions.SOUTH, uv = floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f)) - baked.assertFace(Directions.WEST, uv = floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f)) - baked.assertFace(Directions.EAST, uv = floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f)) + baked.assertFace(Directions.DOWN, uv = gyrb) + baked.assertFace(Directions.UP, uv = bgyr) + baked.assertFace(Directions.NORTH, uv = gyrb) + baked.assertFace(Directions.SOUTH, uv = yrbg) + baked.assertFace(Directions.WEST, uv = yrbg) + baked.assertFace(Directions.EAST, uv = gyrb) } fun x90() { @@ -108,12 +109,12 @@ class FullCubeBakeTest { val baked = model.bake(createTextureManager("block/test"))!! - baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f), 0.5f) - baked.assertFace(Directions.UP, positions(Directions.UP, from, to), floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f), 1.0f) - baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f), 0.8f) - baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.8f) - baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f), 0.6f) - baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f), 0.6f) + baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), bgyr, 0.5f) + baked.assertFace(Directions.UP, positions(Directions.UP, from, to), rbgy, 1.0f) + baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), rbgy, 0.8f) + baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), yrbg, 0.8f) + baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), rbgy, 0.6f) + baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), bgyr, 0.6f) } fun x180() { @@ -124,12 +125,12 @@ class FullCubeBakeTest { val baked = model.bake(createTextureManager("block/test"))!! - baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.5f) - baked.assertFace(Directions.UP, positions(Directions.UP, from, to), floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f), 1.0f) - baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f), 0.8f) - baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f), 0.8f) - baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f), 0.6f) - baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f), 0.6f) + baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), yrbg, 0.5f) + baked.assertFace(Directions.UP, positions(Directions.UP, from, to), rbgy, 1.0f) + baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), rbgy, 0.8f) + baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), bgyr, 0.8f) + baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), bgyr, 0.6f) + baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), rbgy, 0.6f) } fun x270() { @@ -140,12 +141,12 @@ class FullCubeBakeTest { val baked = model.bake(createTextureManager("block/test"))!! - baked.assertFace(Directions.DOWN, uv = floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f)) - baked.assertFace(Directions.UP, uv = floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f)) - baked.assertFace(Directions.NORTH, uv = floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f)) - baked.assertFace(Directions.SOUTH, uv = floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f)) - baked.assertFace(Directions.WEST, uv = floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f)) - baked.assertFace(Directions.EAST, uv = floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f)) + baked.assertFace(Directions.DOWN, uv = yrbg) + baked.assertFace(Directions.UP, uv = gyrb) + baked.assertFace(Directions.NORTH, uv = rbgy) + baked.assertFace(Directions.SOUTH, uv = yrbg) + baked.assertFace(Directions.WEST, uv = gyrb) + baked.assertFace(Directions.EAST, uv = yrbg) } fun x90y90() { @@ -164,6 +165,22 @@ class FullCubeBakeTest { baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), rbgy, 0.6f) } + fun x90y180() { + val from = Vec3(0.0f) + val to = Vec3(1.0f) + val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = createFaces())), textures = mapOf("test" to minecraft("block/test").texture())), x = 1, y = 180) + + val baked = model.bake(createTextureManager("block/test"))!! + + + baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), yrbg, 0.5f) + baked.assertFace(Directions.UP, positions(Directions.UP, from, to), gyrb, 1.0f) + baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), gyrb, 0.8f) + baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), bgyr, 0.8f) + baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), gyrb, 0.6f) + baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), yrbg, 0.6f) + } + fun x180y180() { val from = Vec3(0.0f) val to = Vec3(1.0f) @@ -172,11 +189,11 @@ class FullCubeBakeTest { val baked = model.bake(createTextureManager("block/test"))!! - baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f), 0.5f) - baked.assertFace(Directions.UP, positions(Directions.UP, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 1.0f) - baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f), 0.8f) - baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f), 0.8f) - baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), floatArrayOf(1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f), 0.6f) - baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f), 0.6f) + baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), bgyr, 0.5f) + baked.assertFace(Directions.UP, positions(Directions.UP, from, to), gyrb, 1.0f) + baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), rbgy, 0.8f) + baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), bgyr, 0.8f) + baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), bgyr, 0.6f) + baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), rbgy, 0.6f) } } diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/UVLockTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/UVLockTest.kt index 15aedbf3e..99a18565f 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/UVLockTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/UVLockTest.kt @@ -19,6 +19,7 @@ import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bake import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.bgyr import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.gyrb +import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.rbgy import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.yrbg import de.bixilon.minosoft.gui.rendering.models.baked.BakedModelTestUtil.assertFace import de.bixilon.minosoft.gui.rendering.models.baked.BakedModelTestUtil.createFaces @@ -40,12 +41,12 @@ class UVLockTest { val baked = model.bake(createTextureManager("block/test"))!! - baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.5f) - baked.assertFace(Directions.UP, positions(Directions.UP, from, to), floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f), 1.0f) - baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.8f) - baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.8f) - baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.6f) - baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.6f) + baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), yrbg, 0.5f) + baked.assertFace(Directions.UP, positions(Directions.UP, from, to), rbgy, 1.0f) + baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), gyrb, 0.8f) + baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), yrbg, 0.8f) + baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), yrbg, 0.6f) + baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), gyrb, 0.6f) } fun y90Rotation1() { @@ -70,11 +71,11 @@ class UVLockTest { val baked = model.bake(createTextureManager("block/test"))!! - baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.5f) - baked.assertFace(Directions.UP, positions(Directions.UP, from, to), floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f), 1.0f) - baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.8f) - baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.8f) - baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), floatArrayOf(0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f), 0.6f) - baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), floatArrayOf(1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f), 0.6f) + baked.assertFace(Directions.DOWN, positions(Directions.DOWN, from, to), yrbg, 0.5f) + baked.assertFace(Directions.UP, positions(Directions.UP, from, to), rbgy, 1.0f) + baked.assertFace(Directions.NORTH, positions(Directions.NORTH, from, to), gyrb, 0.8f) + baked.assertFace(Directions.SOUTH, positions(Directions.SOUTH, from, to), yrbg, 0.8f) + baked.assertFace(Directions.WEST, positions(Directions.WEST, from, to), yrbg, 0.6f) + baked.assertFace(Directions.EAST, positions(Directions.EAST, from, to), gyrb, 0.6f) } }