From 3ce832583c9d4ef3145365cbf08544c1b4d3fb27 Mon Sep 17 00:00:00 2001 From: Sjoerd van de Goor Date: Wed, 15 Feb 2023 12:49:20 +0100 Subject: [PATCH 1/3] Continent (i.e. heightmap + ocean/land division) render --- .../com/volmit/iris/core/gui/components/IrisRenderer.java | 8 ++++++++ .../com/volmit/iris/core/gui/components/RenderType.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java b/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java index 3c4055aff..486fde809 100644 --- a/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java +++ b/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java @@ -49,6 +49,14 @@ public class IrisRenderer { colorFunction = (x, z) -> renderer.getComplex().getCaveBiomeStream().get(x, z).getColor(renderer, currentType).getRGB(); case HEIGHT -> colorFunction = (x, z) -> Color.getHSBColor(renderer.getComplex().getHeightStream().get(x, z).floatValue(), 100, 100).getRGB(); + case CONTINENT -> { + double fluidHeight = renderer.getComplex().getFluidHeight(); + int deltaHeight = renderer.getMaxHeight() - renderer.getMinHeight(); + colorFunction = (x, z) -> { + double h = renderer.getComplex().getHeightStream().get(x, z); + return new Color((int) (h / deltaHeight), 128, fluidHeight > h ? 0 : 255).getRGB(); + }; + } } double x, z; diff --git a/src/main/java/com/volmit/iris/core/gui/components/RenderType.java b/src/main/java/com/volmit/iris/core/gui/components/RenderType.java index b473222ad..778286fe5 100644 --- a/src/main/java/com/volmit/iris/core/gui/components/RenderType.java +++ b/src/main/java/com/volmit/iris/core/gui/components/RenderType.java @@ -19,5 +19,5 @@ package com.volmit.iris.core.gui.components; public enum RenderType { - BIOME, BIOME_LAND, BIOME_SEA, REGION, CAVE_LAND, HEIGHT, OBJECT_LOAD, DECORATOR_LOAD, LAYER_LOAD + BIOME, BIOME_LAND, BIOME_SEA, REGION, CAVE_LAND, HEIGHT, OBJECT_LOAD, DECORATOR_LOAD, CONTINENT, LAYER_LOAD } From c15d4a349f10e6efcbac6bebe2a055efc786c443 Mon Sep 17 00:00:00 2001 From: Sjoerd van de Goor Date: Wed, 15 Feb 2023 12:55:43 +0100 Subject: [PATCH 2/3] map to 255 range --- .../java/com/volmit/iris/core/gui/components/IrisRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java b/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java index 486fde809..289db966b 100644 --- a/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java +++ b/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java @@ -54,7 +54,7 @@ public class IrisRenderer { int deltaHeight = renderer.getMaxHeight() - renderer.getMinHeight(); colorFunction = (x, z) -> { double h = renderer.getComplex().getHeightStream().get(x, z); - return new Color((int) (h / deltaHeight), 128, fluidHeight > h ? 0 : 255).getRGB(); + return new Color((int) (h * 255d / deltaHeight), 128, fluidHeight > h ? 0 : 255).getRGB(); }; } } From d6f816fe2f4b85126ab8280fe11232c4baaa7b9c Mon Sep 17 00:00:00 2001 From: Sjoerd van de Goor Date: Wed, 15 Feb 2023 13:00:13 +0100 Subject: [PATCH 3/3] Flipped water / land --- .../java/com/volmit/iris/core/gui/components/IrisRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java b/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java index 289db966b..62c7616ed 100644 --- a/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java +++ b/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java @@ -54,7 +54,7 @@ public class IrisRenderer { int deltaHeight = renderer.getMaxHeight() - renderer.getMinHeight(); colorFunction = (x, z) -> { double h = renderer.getComplex().getHeightStream().get(x, z); - return new Color((int) (h * 255d / deltaHeight), 128, fluidHeight > h ? 0 : 255).getRGB(); + return new Color((int) (h * 255d / deltaHeight), 128, h > fluidHeight ? 0 : 255).getRGB(); }; } }