From 297c48f4fefd1ab59800524ea5f0dd56684d6786 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 30 Sep 2023 01:28:59 +0200 Subject: Bug 1465 - Graph / GraphUI: Render a Region's ColorTexture in proper aspect-ratio, letter-boxed or zoomed (config) + Bug 1466 Fix color mixing Bug 1465: Region currently simply bloats a given texture to its region AABBox, which renders textures with the wrong aspect ratio. Add facility to program the texture-coordinates to either letter-box or scaled-up (and cut) true aspect-ratio. Default shall be zoom (scale-up and cut), but user shall be able to set a flag in the Region for letter-box. Have the shader clip texture coordinates properly, best w/o branching to soothe performance. See functions.glsl +++ Bug 1466: Current color mix: texture * color_channel * color_static is useless in GraphUI. color_static shall modulate the texture, which works. But in case of color_channel (attribute/varying) we want it to be mixed so it can become the more dominant color for e.g. a border. Desired is: color = vec4( mix( tex.rgb * gcu_ColorStatic.rgb, gcv_Color.rgb, gcv_Color.a ), mix( tex.a * gcu_ColorStatic.a, 1, gcv_Color.a) ); --- src/graphui/classes/com/jogamp/graph/ui/shapes/ImageButton.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/graphui/classes/com/jogamp/graph/ui/shapes/ImageButton.java') diff --git a/src/graphui/classes/com/jogamp/graph/ui/shapes/ImageButton.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/ImageButton.java index cd919546d..d8c79d8e7 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/shapes/ImageButton.java +++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/ImageButton.java @@ -55,7 +55,7 @@ public class ImageButton extends TexSeqButton { final float height, final ImageSequence texSeq) { super(renderModes, width, height, texSeq); - setColor(1f, 1f, 1f, 1.0f); + setColor(1f, 1f, 1f, 0.0f); setPressedColorMod(0.9f, 0.9f, 0.9f, 0.9f); setToggleOffColorMod(1f, 1f, 1f, 1f); setToggleOnColorMod(0.8f, 0.8f, 0.8f, 1f); -- cgit v1.2.3