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

Merge remote-tracking branch 'origin/rendering' into rendering

Browse Source
This commit is contained in:
Bixilon 2021-02-27 17:36:53 +01:00
commit 419209e88c
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/bixilon/minosoft/data/Directions.kt
View File

@ -17,8 +17,8 @@ import glm_.vec3.Vec3
enum class Directions (direction: Vec3) { enum class Directions (direction: Vec3) {
DOWN(Vec3(0, -1, 0)), DOWN(Vec3(0, -1, 0)),
UP(Vec3(0, 1, 0)), UP(Vec3(0, 1, 0)),
NORTH(Vec3(0, 0, 1)), NORTH(Vec3(0, 0, -1)),
SOUTH(Vec3(0, 0, -1)), SOUTH(Vec3(0, 0, 1)),
WEST(Vec3(-1, 0, 0)), WEST(Vec3(-1, 0, 0)),
EAST(Vec3(1, 0, 0)); EAST(Vec3(1, 0, 0));

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

@ -73,8 +73,8 @@ open class BlockModelElement(data: JsonObject) {
val FACE_POSITION_MAP_TEMPLATE = arrayOf( val FACE_POSITION_MAP_TEMPLATE = arrayOf(
intArrayOf(0, 2, 3, 1), intArrayOf(0, 2, 3, 1),
intArrayOf(6, 4, 5, 7), intArrayOf(6, 4, 5, 7),
intArrayOf(1, 5, 4, 0),
intArrayOf(2, 6, 7, 3), intArrayOf(2, 6, 7, 3),
intArrayOf(1, 5, 4, 0),
intArrayOf(6, 2, 0, 4), intArrayOf(6, 2, 0, 4),
intArrayOf(5, 1, 3, 7) intArrayOf(5, 1, 3, 7)
) )