zhangyuheng/BlueMap
1
0
Fork 0
forked from mirror/BlueMap
Code Pull Requests Activity

Fix lowres block color calculation with multipart-blocks

Browse Source
This commit is contained in:
Lukas Rieger (Blue) 2022-09-18 21:28:08 +02:00
parent dabc8a565a
commit 8c675bc4f7
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/HiresModelRenderer.java
View File

@ -80,7 +80,6 @@ public void render(World world, Vector3i modelMin, Vector3i modelMax, HiresTileM
block.set(x, y, z);
if (!block.isInsideRenderBounds()) continue;
blockColor.set(0, 0, 0, 0, true);
blockModel.initialize();
modelFactory.render(block, blockModel, blockColor);

24
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/blockmodel/BlockStateModelFactory.java
View File

@ -56,7 +56,9 @@ public void render(BlockNeighborhood<?> block, BlockModelView blockModel, Color
render(block, block.getBlockState(), blockModel, blockColor);
}
private final Color waterloggedColor = new Color();
public void render(BlockNeighborhood<?> block, BlockState blockState, BlockModelView blockModel, Color blockColor) {
blockColor.set(0, 0, 0, 0, true);
//shortcut for air
if (blockState.isAir()) return;
@ -68,29 +70,45 @@ public void render(BlockNeighborhood<?> block, BlockState blockState, BlockModel
// add water if block is waterlogged
if (blockState.isWaterlogged() || block.getProperties().isAlwaysWaterlogged()) {
renderModel(block, WATERLOGGED_BLOCKSTATE, blockModel.initialize(), blockColor);
waterloggedColor.set(0f, 0f, 0f, 0f, true);
renderModel(block, WATERLOGGED_BLOCKSTATE, blockModel.initialize(), waterloggedColor);
blockColor.set(waterloggedColor.overlay(blockColor.premultiplied()));
}
blockModel.initialize(modelStart);
}
private final Color variantColor = new Color();
private void renderModel(BlockNeighborhood<?> block, BlockState blockState, BlockModelView blockModel, Color blockColor) {
int modelStart = blockModel.getStart();
var stateResource = resourcePack.getBlockState(blockState);
if (stateResource == null) return;
float blockColorOpacity = 0;
variants.clear();
stateResource.forEach(blockState, block.getX(), block.getY(), block.getZ(), variants::add);
for (Variant variant : variants) {
BlockModel modelResource = variant.getModel().getResource(resourcePack::getBlockModel);
if (modelResource == null) continue;
variantColor.set(0f, 0f, 0f, 0f, true);
if (modelResource.isLiquid()) {
liquidModelBuilder.build(block, blockState, variant, blockModel.initialize(), blockColor);
liquidModelBuilder.build(block, blockState, variant, blockModel.initialize(), variantColor);
} else {
resourceModelBuilder.build(block, variant, blockModel.initialize(), blockColor);
resourceModelBuilder.build(block, variant, blockModel.initialize(), variantColor);
}
if (variantColor.a > blockColorOpacity)
blockColorOpacity = variantColor.a;
blockColor.add(variantColor.premultiplied());
}
if (blockColor.a > 0) {
blockColor.flatten().straight();
blockColor.a = blockColorOpacity;
}
blockModel.initialize(modelStart);