From a2158cb64f786fa3b6f4638b18fb10bc13752332 Mon Sep 17 00:00:00 2001
From: Nathan Sweet <nathan.sweet@gmail.com>
Date: Thu, 30 Jun 2022 22:24:46 -0400
Subject: [PATCH] Revert "[libgdx] Rollback SV to LWJGL2 to fix 4.0 SV build."

Nothing to see here!

This reverts commit 4a6e2fee4bb4a198a4c8a65b7b89c2e05eee5dd0.
---
 spine-libgdx/spine-skeletonviewer/.classpath  |  3 +-
 .../spine/SkeletonViewer.java                 | 32 +++++++++++++------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/spine-libgdx/spine-skeletonviewer/.classpath b/spine-libgdx/spine-skeletonviewer/.classpath
index 9de1be132..e8bc7f783 100644
--- a/spine-libgdx/spine-skeletonviewer/.classpath
+++ b/spine-libgdx/spine-skeletonviewer/.classpath
@@ -9,6 +9,7 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/gdx-box2d/libs/gdx-box2d-natives.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/spine-libgdx"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/gdx-backend-lwjgl"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/gdx-backend-lwjgl3"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/gdx-lwjgl3-glfw-awt-macos"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java
index e161eb521..fd0c13f5e 100644
--- a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java
+++ b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java
@@ -35,8 +35,9 @@ import java.lang.reflect.Field;
 import com.badlogic.gdx.ApplicationAdapter;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Preferences;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3WindowAdapter;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.GL20;
@@ -376,13 +377,24 @@ public class SkeletonViewer extends ApplicationAdapter {
 		}
 		if (dpiScale >= 2.0f) uiScale = 2;
 
-		LwjglApplicationConfiguration.disableAudio = true;
-		LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
-		config.width = (int)(800 * uiScale);
-		config.height = (int)(600 * uiScale);
-		config.title = "Skeleton Viewer";
-		config.allowSoftwareMode = true;
-		config.samples = 2;
-		new LwjglApplication(new SkeletonViewer(), config);
+		final SkeletonViewer skeletonViewer = new SkeletonViewer();
+		Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
+		config.disableAudio(true);
+		config.setWindowedMode((int)(800 * uiScale), (int)(600 * uiScale));
+		config.setTitle("Skeleton Viewer " + version);
+		config.setBackBufferConfig(8, 8, 8, 8, 24, 0, 2);
+		config.setWindowListener(new Lwjgl3WindowAdapter() {
+			@Override
+			public void filesDropped (String[] files) {
+				for (String file : files) {
+					for (String endSuffix : endSuffixes) {
+						for (String dataSuffix : dataSuffixes) {
+							if (file.endsWith(dataSuffix + endSuffix) && skeletonViewer.loadSkeleton(Gdx.files.absolute(file))) return;
+						}
+					}
+				}
+			}
+		});
+		new Lwjgl3Application(skeletonViewer, config);
 	}
 }