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

fix uvlock rotating

Browse Source 
Somehow the tests fail. Interesting.
This commit is contained in:
Moritz Zwerger 2023-07-31 22:54:44 +02:00
parent 7a1133200e
commit 3fbc54acc8
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/UVLockTest.kt
View File

@ -116,6 +116,26 @@ class UVLockTest {
baked.assertFace(Directions.UP, positions(Directions.UP, from, Vec3(0.5f, 1.0f, 1.0f)), block(0, 0, 8, 0, 8, 16, 0, 16), 1.0f) baked.assertFace(Directions.UP, positions(Directions.UP, from, Vec3(0.5f, 1.0f, 1.0f)), block(0, 0, 8, 0, 8, 16, 0, 16), 1.0f)
} }
fun `stairs top y=90`() {
val from = Vec3(0.5f, 0.5f, 0.0f)
val to = Vec3(1.0f, 1.0f, 1.0f)
val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.UP to ModelFace("#test", FaceUV(0, 0, 8, 16), 0, -1)))), textures = mapOf("test" to minecraft("block/test").texture())), uvLock = true, y = 1)
val baked = model.bake(createTextureManager("block/test"))!!
baked.assertFace(Directions.UP, positions(Directions.UP, Vec3(0, 0.5, 0.5), Vec3(1, 1, 1.0f)), block(0, 0, 16, 0, 16, 8, 0, 8), 1.0f)
}
fun `stairs top y=180`() {
val from = Vec3(0.5f, 0.5f, 0.0f)
val to = Vec3(1.0f, 1.0f, 1.0f)
val model = SingleBlockStateApply(BlockModel(elements = listOf(ModelElement(from, to, faces = mapOf(Directions.UP to ModelFace("#test", FaceUV(0, 0, 8, 16), 0, -1)))), textures = mapOf("test" to minecraft("block/test").texture())), uvLock = true, y = 2)
val baked = model.bake(createTextureManager("block/test"))!!
baked.assertFace(Directions.UP, positions(Directions.UP, Vec3(0, 0.5, 0.0), Vec3(0.5f, 1, 1.0f)), block(8, 0, 16, 0, 16, 16, 9, 16), 1.0f)
}
fun `stairs top y=270`() { fun `stairs top y=270`() {
val from = Vec3(0.5f, 0.5f, 0.0f) val from = Vec3(0.5f, 0.5f, 0.0f)
val to = Vec3(1.0f, 1.0f, 1.0f) val to = Vec3(1.0f, 1.0f, 1.0f)
@ -135,4 +155,6 @@ class UVLockTest {
baked.assertFace(Directions.UP, positions(Directions.UP, Vec3(0, 0.5, 0), Vec3(1, 1, 0.5f)), block(0, 8, 16, 8, 16, 16, 0, 16), 1.0f) baked.assertFace(Directions.UP, positions(Directions.UP, Vec3(0, 0.5, 0), Vec3(1, 1, 0.5f)), block(0, 8, 16, 8, 16, 16, 0, 16), 1.0f)
} }
// TODO: test rotation around x axis and combinations
} }

25
src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/apply/SingleBlockStateApply.kt
View File

@ -148,6 +148,12 @@ data class SingleBlockStateApply(
return rotatedX(direction, direction.rotateX(x)) + rotatedY(direction.rotateX(x), rotated) return rotatedX(direction, direction.rotateX(x)) + rotatedY(direction.rotateX(x), rotated)
} }
private fun FaceUV.rotateLeft(): FaceUV {
// return FaceUV(Vec2(start.y, -(start.x - 0.5f) + 0.5f), Vec2(end.y, -(end.x - 0.5f) + 0.5f)) // TODO: tests correct, but result wrong?
return FaceUV(Vec2(end.y, -(start.x - 0.5f) + 0.5f), Vec2(start.y, -(end.x - 0.5f) + 0.5f))
}
override fun bake(): BakedModel? { override fun bake(): BakedModel? {
if (model.elements == null) return null if (model.elements == null) return null
@ -168,7 +174,24 @@ data class SingleBlockStateApply(
.rotateY(direction.rotateX(this.x)) .rotateY(direction.rotateX(this.x))
val abc = face.uv ?: if (uvLock) fallbackUV(rotatedDirection, positions.start(), positions.end()) else fallbackUV(direction, element.from, element.to) var abc = face.uv ?: if (uvLock) fallbackUV(rotatedDirection, positions.start(), positions.end()) else fallbackUV(direction, element.from, element.to)
if (uvLock && face.uv != null) {
if (direction.axis == Axes.Y) {
if (y == 1) {
abc = abc.rotateLeft()
abc = abc.rotateLeft()
abc = abc.rotateLeft()
}
if (y == 2) {
abc = abc.rotateLeft()
abc = abc.rotateLeft()
}
if (y == 3) {
abc = abc.rotateLeft()
}
}
}
var uv = abc.toArray(rotatedDirection, face.rotation) var uv = abc.toArray(rotatedDirection, face.rotation)