aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Göthel <[email protected]>2024-01-31 11:59:33 +0100
committerSven Göthel <[email protected]>2024-01-31 11:59:33 +0100
commitdb2daee62669ee649a6cb1d8d99731c6b3d3a250 (patch)
tree456fd715d0ed580076eafa52d566ba9391674375
parent8d03e7e0b79cf5bd70fa45f524abb236787303ad (diff)
GraphUI Demos: FontView01 can use scaling Lable ctor; UISceneDemo01b doesn't need to issue Shape.updateMat()
-rw-r--r--src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java4
-rw-r--r--src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java
index d6d34b366..0fef325bd 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java
@@ -549,7 +549,7 @@ public class FontView01 {
final Group c2 = new Group( new GridLayout( 1, 0, 0, Alignment.None) ); // Alignment(Alignment.Bit.CenterHoriz) ) );
c2.addShape(c1.setName("GlyphHolder3"));
{
- final Label l = new Label(options.renderModes, fontInfo, 1f, fg.getName());
+ final Label l = new Label(options.renderModes, fontInfo, fg.getName());
// final AABBox lbox = l.getUnscaledGlyphBounds();
final float sxy = 1f/7f; // gridDim.maxNameLen; // 0.10f; // Math.min(sx, sy);
c2.addShape( l.scale(sxy, sxy, 1).setColor(0, 0, 0, 1).setInteractive(false).setDragAndResizeable(false) );
@@ -567,7 +567,7 @@ public class FontView01 {
System.err.println("PERF: GlyphAdd took "+(total/1000000.0)+"ms, per-glyph "+(nsPerGlyph/1000000.0)+"ms, glyphs "+gridDim.glyphCount);
}
static void addLabel(final Group c, final Font font, final String text) {
- c.addShape( new Label(options.renderModes, font, 1f, text).setColor(0, 0, 0, 1).setInteractive(false).setDragAndResizeable(false) );
+ c.addShape( new Label(options.renderModes, font, text).setColor(0, 0, 0, 1).setInteractive(false).setDragAndResizeable(false) );
}
static void setGlyphInfo(final Font font, final Label label, final Font.Glyph g) {
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java
index f527226c3..c673b6407 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java
@@ -173,7 +173,6 @@ public class UISceneDemo01b {
} else {
shape.getRotation().rotateByAngleY(rad);
}
- shape.updateMat();
System.err.println("Shape "+shape);
final PMVMatrix4f pmv = new PMVMatrix4f();
shape.applyMatToMv(pmv);