From 3ac05c6a2bf95a06d51e579423fefbbb500f6b63 Mon Sep 17 00:00:00 2001 From: cola98765 Date: Sat, 2 Oct 2021 15:34:02 +0200 Subject: [PATCH] fixed multiplyRGBcolors to not make off by 1 error --- src/main/java/com/seibel/lod/util/ColorUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/seibel/lod/util/ColorUtil.java b/src/main/java/com/seibel/lod/util/ColorUtil.java index 20cc90338..6fdf293a4 100644 --- a/src/main/java/com/seibel/lod/util/ColorUtil.java +++ b/src/main/java/com/seibel/lod/util/ColorUtil.java @@ -94,7 +94,7 @@ public class ColorUtil } public static int multiplyRGBcolors(int color1, int color2) { - return (((getAlpha(color1) * getAlpha(color2)) << 16) & 0xFF000000) | (((getRed(color1) * getRed(color2)) << 8) & 0xFF0000) | ((getGreen(color1) * getGreen(color2)) & 0xFF00) | (((getBlue(color1) * getBlue(color2)) >> 8) & 0xFF); + return ((getAlpha(color1) * getAlpha(color2) / 255) << 24) | ((getRed(color1) * getRed(color2) / 255) << 16) | ((getGreen(color1) * getGreen(color2) / 255) << 8) | (getBlue(color1) * getBlue(color2) / 255); }