Updated ThinGL

Author: RaphiMC

build.gradle

@@ -27,9 +27,7 @@ dependencies {
     }
     includeInJar "net.java.dev.jna:jna:5.17.0"
 
-    includeInJar("net.raphimc:thingl:0.0.6-20250602.204901-1") {
-        exclude group: "org.slf4j", module: "slf4j-api"
-    }
+    includeInJar "net.raphimc:thingl:0.0.7-20250611.224829-3"
     includeInJar "org.lwjgl:lwjgl-glfw:3.3.6"
     includeInJar "org.lwjgl:lwjgl-opengl:3.3.6"
     includeInJar "org.lwjgl:lwjgl-freetype:3.3.6"

src/main/java/net/raphimc/noteblocktool/frames/visualizer/ExtendedThinGL.java

@@ -18,8 +18,8 @@
 package net.raphimc.noteblocktool.frames.visualizer;
 
 import net.raphimc.thingl.ThinGL;
-import net.raphimc.thingl.implementation.ApplicationInterface;
-import net.raphimc.thingl.implementation.WindowInterface;
+import net.raphimc.thingl.implementation.application.ApplicationInterface;
+import net.raphimc.thingl.implementation.window.WindowInterface;
 
 import java.util.function.Function;
 import java.util.function.Supplier;

src/main/java/net/raphimc/noteblocktool/frames/visualizer/NoteBlockToolApplicationInterface.java

@@ -17,96 +17,31 @@
  */
 package net.raphimc.noteblocktool.frames.visualizer;
 
-import net.lenni0451.commons.logging.impl.SysoutLogger;
 import net.raphimc.noteblocktool.util.SoundSystemSongPlayer;
 import net.raphimc.thingl.ThinGL;
-import net.raphimc.thingl.framebuffer.impl.TextureFramebuffer;
-import net.raphimc.thingl.framebuffer.impl.WindowFramebuffer;
-import net.raphimc.thingl.implementation.DebugMessageCallback;
-import net.raphimc.thingl.implementation.GLFWWindowInterface;
-import net.raphimc.thingl.wrapper.Blending;
+import net.raphimc.thingl.implementation.application.StandaloneApplicationInterface;
+import net.raphimc.thingl.implementation.application.StandaloneApplicationRunner;
+import net.raphimc.thingl.implementation.window.GLFWWindowInterface;
 import org.joml.Matrix4fStack;
 import org.lwjgl.glfw.GLFW;
-import org.lwjgl.glfw.GLFWErrorCallback;
-import org.lwjgl.opengl.GL;
-import org.lwjgl.opengl.GL11C;
 
-public class VisualizerWindow {
+public class VisualizerWindow extends StandaloneApplicationRunner {
 
     private final DropRenderer dropRenderer;
+    private final Runnable openCallback;
     private final Runnable closeCallback;
     private final Thread renderThread;
-    private long window;
 
     public VisualizerWindow(final SoundSystemSongPlayer songPlayer, final Runnable openCallback, final Runnable closeCallback) {
+        super(new Configuration()
+                .setWindowTitle("NoteBlockTool Song Visualizer - " + songPlayer.getSong().getTitleOrFileNameOr("No Title"))
+                .setDebugMode(true)
+                .setExtendedDebugMode(false));
+
         this.dropRenderer = new DropRenderer(songPlayer);
+        this.openCallback = openCallback;
         this.closeCallback = closeCallback;
-        this.renderThread = new Thread(() -> {
-            GLFWErrorCallback.createPrint(System.err).set();
-
-            if (!GLFW.glfwInit()) {
-                throw new IllegalStateException("Unable to initialize GLFW");
-            }
-
-            GLFW.glfwDefaultWindowHints();
-            GLFW.glfwWindowHint(GLFW.GLFW_RESIZABLE, GLFW.GLFW_TRUE);
-            GLFW.glfwWindowHint(GLFW.GLFW_FOCUS_ON_SHOW, GLFW.GLFW_FALSE);
-            GLFW.glfwWindowHint(GLFW.GLFW_CLIENT_API, GLFW.GLFW_OPENGL_API);
-            GLFW.glfwWindowHint(GLFW.GLFW_CONTEXT_CREATION_API, GLFW.GLFW_NATIVE_CONTEXT_API);
-            GLFW.glfwWindowHint(GLFW.GLFW_CONTEXT_VERSION_MAJOR, 4);
-            GLFW.glfwWindowHint(GLFW.GLFW_CONTEXT_VERSION_MINOR, 5);
-            GLFW.glfwWindowHint(GLFW.GLFW_OPENGL_PROFILE, GLFW.GLFW_OPENGL_CORE_PROFILE);
-            GLFW.glfwWindowHint(GLFW.GLFW_OPENGL_FORWARD_COMPAT, GLFW.GLFW_TRUE);
-
-            this.window = GLFW.glfwCreateWindow(1280, 720, "NoteBlockTool Song Visualizer - " + songPlayer.getSong().getTitleOrFileNameOr("No Title"), 0L, 0L);
-            if (this.window == 0L) {
-                throw new RuntimeException("Failed to create the GLFW window");
-            }
-            openCallback.run();
-
-            GLFW.glfwMakeContextCurrent(this.window);
-            GLFW.glfwSwapInterval(1);
-            GL.createCapabilities();
-
-            ThinGL.LOGGER = SysoutLogger.builder().name("ThinGL").build();
-            ThinGL.setInstance(new ExtendedThinGL(NoteBlockToolApplicationInterface::new, GLFWWindowInterface::new));
-            DebugMessageCallback.install(false);
-
-            this.dropRenderer.init();
-
-            ThinGL.glStateManager().enable(GL11C.GL_BLEND);
-            Blending.standardBlending();
-            ThinGL.glStateManager().enable(GL11C.GL_DEPTH_TEST);
-            ThinGL.glStateManager().setDepthFunc(GL11C.GL_LEQUAL);
-            final TextureFramebuffer mainFramebuffer = new TextureFramebuffer();
-            mainFramebuffer.setClearColor(0.5F, 0.5F, 0.5F, 0.5F);
-            final Matrix4fStack positionMatrix = new Matrix4fStack(8);
-
-            while (!GLFW.glfwWindowShouldClose(this.window)) {
-                ThinGL.get().onStartFrame();
-                mainFramebuffer.bind(true);
-                mainFramebuffer.clear();
-
-                positionMatrix.pushMatrix();
-                this.dropRenderer.render(positionMatrix);
-                positionMatrix.popMatrix();
-
-                mainFramebuffer.unbind();
-                mainFramebuffer.blitTo(WindowFramebuffer.INSTANCE, true, false, false);
-                ThinGL.get().onFinishFrame();
-                GLFW.glfwSwapBuffers(this.window);
-                GLFW.glfwPollEvents();
-                ThinGL.get().onEndFrame();
-            }
-
-            this.dropRenderer.free();
-            ThinGL.get().free();
-            GLFW.glfwDestroyWindow(this.window);
-            GLFW.glfwTerminate();
-            if (this.closeCallback != null) {
-                this.closeCallback.run();
-            }
-        }, "Visualizer Render Thread");
+        this.renderThread = new Thread(this::launch, "Visualizer Render Thread");
         this.renderThread.setDaemon(true);
         this.renderThread.start();
 
@@ -138,4 +73,42 @@ public void close() {
         }
     }
 
+    @Override
+    protected void setWindowFlags() {
+        super.setWindowFlags();
+        GLFW.glfwWindowHint(GLFW.GLFW_FOCUS_ON_SHOW, GLFW.GLFW_FALSE);
+    }
+
+    @Override
+    protected void createWindow() {
+        super.createWindow();
+        this.openCallback.run();
+    }
+
+    @Override
+    protected ThinGL createThinGL() {
+        return new ExtendedThinGL(StandaloneApplicationInterface::new, GLFWWindowInterface::new);
+    }
+
+    @Override
+    protected void init() {
+        super.init();
+        this.dropRenderer.init();
+        this.mainFramebuffer.setClearColor(0.5F, 0.5F, 0.5F, 0.5F);
+    }
+
+    @Override
+    protected void render(final Matrix4fStack positionMatrix) {
+        this.dropRenderer.render(positionMatrix);
+    }
+
+    @Override
+    protected void free() {
+        this.dropRenderer.free();
+        super.free();
+        if (this.closeCallback != null) {
+            this.closeCallback.run();
+        }
+    }
+
 }