summaryrefslogtreecommitdiffstats
path: root/src/graphui/classes/jogamp/graph/ui/shapes
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-04-05 10:06:26 +0200
committerSven Gothel <[email protected]>2023-04-05 10:06:26 +0200
commit1eb9d91bbf5d24a02c4d9e98501ff51eb7ecdcd0 (patch)
treedc1c7615f4b99d7b09c9b3c569f6e3d459dbb4e5 /src/graphui/classes/jogamp/graph/ui/shapes
parent15e60161787224e85172685f74dc0ac195969b51 (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/jogamp/graph/ui/shapes')
-rw-r--r--src/graphui/classes/jogamp/graph/ui/shapes/Label0.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/graphui/classes/jogamp/graph/ui/shapes/Label0.java b/src/graphui/classes/jogamp/graph/ui/shapes/Label0.java
index fe5f7f8e5..a091a89ed 100644
--- a/src/graphui/classes/jogamp/graph/ui/shapes/Label0.java
+++ b/src/graphui/classes/jogamp/graph/ui/shapes/Label0.java
@@ -31,6 +31,7 @@ import com.jogamp.graph.curve.Region;
import com.jogamp.graph.curve.opengl.TextRegionUtil;
import com.jogamp.graph.font.Font;
import com.jogamp.graph.geom.plane.AffineTransform;
+import com.jogamp.opengl.math.Vec2f;
import com.jogamp.opengl.math.geom.AABBox;
public class Label0 {
@@ -65,10 +66,10 @@ public class Label0 {
this.font = font;
}
- public final AABBox addShapeToRegion(final float scale, final Region region, final float[] txy,
+ public final AABBox addShapeToRegion(final float scale, final Region region, final Vec2f txy,
final AffineTransform tmp1, final AffineTransform tmp2, final AffineTransform tmp3)
{
- tmp1.setToTranslation(txy[0], txy[1]);
+ tmp1.setToTranslation(txy.x(), txy.y());
tmp1.scale(scale, scale, tmp2);
return TextRegionUtil.addStringToRegion(region, font, tmp1, text, rgbaColor, tmp2, tmp3);
}