spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add global index pallet

Browse Source
This commit is contained in:
mcrcortex
2025-03-25 00:16:16 +10:00
parent 1d7e24537f
commit 33f5772ecd
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java
View File

@@ -123,9 +123,13 @@ public class WorldConversionFactory {
var vp = blockContainer.data.palette; var vp = blockContainer.data.palette;
var pc = cache.getPaletteCache(vp.getSize()); var pc = cache.getPaletteCache(vp.getSize());
IdListPalette<BlockState> bps = null;
if (blockContainer.data.palette instanceof IdListPalette<BlockState> _bps) {
bps = _bps;
} else {
setupLocalPalette(vp, blockCache, stateMapper, pc); setupLocalPalette(vp, blockCache, stateMapper, pc);
}
{ {
int i = 0; int i = 0;
@@ -138,7 +142,8 @@ public class WorldConversionFactory {
} }
} }
//TODO: EmptyPaletteStorage (it only refs idx 0)
if (blockContainer.data.storage instanceof PackedIntegerArray bStor) { if (blockContainer.data.storage instanceof PackedIntegerArray bStor) {
var bDat = bStor.getData(); var bDat = bStor.getData();
int iterPerLong = (64 / bStor.getElementBits()) - 1; int iterPerLong = (64 / bStor.getElementBits()) - 1;
@@ -156,7 +161,12 @@ public class WorldConversionFactory {
sample = bDat[c++]; sample = bDat[c++];
dec = iterPerLong; dec = iterPerLong;
} }
int bId = pc[(int) (sample & MSK)]; int bId;
if (bps == null) {
bId = pc[(int) (sample & MSK)];
} else {
bId = stateMapper.getIdForBlockState(bps.get((int) (sample&MSK)));
}
sample >>>= eBits; sample >>>= eBits;
byte light = lightSupplier.supply(x, y, z); byte light = lightSupplier.supply(x, y, z);