From 8c675bc4f712da31bbd5871d36130c98700589cc Mon Sep 17 00:00:00 2001
From: "Lukas Rieger (Blue)" <TBlueF@users.noreply.github.com>
Date: Sun, 18 Sep 2022 21:28:08 +0200
Subject: [PATCH] Fix lowres block color calculation with multipart-blocks

---
 .../core/map/hires/HiresModelRenderer.java    |  1 -
 .../blockmodel/BlockStateModelFactory.java    | 24 ++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/HiresModelRenderer.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/HiresModelRenderer.java
index 515e97c3..452cf8a5 100644
--- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/HiresModelRenderer.java
+++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/HiresModelRenderer.java
@@ -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);
diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/blockmodel/BlockStateModelFactory.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/blockmodel/BlockStateModelFactory.java
index 2cf0bb5f..15865081 100644
--- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/blockmodel/BlockStateModelFactory.java
+++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/map/hires/blockmodel/BlockStateModelFactory.java
@@ -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);