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

rendering: add support for rotated textures

Browse Source
This commit is contained in:
Lukas 2021-02-21 21:53:58 +01:00
parent 7ae169919a
commit 4d987cb0d0
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/de/bixilon/minosoft/gui/rendering/chunk/models/loading/BlockModelFace.kt
View File

@ -17,12 +17,12 @@ import com.google.gson.JsonObject
import de.bixilon.minosoft.data.Directions import de.bixilon.minosoft.data.Directions
import glm_.vec2.Vec2 import glm_.vec2.Vec2
import glm_.vec3.Vec3 import glm_.vec3.Vec3
import java.util.*
class BlockModelFace(data: JsonObject, from: Vec3, to: Vec3, direction: Directions) { class BlockModelFace(data: JsonObject, from: Vec3, to: Vec3, direction: Directions) {
val textureName: String = data.get("texture").asString.removePrefix("#") val textureName: String = data.get("texture").asString.removePrefix("#")
val cullFace: Directions? val cullFace: Directions?
private var positions: MutableList<Vec2>
private var positions: Array<Vec2>
init { init {
var textureStart = Vec2(0, 0) var textureStart = Vec2(0, 0)
@ -45,13 +45,6 @@ class BlockModelFace(data: JsonObject, from: Vec3, to: Vec3, direction: Directio
textureStart = Vec2(it[0].asFloat, it[1].asFloat) textureStart = Vec2(it[0].asFloat, it[1].asFloat)
textureEnd = Vec2(it[2].asFloat, it[3].asFloat) textureEnd = Vec2(it[2].asFloat, it[3].asFloat)
} }
positions = arrayOf(
uvToFloat(Vec2(textureStart.x, textureStart.y)),
uvToFloat(Vec2(textureStart.x, textureEnd.y)),
uvToFloat(Vec2(textureEnd.x, textureEnd.y)),
uvToFloat(Vec2(textureEnd.x, textureStart.y)),
)
cullFace = data["cullface"]?.asString?.let { cullFace = data["cullface"]?.asString?.let {
return@let if (it == "bottom") { return@let if (it == "bottom") {
Directions.DOWN Directions.DOWN
@ -59,12 +52,14 @@ class BlockModelFace(data: JsonObject, from: Vec3, to: Vec3, direction: Directio
Directions.valueOf(it.toUpperCase()) Directions.valueOf(it.toUpperCase())
} }
} }
positions = arrayOf( positions = mutableListOf(
Vec2(uvToFloat(textureStart.x), uvToFloat(textureStart.y)), Vec2(uvToFloat(textureStart.x), uvToFloat(textureStart.y)),
Vec2(uvToFloat(textureStart.x), uvToFloat(textureEnd.y)), Vec2(uvToFloat(textureStart.x), uvToFloat(textureEnd.y)),
Vec2(uvToFloat(textureEnd.x), uvToFloat(textureEnd.y)), Vec2(uvToFloat(textureEnd.x), uvToFloat(textureEnd.y)),
Vec2(uvToFloat(textureEnd.x), uvToFloat(textureStart.y)), Vec2(uvToFloat(textureEnd.x), uvToFloat(textureStart.y)),
) )
val rotation = data["rotation"]?.asInt?.div(90) ?: 0
Collections.rotate(positions, rotation)
} }
fun getTexturePositionArray(direction: Directions): Array<Vec2?> { fun getTexturePositionArray(direction: Directions): Array<Vec2?> {