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

remove cull face

Browse Source 
Determinant by minosoft now. maybe transparency breaks
This commit is contained in:
Moritz Zwerger 2023-07-30 18:43:48 +02:00
parent d21dd70abe
commit dc00c01bf9
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,12 +150,12 @@ class BlockModelTest {
from = Vec3(0, 0, 0), from = Vec3(0, 0, 0),
to = Vec3(1, 1, 1), to = Vec3(1, 1, 1),
faces = mapOf( faces = mapOf(
Directions.DOWN to ModelFace("#down", FaceUV(Vec2(0, 1), Vec2(1, 0)), 0, Directions.DOWN, -1), Directions.DOWN to ModelFace("#down", FaceUV(Vec2(0, 1), Vec2(1, 0)), 0, -1),
Directions.UP to ModelFace("#up", FaceUV(Vec2(0, 1), Vec2(1, 0)), 0, Directions.UP, -1), Directions.UP to ModelFace("#up", FaceUV(Vec2(0, 1), Vec2(1, 0)), 0, -1),
Directions.NORTH to ModelFace("#north", FaceUV(Vec2(0, 1), Vec2(1, 0)), 0, Directions.NORTH, -1), Directions.NORTH to ModelFace("#north", FaceUV(Vec2(0, 1), Vec2(1, 0)), 0, -1),
Directions.SOUTH to ModelFace("#south", FaceUV(Vec2(0, 1), Vec2(1, 0)), 0, Directions.SOUTH, -1), Directions.SOUTH to ModelFace("#south", FaceUV(Vec2(0, 1), Vec2(1, 0)), 0, -1),
Directions.WEST to ModelFace("#west", FaceUV(Vec2(0, 1), Vec2(1, 0)), 0, Directions.WEST, -1), Directions.WEST to ModelFace("#west", FaceUV(Vec2(0, 1), Vec2(1, 0)), 0, -1),
Directions.EAST to ModelFace("#east", FaceUV(Vec2(0, 1), Vec2(1, 0)), 0, Directions.EAST, -1), Directions.EAST to ModelFace("#east", FaceUV(Vec2(0, 1), Vec2(1, 0)), 0, -1),
), ),
shade = true, shade = true,
rotation = null, rotation = null,

4
src/main/java/de/bixilon/minosoft/gui/rendering/models/block/element/face/ModelFace.kt
View File

@ -36,7 +36,6 @@ data class ModelFace(
val texture: String, val texture: String,
val uv: FaceUV, val uv: FaceUV,
val rotation: Int, val rotation: Int,
val cull: Directions?,
val tintIndex: Int = -1, val tintIndex: Int = -1,
) { ) {
@ -79,10 +78,9 @@ data class ModelFace(
} ?: fallbackUV(direction, from, to) } ?: fallbackUV(direction, from, to)
val rotation = data["rotation"]?.toInt()?.rotation() ?: 0 val rotation = data["rotation"]?.toInt()?.rotation() ?: 0
val cull = data["cullface"]?.toString()?.let { if (it == "none") null else Directions[it] }
val tintIndex = data["tintindex"]?.toInt() ?: TintManager.DEFAULT_TINT_INDEX val tintIndex = data["tintindex"]?.toInt() ?: TintManager.DEFAULT_TINT_INDEX
return ModelFace(texture, uv, rotation, cull, tintIndex) return ModelFace(texture, uv, rotation, tintIndex)
} }
fun deserialize(from: Vec3, to: Vec3, data: Map<String, JsonObject>): Map<Directions, ModelFace>? { fun deserialize(from: Vec3, to: Vec3, data: Map<String, JsonObject>): Map<Directions, ModelFace>? {

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

@ -146,7 +146,7 @@ data class SingleBlockStateApply(
val shade = rotatedDirection.shade val shade = rotatedDirection.shade
val a = positions.properties(rotatedDirection) val a = positions.properties(rotatedDirection)
val bakedFace = BakedFace(positions, uv, shade, face.tintIndex, face.cull, texture, a) val bakedFace = BakedFace(positions, uv, shade, face.tintIndex, if (a == null) null else rotatedDirection, texture, a)
bakedFaces[rotatedDirection.ordinal] += bakedFace bakedFaces[rotatedDirection.ordinal] += bakedFace
properties[rotatedDirection.ordinal] += a ?: continue properties[rotatedDirection.ordinal] += a ?: continue

2
src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/baked/BakedFace.kt
View File

@ -30,7 +30,7 @@ class BakedFace(
val uv: FloatArray, val uv: FloatArray,
val shade: Float, val shade: Float,
val tintIndex: Int, val tintIndex: Int,
val cull: Directions?, cull: Directions?,
val texture: Texture, val texture: Texture,
val properties: FaceProperties? = null, val properties: FaceProperties? = null,
) { ) {