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

rendering: improve uvlock behaviour

Browse Source
This commit is contained in:
Lukas 2021-04-15 15:17:04 +02:00
parent e564fa2746
commit c8a56cbb78
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/bixilon/minosoft/data/Axes.kt
View File

@ -13,6 +13,7 @@
package de.bixilon.minosoft.data package de.bixilon.minosoft.data
import glm_.vec3.Vec3 import glm_.vec3.Vec3
import glm_.vec3.Vec3i
enum class Axes { enum class Axes {
X, X,
@ -32,6 +33,10 @@ enum class Axes {
return choose(axis, vec3.x, vec3.y, vec3.z) return choose(axis, vec3.x, vec3.y, vec3.z)
} }
fun choose(axis: Axes, vec3i: Vec3i): Int {
return choose(axis, Vec3(vec3i)).toInt()
}
private fun choose(axis: Axes, x: Float, y: Float, z: Float): Float { private fun choose(axis: Axes, x: Float, y: Float, z: Float): Float {
return when (axis) { return when (axis) {
X -> x X -> x

9
src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/renderable/ElementRenderer.kt
View File

@ -58,12 +58,9 @@ class ElementRenderer(
} }
if (uvLock) { if (uvLock) {
for (direction in Directions.DIRECTIONS) { for (direction in Directions.DIRECTIONS) {
val angle = when (Axes.byDirection(direction)) { val axis = Axes.byDirection(direction)
Axes.X -> rotation.x val angle = Axes.choose(axis, rotation) * Axes.choose(axis, direction.directionVector)
Axes.Y -> rotation.y faces[direction]?.rotate(-angle)
Axes.Z -> rotation.z
}
faces[direction]?.rotate(angle)
} }
} }
} }