diff options
| author | Sven Gothel <[email protected]> | 2023-03-28 02:37:47 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-03-28 02:37:47 +0200 |
| commit | c9f1d8bb7a564100c8a1084bc8d914f2f4e5e3d2 (patch) | |
| tree | 8f1a66cb7dc887c0e1447d72c2526b2c84c4e364 /src/demos/com/jogamp | |
| parent | 9b91a24ee6f383ca53556c466d84baf56f16940b (diff) | |
Graph FontScale: Simplify names, fix API doc and add unit test
Diffstat (limited to 'src/demos/com/jogamp')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPURendererListenerBase01.java b/src/demos/com/jogamp/opengl/demos/graph/GPURendererListenerBase01.java index 185699d55..5bceba5eb 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPURendererListenerBase01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPURendererListenerBase01.java @@ -125,7 +125,7 @@ public abstract class GPURendererListenerBase01 implements GLEventListener { if( upObj instanceof Window ) { final Window window = (Window) upObj; final float[] sPpMM = window.getPixelsPerMM(new float[2]); - final float[] sDPI = FontScale.perMMToPerInch( new float[] { sPpMM[0], sPpMM[1] } ); + final float[] sDPI = FontScale.ppmmToPPI( new float[] { sPpMM[0], sPpMM[1] } ); System.err.println("DPI "+sDPI[0]+" x "+sDPI[1]+", "+sPpMM[0]+" x "+sPpMM[1]+" pixel/mm"); final float[] hasSurfacePixelScale1 = window.getCurrentSurfaceScale(new float[2]); diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPUTextNewtDemo.java b/src/demos/com/jogamp/opengl/demos/graph/GPUTextNewtDemo.java index bbdf4bfbb..ad5434b09 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPUTextNewtDemo.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPUTextNewtDemo.java @@ -149,7 +149,7 @@ public class GPUTextNewtDemo { { final Font font2 = textGLListener.getFont(); - final float[] sDPI = FontScale.perMMToPerInch( window.getPixelsPerMM(new float[2]) ); + final float[] sDPI = FontScale.ppmmToPPI( window.getPixelsPerMM(new float[2]) ); final float font_ptpi = 12f; final float font_ppi = FontScale.toPixels(font_ptpi, sDPI[1]); final AABBox fontNameBox = font2.getMetricBounds(GPUTextRendererListenerBase01.textX1); diff --git a/src/demos/com/jogamp/opengl/demos/graph/GPUTextRendererListenerBase01.java b/src/demos/com/jogamp/opengl/demos/graph/GPUTextRendererListenerBase01.java index 0b506af72..dadbcd373 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/GPUTextRendererListenerBase01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/GPUTextRendererListenerBase01.java @@ -232,7 +232,7 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB if( upObj instanceof Window ) { upstream_window = (Window) upObj; final float[] sPpMM = upstream_window.getPixelsPerMM(new float[2]); - final float[] sDPI = FontScale.perMMToPerInch( new float[] { sPpMM[0], sPpMM[1] } ); + final float[] sDPI = FontScale.ppmmToPPI( new float[] { sPpMM[0], sPpMM[1] } ); dpiV = sDPI[1]; ppmmV = sPpMM[1]; System.err.println("Using vertical screen DPI of "+dpiV+", "+ppmmV+" pixel/mm"); diff --git a/src/demos/com/jogamp/opengl/demos/graph/TextRendererGLELBase.java b/src/demos/com/jogamp/opengl/demos/graph/TextRendererGLELBase.java index c0093c6c8..22f2d096a 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/TextRendererGLELBase.java +++ b/src/demos/com/jogamp/opengl/demos/graph/TextRendererGLELBase.java @@ -141,7 +141,7 @@ public abstract class TextRendererGLELBase implements GLEventListener { final Object upObj = drawable.getUpstreamWidget(); if( upObj instanceof Window ) { - final float[] dpi = FontScale.perMMToPerInch( ((Window)upObj).getPixelsPerMM(new float[2]) ); + final float[] dpi = FontScale.ppmmToPPI( ((Window)upObj).getPixelsPerMM(new float[2]) ); dpiH = dpi[1]; } } |