infiniteserver/fabric
1
0
Fork 0
forked from FabricMC/fabric
Code Pull requests Activity

FIX: Honor null blend mode in Indigo material finder (#213)

Browse source
This commit is contained in:
grondag 2019-05-26 15:32:34 +02:00 committed by Adrian Siekierka
parent 27e744c06a
commit 8a8ad746d4
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/RenderMaterialImpl.java
View file

@ -29,7 +29,9 @@ import net.minecraft.block.BlockRenderLayer;
* easy/fast interning via int/object hashmap.
*/
public abstract class RenderMaterialImpl {
private static final BlockRenderLayer[] BLEND_MODES = BlockRenderLayer.values();
/** zero position (default value) will be NULL */
private static final BlockRenderLayer[] BLEND_MODES = new BlockRenderLayer[5];
/**
* Indigo currently support up to 3 sprite layers but is configured to recognize only one.
@ -47,6 +49,8 @@ public abstract class RenderMaterialImpl {
private static final int[] AO_FLAGS = new int[3];
static {
System.arraycopy(BlockRenderLayer.values(), 0, BLEND_MODES, 1, 4);
int shift = Integer.bitCount(TEXTURE_DEPTH_MASK);
for(int i = 0; i < 3; i++) {
BLEND_MODE_SHIFT[i] = shift;
@ -135,7 +139,9 @@ public abstract class RenderMaterialImpl {
@Override
public MaterialFinder blendMode(int textureIndex, BlockRenderLayer blendMode) {
final int shift = BLEND_MODE_SHIFT[textureIndex];
bits = (bits & ~(BLEND_MODE_MASK << shift)) | (blendMode.ordinal() << shift);
// zero position is null (default) value
final int ordinal = blendMode == null ? 0 : blendMode.ordinal() + 1;
bits = (bits & ~(BLEND_MODE_MASK << shift)) | (ordinal << shift);
return this;
}