From 1eb9d91bbf5d24a02c4d9e98501ff51eb7ecdcd0 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 5 Apr 2023 10:06:26 +0200
Subject: GraphUI: Adopting Vec*f API; Adding Group; Scene + Group are
Container, traversing the PMVMatrix throughout childs (-> see TreeTool).
Utilizing the Vec*f (and Matrix4f) API w/ AABBox et al renders our code more clean & safe,
see commit 15e60161787224e85172685f74dc0ac195969b51.
A Group allows to contain multiple Shapes,
hence the PMVMatrix must be traversed accordingly using TreeTool
for all operations (draw, picking, win->obj coordinates, ..).
Hence Scene + Group are now implementing Container
and reuse code via TreeTool and a Shape.Visitor*.
This will allow further simplification of user code.
---
src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java')
diff --git a/src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java
index e7d89ade4..50b53e6f5 100644
--- a/src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java
+++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java
@@ -166,7 +166,7 @@ public class Label extends GraphShape {
/** Returns {@link Font#getLineHeight()} * {@link #getFontScale()} * {@link #getScaleY()}. */
public float getScaledLineHeight() {
- return getScaleY() * fontScale * font.getLineHeight();
+ return getScale().y() * fontScale * font.getLineHeight();
}
/**
--
cgit v1.2.3