rusefi
/
jzy3d-api
mirror of https://github.com/rusefi/jzy3d-api.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow rebuilding a native TextRenderer for each new text to draw to prevent caching

This commit is contained in:
martin 2022-02-28 16:34:07 +01:00
parent 72ca168043
commit 41d19528b8
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
jzy3d-native-jogl-core/src/main/java/org/jzy3d/painters/NativeDesktopPainter.java
View File

@ -192,14 +192,11 @@ public class NativeDesktopPainter extends AbstractPainter implements IPainter {
String name = getCanvas().getClass().getSimpleName();
if (name.indexOf("CanvasAWT") >= 0) {
return WindowingToolkit.AWT;
}
else if(name.indexOf("CanvasSwing")>=0) {
} else if (name.indexOf("CanvasSwing") >= 0) {
return WindowingToolkit.Swing;
}
else if(name.indexOf("CanvasNewtSWT")>=0) {
} else if (name.indexOf("CanvasNewtSWT") >= 0) {
return WindowingToolkit.SWT;
}
else if(name.indexOf("OffscreenCanvas")>=0) {
} else if (name.indexOf("OffscreenCanvas") >= 0) {
return WindowingToolkit.Offscreen;
}
return WindowingToolkit.UNKOWN;
@ -481,6 +478,7 @@ public class NativeDesktopPainter extends AbstractPainter implements IPainter {
*
* Rotation is in radian and is applied at the center of the text to avoid messing up text layout.
*
*
* @see {@link #glutBitmapString(int, String)}, an alternative way of rendering text with simpler
* parameters and smaller font name and size set.
*/
@ -532,20 +530,31 @@ public class NativeDesktopPainter extends AbstractPainter implements IPainter {
}
protected TextRenderer getOrCreateTextRenderer(Font font) {
TextRenderer renderer = txtRendererMap.get(font);
// See discussion
//
// https://forum.jogamp.org/TextRenderer-crash-the-JVM-after-removing-then-adding-a-canvas-from-a-AWT-or-Swing-layout-td4041660.html
//
// Despite not efficient, the need to deal with removing/adding a canvas requires not keeping a
// cache of the already defined strings. Indeed, in case the GLContext get destroyed, the
// inherent textures are lost and text is replaced by black pixels.
//
// As there is no way to invalidate the TextRenderer cache (stringLocations is private), we simply re-create
// a new TextRenderer as soon as we want draw a text.
TextRenderer renderer = null;
// TextRenderer renderer = txtRendererMap.get(font);
if (renderer == null) {
renderer = new TextRenderer(toAWT(font), true, true, null);
// renderer.setSmoothing(false);// some GPU do not handle smoothing well
// renderer.setUseVertexArrays(false); // some GPU do not handle VBO properly
txtRendererMap.put(font, renderer);
//txtRendererMap.put(font, renderer);
}
return renderer;
}
protected Map<Font, TextRenderer> txtRendererMap = new HashMap<>();
// protected TextLayout layout = new TextLayout();
//protected Map<Font, TextRenderer> txtRendererMap = new HashMap<>();
/**

10
jzy3d-native-jogl-swing/src/test/java/org/jzy3d/chart/TestAddRemoveFromFrame.java
View File

@ -16,6 +16,15 @@ public class TestAddRemoveFromFrame {
int RENDER_LOOP = 300;
int FRAME_SIZE = 500;
public static void main(String[] args) {
AWTChartFactory factory = new AWTChartFactory();
Frame awtFrame = new Frame();
new TestAddRemoveFromFrame().addRemove_FromFrame_Scenario(factory, awtFrame, "addRemove_FromAWTFrame_AWTCanvas");
}
@Test
public void addRemove_FromAWTFrame_AWTCanvas() {
@ -72,6 +81,7 @@ public class TestAddRemoveFromFrame {
Chart chart = factory.newChart(q);
chart.add(SampleGeom.surface());
chart.addMouse();
//chart.getView().getAxis().setTextRenderer(new TextBitmapRenderer());