curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-15 04:54:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

inventory image for subtiled blocks

Browse Source
This commit is contained in:
minjaesong
2024-08-25 02:50:56 +09:00
parent ccaaac03d0
commit 23cae8ed73
2 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt
View File

@@ -187,7 +187,7 @@ internal object BlocksDrawer {
intArrayOf(0 ,4 ,8 ,9 ,1 ,5 ,6 ,10,2 ,3 ,7 ,11,12,16,15,14,13,20,19,18,17), /* hfCW 270 */
)
// order: TL, TR, BR, BL
private val variantOpsLUT_terr = arrayOf(
private val variantOpsLUT = arrayOf(
// newIndex = (oldIndex % A) + B for (a to b)
arrayOf(16 to 0,16 to 0,16 to 0,16 to 0), // TILING_FULL
arrayOf(16 to 0,16 to 0,16 to 0,16 to 0), // TILING_FULL_NOFLIP
@@ -196,17 +196,6 @@ internal object BlocksDrawer {
arrayOf(8 to 8,8 to 0,8 to 8,8 to 0), // TILING_BRICK_LARGE
arrayOf(8 to 8,8 to 0,8 to 8,8 to 0), // TILING_BRICK_LARGE_NOFLIP
)
// order: TL, TR, BR, BL
private val variantOpsLUT_wall = arrayOf(
// newIndex = (oldIndex % A) + B for (a to b)
arrayOf(16 to 0,16 to 0,16 to 0,16 to 0), // TILING_FULL
arrayOf(16 to 0,16 to 0,16 to 0,16 to 0), // TILING_FULL_NOFLIP
arrayOf(8 to 8,8 to 0,8 to 0,8 to 8), // TILING_BRICK_SMALL
arrayOf(8 to 8,8 to 0,8 to 0,8 to 8), // TILING_BRICK_SMALL_NOFLIP
arrayOf(8 to 0,8 to 8,8 to 0,8 to 8), // TILING_BRICK_LARGE
arrayOf(8 to 0,8 to 8,8 to 0,8 to 8), // TILING_BRICK_LARGE_NOFLIP
)
private val variantOpsLUT = arrayOf(variantOpsLUT_terr, variantOpsLUT_wall)
init {
assert(256 == connectLut47.size)
@@ -565,7 +554,7 @@ internal object BlocksDrawer {
(hash ushr 22) and 7,
(hash ushr 25) and 7,
)
val variantOps = variantOpsLUT[mode][renderTag.tilingMode]
val variantOps = variantOpsLUT[renderTag.tilingMode]
val subtiles = getSubtileIndexOf(tileNumberBase, nearbyTilesInfo, hash, subtileSwizzlers, variantOps)
/*TL*/writeToBufferSubtile(mode, bufferBaseX * 2 + 0, bufferBaseY * 2 + 0, subtiles[0].x, subtiles[0].y, breakingStage, subtileSwizzlers[0])