diff options
author | Sven Gothel <[email protected]> | 2023-04-05 10:06:26 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2023-04-05 10:06:26 +0200 |
commit | 1eb9d91bbf5d24a02c4d9e98501ff51eb7ecdcd0 (patch) | |
tree | dc1c7615f4b99d7b09c9b3c569f6e3d459dbb4e5 /src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java | |
parent | 15e60161787224e85172685f74dc0ac195969b51 (diff) |
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.
Diffstat (limited to 'src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java')
-rw-r--r-- | src/graphui/classes/com/jogamp/graph/ui/shapes/Label.java | 2 |
1 files changed, 1 insertions, 1 deletions
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(); } /** |