eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-27 10:21:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

major updates to JavaFX and modules handling

Browse Source
This commit is contained in:
Ben Fry
2021-06-22 11:39:13 -04:00
parent e59966f849
commit ca76da403b
5 changed files with 97 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/libraries/javafx/build.xml
View File

@@ -95,7 +95,8 @@
<!-- extract the .jar files from the first javafx we run across -->
<!-- <target name="unzip-gluon-jars" unless="${javafx.jars.exist}"> -->
<target name="unzip-gluon-jars">
<echo message="Extracting jars from ${gluon.base}.zip" />
<property name="modules.path" value="${platform.path}/modules" />
<echo message="Extracting jars from ${gluon.base}.zip to ${modules.path}" />
<!-- should javafx.properties be copyed? is it used for anything? [fry 210620] -->
<!-- https://ant.apache.org/manual/Tasks/unzip.html -->
@@ -103,7 +104,7 @@
<!-- !#($*#! the builds have *slightly* different classes in each release
(WinPlatformFactory not in macOS .jar... FFS it 1100 bytes of glue code)
So the .jar files go into the native subdirectories as well. -->
<unzip dest="${natives.path}" src="${gluon.base}.zip" overwrite="true">
<unzip dest="${modules.path}" src="${gluon.base}.zip" overwrite="true">
<patternset>
<include name="**/*.jar" />
<!-- These two aren't supported/used -->
@@ -117,9 +118,9 @@
</target>
<target name="unzip-gluon-natives">
<echo message="Extracting ${gluon.base}.zip to ${natives.path}" />
<echo message="Extracting native libs from ${gluon.base}.zip to ${platform.path}" />
<unzip dest="${natives.path}" src="${gluon.base}.zip" overwrite="true">
<unzip dest="${platform.path}" src="${gluon.base}.zip" overwrite="true">
<patternset>
<include name="**/*.dll" />
<include name="**/*.dylib" />
@@ -155,17 +156,17 @@
<!-- javafx-${gluon.version}-sdk-${gluon.platform} -->
<antcall target="retrieve-gluon">
<param name="gluon.base" value="javafx-${gluon.version}-sdk-mac" />
<param name="natives.path" value="${library.path}/macosx" />
<param name="platform.path" value="${library.path}/macosx" />
</antcall>
<antcall target="retrieve-gluon">
<param name="gluon.base" value="javafx-${gluon.version}-sdk-windows" />
<param name="natives.path" value="${library.path}/windows64" />
<param name="platform.path" value="${library.path}/windows64" />
</antcall>
<antcall target="retrieve-gluon">
<param name="gluon.base" value="javafx-${gluon.version}-sdk-linux" />
<param name="natives.path" value="${library.path}/linux64" />
<param name="platform.path" value="${library.path}/linux64" />
</antcall>
</target>
@@ -361,8 +362,8 @@
</condition>
-->
<!-- just pick a platform; this should be sufficient for building -->
<property name="javafx.jar.path" value="library/macosx" />
<!-- just pick a platform; any should be sufficient for building -->
<property name="javafx.jar.path" value="library/macosx/modules" />
<mkdir dir="bin" />
<javac source="11" target="11"

2
java/libraries/javafx/src/processing/javafx/PGraphicsFX2D.java
View File

@@ -1570,7 +1570,7 @@ public class PGraphicsFX2D extends PGraphics {
PFont.Glyph glyph = textFont.getGlyph(ch);
if (glyph != null) {
if (textMode == MODEL) {
float bitmapSize = (float) textFont.getSize();
float bitmapSize = textFont.getSize();
float high = glyph.height / bitmapSize;
float wide = glyph.width / bitmapSize;
float leftExtent = glyph.leftExtent / bitmapSize;