diff options
| author | Philip Jordan <[email protected]> | 2023-05-25 10:30:19 +1200 |
|---|---|---|
| committer | Philip Jordan <[email protected]> | 2023-05-25 10:30:19 +1200 |
| commit | b80b072de18f32b738c1e449e15e13081842702e (patch) | |
| tree | 1157cdc115da52411960bf567df8e4be6f0fab62 /src/main | |
| parent | 79ae74db8c3ecfd04ba0deb1e9b78d408786526b (diff) | |
dependent jogl updated to 2.4.0dev1.7.1
code changed to no longer require Version18 static from Platform
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java | 5 | ||||
| -rw-r--r-- | src/main/java/org/jogamp/java3d/JoglPipeline.java | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java b/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java index 3d60105..9568b2c 100644 --- a/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java +++ b/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java @@ -61,6 +61,7 @@ import org.jogamp.vecmath.Vector4f; import com.jogamp.common.nio.Buffers; import com.jogamp.common.os.Platform; +import com.jogamp.common.util.VersionNumber; import com.jogamp.nativewindow.AbstractGraphicsDevice; import com.jogamp.nativewindow.AbstractGraphicsScreen; import com.jogamp.nativewindow.CapabilitiesChooser; @@ -7381,8 +7382,8 @@ class Jogl2es2Pipeline extends Jogl2es2DEPPipeline } if (Platform.getOSName().equalsIgnoreCase("Windows 10") && //win10 - (Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) > 0) || // 1.9 or 1.8 > 51 //Version 19 was swapped to version 9 due to JEP 223 in jogl 2.4.0 - (Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) == 0 && Platform.JAVA_VERSION_UPDATE > 51) && // + (Platform.JAVA_VERSION_NUMBER.compareTo(new VersionNumber(1, 8, 0)) > 0) || // 1.9 or 1.8 > 51 //Version 19 was swapped to version 9 due to JEP 223 in jogl 2.4.0 + (Platform.JAVA_VERSION_NUMBER.compareTo(new VersionNumber(1, 8, 0)) == 0 && Platform.JAVA_VERSION_UPDATE > 51) && // Platform.getJavaVMName().toLowerCase().startsWith("java hotspot(tm)"))// e.g. Java HotSpot(TM) 64-Bit Server VM ; OpenJDK would give OpenJDK 64-Bit Server VM { System.err.println("Issue: The use of an Intel HD2000/3000 driver in combination with Windows 10 and"); diff --git a/src/main/java/org/jogamp/java3d/JoglPipeline.java b/src/main/java/org/jogamp/java3d/JoglPipeline.java index 2c5e4b6..8db33d5 100644 --- a/src/main/java/org/jogamp/java3d/JoglPipeline.java +++ b/src/main/java/org/jogamp/java3d/JoglPipeline.java @@ -79,6 +79,7 @@ import com.jogamp.opengl.Threading; import com.jogamp.common.nio.Buffers; import com.jogamp.common.os.Platform; +import com.jogamp.common.util.VersionNumber; import com.jogamp.nativewindow.awt.AWTGraphicsConfiguration; import com.jogamp.nativewindow.awt.AWTGraphicsDevice; import com.jogamp.nativewindow.awt.AWTGraphicsScreen; @@ -8130,8 +8131,8 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height) } if (Platform.getOSName().equalsIgnoreCase("Windows 10") && //win10 - (Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) > 0) || // 1.9 or 1.8 > 51 //Version 19 was swapped to version 9 due to JEP 223 in jogl 2.4.0 - (Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) == 0 && Platform.JAVA_VERSION_UPDATE > 51) && // + (Platform.JAVA_VERSION_NUMBER.compareTo(new VersionNumber(1, 8, 0)) > 0) || // 1.9 or 1.8 > 51 //Version 19 was swapped to version 9 due to JEP 223 in jogl 2.4.0 + (Platform.JAVA_VERSION_NUMBER.compareTo(new VersionNumber(1, 8, 0)) == 0 && Platform.JAVA_VERSION_UPDATE > 51) && // Platform.getJavaVMName().toLowerCase().startsWith("java hotspot(tm)"))// e.g. Java HotSpot(TM) 64-Bit Server VM ; OpenJDK would give OpenJDK 64-Bit Server VM { System.err.println("Issue: The use of an Intel HD2000/3000 driver in combination with Windows 10 and"); |