Skip to content

Conversation

gbburkhardt
Copy link
Contributor

Note: Filling out this template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the
maintainer's discretion.

Description of the Change

Delete local copy of worldwind/render/TextRenderer in favor of version that is maintained by JOGAMP. Update JOGL jar files with released version 2.5.0, build Build: 2.5-b1533-20230818. That build includes the DPI scaling fix for TextRenderer, which was committed to the jogl repo on 6/4, commit 25fd535a11.

JOGL jar files were pulled from:
https://jogamp.org/deployment/maven/org/jogamp/gluegen/gluegen-rt/2.5.0/
https://jogamp.org/deployment/maven/org/jogamp/gluegen/gluegen/2.5.0/
https://jogamp.org/deployment/maven/org/jogamp/jogl/jogl-all/2.5.0/

This can be checked by examining the MANIFEST.MF file in the jar files.

Why Should This Be In Core?

WorldWind code had a copy of TextRenderer that originated with the JOGAMP group. However, it had not been maintained with updates from the JOGAMP group, specifically, plugs for resource leaks and an error check.

The debug flag can still be set with a runtime property definition (-Djogl.debug.TextRenderer). The other change in the WorldWind edition, to allow dynamic setting of DISABLE_GLYPH_CACHE for debugging of the TextRenderer code, is not likely to be needed at this point in time, and can be easily enabled with a debugger if need be.

Benefits

Less maintenance needed for a local edition of TextRenderer. Improvements made by the JOGAMP group can be picked up by updating the jar files.

Potential Drawbacks

Applicable Issues

DPI Scaling

…n that is maintained by JOGAMP. Update JOGL jar files with released version 2.5.0, build Build: 2.5-b1533-20230818. That build includes the DPI scaling fix for TextRenderer, which was committed to the jogl repo on 6/4.
@gbburkhardt
Copy link
Contributor Author

Tested on LInux Ubuntu 22.05 Java 11.0.21.

Copy link
Member

@markpet49 markpet49 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested out good on Windows, Mac and Linux. Thanks for the contribution.

@markpet49 markpet49 merged commit 017d91e into NASAWorldWind:develop Feb 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants