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

improve texture rotation code

Browse Source
This commit is contained in:
Moritz Zwerger 2023-07-31 18:02:29 +02:00
parent 74562a8fe9
commit 0820d076c9
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,30 @@ data class SingleBlockStateApply(
} }
} }
private fun getTextureRotation(direction: Directions): Int {
if (x == 0 && y == 0) return 0
if (x == 0 && direction.axis == Axes.Y) {
return if (direction.negative) -y else y
}
if (y == 0) {
if (direction.axis == Axes.X) {
return if (direction.negative) x else -x
}
}
// if (direction.axis == Axes.X) uv = uv.pushRight(2, if (rotatedDirection.negative) -x else x)
//
// if ((rotatedDirection == Directions.DOWN && x == 1 || rotatedDirection == Directions.UP && x == 3 || rotatedDirection == Directions.NORTH || rotatedDirection == Directions.SOUTH && x == 2)) {
// uv = uv.pushRight(2, 2)
// }
// if (direction.axis == Axes.Y && y != 0 && !uvLock) {
// uv = uv.pushRight(2, if (rotatedDirection.negative) -y else y)
// }
return 0
}
override fun bake(): BakedModel? { override fun bake(): BakedModel? {
if (model.elements == null) return null if (model.elements == null) return null
@ -143,23 +167,17 @@ data class SingleBlockStateApply(
var uv = face.uv.toArray(rotatedDirection, face.rotation) var uv = face.uv.toArray(rotatedDirection, face.rotation)
if (x > 0 && !uvLock) { if (!uvLock) {
if (direction.axis == Axes.X) uv = uv.pushRight(2, if (rotatedDirection.negative) -x else x) val rotation = getTextureRotation(direction)
uv = uv.pushRight(2, rotation)
if ((rotatedDirection == Directions.DOWN && x == 1 || rotatedDirection == Directions.UP && x == 3 || rotatedDirection == Directions.NORTH || rotatedDirection == Directions.SOUTH && x == 2)) {
uv = uv.pushRight(2, 2)
}
}
if (direction.axis == Axes.Y && y != 0 && !uvLock) {
uv = uv.pushRight(2, if (rotatedDirection.negative) -y else y)
} }
val shade = rotatedDirection.shade val shade = rotatedDirection.shade
val a = positions.properties(rotatedDirection, texture) // TODO: texture might not have been loaded yet val faceProperties = positions.properties(rotatedDirection, texture)
val bakedFace = BakedFace(positions, uv, shade, face.tintIndex, if (a == null) null else rotatedDirection, texture, a) val bakedFace = BakedFace(positions, uv, shade, face.tintIndex, if (faceProperties == null) null else rotatedDirection, texture, faceProperties)
bakedFaces[rotatedDirection.ordinal] += bakedFace bakedFaces[rotatedDirection.ordinal] += bakedFace
properties[rotatedDirection.ordinal] += a ?: continue properties[rotatedDirection.ordinal] += faceProperties ?: continue
} }
} }