Преглед на файлове

Merge pull request #2373 from JNightRider/lwjglx

update LWJGLX (AWT) from 0.1.8 to 0.2.3
Ryan McDonough преди 6 месеца
родител
ревизия
c58abef449
променени са 3 файла, в които са добавени 15 реда и са изтрити 4 реда
  1. 1 1
      gradle/libs.versions.toml
  2. 3 1
      jme3-lwjgl3/build.gradle
  3. 11 2
      jme3-lwjgl3/src/main/java/com/jme3/system/lwjglx/Win32GLPlatform.java

+ 1 - 1
gradle/libs.versions.toml

@@ -23,7 +23,7 @@ jna = "net.java.dev.jna:jna:5.10.0"
 jnaerator-runtime = "com.nativelibs4java:jnaerator-runtime:0.12"
 junit4 = "junit:junit:4.13.2"
 lwjgl2 = "org.jmonkeyengine:lwjgl:2.9.5"
-lwjgl3-awt = "org.lwjglx:lwjgl3-awt:0.1.8"
+lwjgl3-awt = "org.lwjglx:lwjgl3-awt:0.2.3"
 
 lwjgl3-base     = { module = "org.lwjgl:lwjgl",          version.ref = "lwjgl3" }
 lwjgl3-glfw     = { module = "org.lwjgl:lwjgl-glfw",     version.ref = "lwjgl3" }

+ 3 - 1
jme3-lwjgl3/build.gradle

@@ -1,7 +1,9 @@
 dependencies {
     api project(':jme3-core')
     api project(':jme3-desktop')
-    api libs.lwjgl3.awt
+    api (libs.lwjgl3.awt) {
+        exclude group: 'org.lwjgl', module: 'lwjgl'
+    }
 
     api libs.lwjgl3.base
     api libs.lwjgl3.glfw

+ 11 - 2
jme3-lwjgl3/src/main/java/com/jme3/system/lwjglx/Win32GLPlatform.java

@@ -42,8 +42,17 @@ import org.lwjgl.opengl.awt.PlatformWin32GLCanvas;
  */
 final class Win32GLPlatform extends PlatformWin32GLCanvas implements LwjglxGLPlatform {
 
-    /**
-     * (non-Javadoc)
+    /* (non-Javadoc)
+     * @see com.jme3.system.lwjglx.LwjglxGLPlatform#dispose()
+     */
+    @Override
+    public void dispose() {
+        if (ds != null) {
+            super.dispose();
+        }
+    }
+
+    /* (non-Javadoc)
      * @see com.jme3.system.lwjglx.LwjglxGLPlatform#destroy() 
      */
     @Override