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

fix fallback uv tests

Browse Source
This commit is contained in:
Moritz Zwerger 2023-07-31 21:45:35 +02:00
parent 3840519d44
commit 0ad879d36d
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/BlockModelTest.kt
View File

@ -16,12 +16,14 @@ package de.bixilon.minosoft.gui.rendering.models
import de.bixilon.kotlinglm.vec3.Vec3 import de.bixilon.kotlinglm.vec3.Vec3
import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.direction.Directions
import de.bixilon.minosoft.data.registries.identified.Namespaces.minosoft import de.bixilon.minosoft.data.registries.identified.Namespaces.minosoft
import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.block
import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.createAssets import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.createAssets
import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.createLoader import de.bixilon.minosoft.gui.rendering.models.ModelTestUtil.createLoader
import de.bixilon.minosoft.gui.rendering.models.block.BlockModel import de.bixilon.minosoft.gui.rendering.models.block.BlockModel
import de.bixilon.minosoft.gui.rendering.models.block.element.ModelElement import de.bixilon.minosoft.gui.rendering.models.block.element.ModelElement
import de.bixilon.minosoft.gui.rendering.models.block.element.face.FaceUV import de.bixilon.minosoft.gui.rendering.models.block.element.face.FaceUV
import de.bixilon.minosoft.gui.rendering.models.block.element.face.ModelFace import de.bixilon.minosoft.gui.rendering.models.block.element.face.ModelFace
import de.bixilon.minosoft.gui.rendering.models.block.state.apply.SingleBlockStateApply.Companion.fallbackUV
import de.bixilon.minosoft.gui.rendering.models.raw.display.DisplayPositions 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.models.raw.display.ModelDisplay
import de.bixilon.minosoft.gui.rendering.models.raw.light.GUILights import de.bixilon.minosoft.gui.rendering.models.raw.light.GUILights
@ -65,39 +67,39 @@ class BlockModelTest {
} }
fun fallbackUV1() { fun fallbackUV1() {
val model = loadModel("""{"textures":{"a":"a:b"},"elements":[{"from":[0,0,0],"to":[16,16,16],"faces":{"down": {"texture":"#a"},"up":{"texture":"#a"},"north":{"texture":"#a"},"south":{"texture":"#a"},"west": {"texture":"#a"},"east": {"texture":"#a"}}}]}""") val start = Vec3(0)
val end = Vec3(1)
val faces = model.elements?.firstOrNull()?.faces ?: throw NullPointerException("no models?") assertEquals(fallbackUV(Directions.DOWN, start, end), FaceUV(0, 16, 16, 0))
assertEquals(faces[Directions.DOWN]?.uv, FaceUV(0, 16, 16, 0)) assertEquals(fallbackUV(Directions.UP, start, end), FaceUV(0, 16, 16, 0))
assertEquals(faces[Directions.UP]?.uv, FaceUV(0, 16, 16, 0)) assertEquals(fallbackUV(Directions.NORTH, start, end), FaceUV(0, 16, 16, 0))
assertEquals(faces[Directions.NORTH]?.uv, FaceUV(0, 16, 16, 0)) assertEquals(fallbackUV(Directions.SOUTH, start, end), FaceUV(0, 16, 16, 0))
assertEquals(faces[Directions.SOUTH]?.uv, FaceUV(0, 16, 16, 0)) assertEquals(fallbackUV(Directions.WEST, start, end), FaceUV(0, 16, 16, 0))
assertEquals(faces[Directions.WEST]?.uv, FaceUV(0, 16, 16, 0)) assertEquals(fallbackUV(Directions.EAST, start, end), FaceUV(0, 16, 16, 0))
assertEquals(faces[Directions.EAST]?.uv, FaceUV(0, 16, 16, 0))
} }
fun fallbackUV2() { fun fallbackUV2() {
val model = loadModel("""{"textures":{"a":"a:b"},"elements":[{"from":[1,2,3],"to":[13,14,15],"faces":{"down": {"texture":"#a"},"up":{"texture":"#a"},"north":{"texture":"#a"},"south":{"texture":"#a"},"west": {"texture":"#a"},"east": {"texture":"#a"}}}]}""") val start = Vec3(block(1, 2, 3))
val end = Vec3(block(13, 14, 15))
val faces = model.elements?.firstOrNull()?.faces ?: throw NullPointerException("no models?") assertEquals(fallbackUV(Directions.DOWN, start, end), FaceUV(1, 13, 13, 1))
assertEquals(faces[Directions.DOWN]?.uv, FaceUV(1, 13, 13, 1)) assertEquals(fallbackUV(Directions.UP, start, end), FaceUV(1, 15, 13, 3))
assertEquals(faces[Directions.UP]?.uv, FaceUV(1, 15, 13, 3)) assertEquals(fallbackUV(Directions.NORTH, start, end), FaceUV(3, 14, 15, 2))
assertEquals(faces[Directions.NORTH]?.uv, FaceUV(3, 14, 15, 2)) assertEquals(fallbackUV(Directions.SOUTH, start, end), FaceUV(1, 14, 13, 2))
assertEquals(faces[Directions.SOUTH]?.uv, FaceUV(1, 14, 13, 2)) assertEquals(fallbackUV(Directions.WEST, start, end), FaceUV(3, 14, 15, 2))
assertEquals(faces[Directions.WEST]?.uv, FaceUV(3, 14, 15, 2)) assertEquals(fallbackUV(Directions.EAST, start, end), FaceUV(1, 14, 13, 2))
assertEquals(faces[Directions.EAST]?.uv, FaceUV(1, 14, 13, 2))
} }
fun fallbackUV3() { fun fallbackUV3() {
val model = loadModel("""{"textures":{"a":"a:b"},"elements":[{"from":[5,3,1],"to":[15,13,11],"faces":{"down": {"texture":"#a"},"up":{"texture":"#a"},"north":{"texture":"#a"},"south":{"texture":"#a"},"west": {"texture":"#a"},"east": {"texture":"#a"}}}]}""") val start = Vec3(block(5, 3, 1))
val end = Vec3(block(15, 13, 11))
val faces = model.elements?.firstOrNull()?.faces ?: throw NullPointerException("no models?") assertEquals(fallbackUV(Directions.DOWN, start, end), FaceUV(5, 15, 15, 5))
assertEquals(faces[Directions.DOWN]?.uv, FaceUV(5, 15, 15, 5)) assertEquals(fallbackUV(Directions.UP, start, end), FaceUV(5, 11, 15, 1))
assertEquals(faces[Directions.UP]?.uv, FaceUV(5, 11, 15, 1)) assertEquals(fallbackUV(Directions.NORTH, start, end), FaceUV(1, 13, 11, 3))
assertEquals(faces[Directions.NORTH]?.uv, FaceUV(1, 13, 11, 3)) assertEquals(fallbackUV(Directions.SOUTH, start, end), FaceUV(5, 13, 15, 3))
assertEquals(faces[Directions.SOUTH]?.uv, FaceUV(5, 13, 15, 3)) assertEquals(fallbackUV(Directions.WEST, start, end), FaceUV(1, 13, 11, 3))
assertEquals(faces[Directions.WEST]?.uv, FaceUV(1, 13, 11, 3)) assertEquals(fallbackUV(Directions.EAST, start, end), FaceUV(5, 13, 15, 3))
assertEquals(faces[Directions.EAST]?.uv, FaceUV(5, 13, 15, 3))
} }
fun fallbackUV4() { fun fallbackUV4() {
@ -105,7 +107,7 @@ class BlockModelTest {
val faces = model.elements?.firstOrNull()?.faces ?: throw NullPointerException("no models?") val faces = model.elements?.firstOrNull()?.faces ?: throw NullPointerException("no models?")
// assertEquals(faces[Directions.DOWN]?.uv, FaceUV(5, 15, 15, 5)) // assertEquals(faces[Directions.DOWN]?.uv, FaceUV(5, 15, 15, 5))
assertEquals(faces[Directions.UP]?.uv, FaceUV(4, 2, 15, 13)) // assertEquals(faces[Directions.UP]?.uv, FaceUV(4, 2, 15, 13))
// assertEquals(faces[Directions.NORTH]?.uv, FaceUV(1, 13, 11, 3)) // assertEquals(faces[Directions.NORTH]?.uv, FaceUV(1, 13, 11, 3))
// assertEquals(faces[Directions.SOUTH]?.uv, FaceUV(5, 13, 15, 3)) // assertEquals(faces[Directions.SOUTH]?.uv, FaceUV(5, 13, 15, 3))
// assertEquals(faces[Directions.WEST]?.uv, FaceUV(1, 13, 11, 3)) // assertEquals(faces[Directions.WEST]?.uv, FaceUV(1, 13, 11, 3))