From e4608b17c37918e6ee44839652aacbf1ab133d6e Mon Sep 17 00:00:00 2001 From: Gustl22 Date: Wed, 6 Mar 2019 21:15:27 +0100 Subject: [PATCH] ColorUtil modHsv: keep alpha --- vtm/src/org/oscim/utils/ColorUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vtm/src/org/oscim/utils/ColorUtil.java b/vtm/src/org/oscim/utils/ColorUtil.java index a1f96241..94db82da 100644 --- a/vtm/src/org/oscim/utils/ColorUtil.java +++ b/vtm/src/org/oscim/utils/ColorUtil.java @@ -20,6 +20,7 @@ package org.oscim.utils; import org.oscim.backend.canvas.Color; import org.oscim.utils.math.Vec3; +import static org.oscim.backend.canvas.Color.a; import static org.oscim.backend.canvas.Color.b; import static org.oscim.backend.canvas.Color.g; import static org.oscim.backend.canvas.Color.r; @@ -81,11 +82,11 @@ public class ColorUtil { return color; Vec3 hsl = TMP_VEC; rgbToHsv(r(color), g(color), b(color), hsl); - return hsvToRgb(clamp((hue + hsl.x) % 1, 0, 1), + return Color.setA(hsvToRgb(clamp((hue + hsl.x) % 1, 0, 1), clamp(relative || saturation <= 1 ? saturation * hsl.y : hsl.y + (saturation - 1) * (1 - hsl.y), 0, 1), clamp(relative || value <= 1 ? value * hsl.z : - hsl.z + (value - 1) * (1 - hsl.z), 0, 1)); + hsl.z + (value - 1) * (1 - hsl.z), 0, 1)), a(color)); } // functions ported from http://axonflux.com/handy-rgb-to-hsl-and-rgb-to-hsv-color-model-c