Stencil test ready

Author: squid233

src/main/java/org/overrun/swgl/core/GlfwApplication.java

@@ -24,6 +24,7 @@
 
 package org.overrun.swgl.core;
 
+import org.lwjgl.glfw.GLFWErrorCallback;
 import org.lwjgl.opengl.GL;
 import org.overrun.swgl.core.gl.GLStateMgr;
 import org.overrun.swgl.core.io.Keyboard;
@@ -87,6 +88,11 @@ public void updateTime() {
     public void boot() {
         try {
             prepare();
+            if (initialErrorCallback == null) {
+                GLFWErrorCallback.createPrint(getDebugStream()).set();
+            } else {
+                GLFWErrorCallback.create(initialErrorCallback).set();
+            }
             if (!glfwInit())
                 throw new IllegalStateException("Unable to initialize GLFW");
 
@@ -103,43 +109,42 @@ public void boot() {
             preStart();
             window = new Window();
             window.createHandle(initialWidth, initialHeight, initialTitle);
-            long hWnd = window.getHandle();
-            window.setResizeFunc((handle, width, height) -> onResize(width, height));
+            window.setResizeCb((handle, width, height) -> onResize(width, height));
 
             // Setup IO
             keyboard = new Keyboard();
             keyboard.setWindow(window);
-            glfwSetKeyCallback(hWnd, (handle, key, scancode, action, mods) -> {
+            window.setKeyCb((handle, key, scancode, action, mods) -> {
                 if (action == GLFW_PRESS) onKeyPress(key, scancode, mods);
                 else if (action == GLFW_RELEASE) onKeyRelease(key, scancode, mods);
                 else if (action == GLFW_REPEAT) onKeyRepeat(key, scancode, mods);
             });
             mouse = new Mouse(this);
             mouse.registerToWindow(window);
-            glfwSetMouseButtonCallback(hWnd, (handle, button, action, mods) -> {
+            window.setMouseBtnCb((handle, button, action, mods) -> {
                 if (action == GLFW_PRESS) onMouseBtnPress(button, mods);
                 else if (action == GLFW_RELEASE) onMouseBtnRelease(button, mods);
             });
-            glfwSetWindowFocusCallback(hWnd, (handle, focused) -> {
+            window.setFocusCb((handle, focused) -> {
                 if (!focused) mouse.firstFocus = true;
             });
-            glfwSetScrollCallback(hWnd, (handle, xoffset, yoffset) -> onScroll(xoffset, yoffset));
+            window.setScrollCb((handle, xoffset, yoffset) -> onScroll(xoffset, yoffset));
 
             timer = new Timer();
-            glfwMakeContextCurrent(hWnd);
+            window.makeContextCurr();
             glfwSwapInterval(initialSwapInterval);
             GL.createCapabilities(true);
             GLStateMgr.init();
             start();
-            glfwShowWindow(hWnd);
+            window.show();
             postStart();
             int frames = 0;
             double lastTime = Timer.getTime();
-            while (!glfwWindowShouldClose(hWnd)) {
+            while (!window.shouldClose()) {
                 updateTime();
                 update();
                 run();
-                glfwSwapBuffers(hWnd);
+                window.swapBuffers();
                 glfwPollEvents();
                 ++frames;
                 while (Timer.getTime() >= lastTime + 1.0) {
@@ -167,6 +172,10 @@ public void boot() {
                 glfwTerminate();
             }
             postClose();
+            var cb = glfwSetErrorCallback(null);
+            if (cb != null) {
+                cb.free();
+            }
         }
     }
 

src/main/java/org/overrun/swgl/core/cfg/GlobalConfig.java

@@ -26,6 +26,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.lwjgl.glfw.GLFWErrorCallbackI;
 
 import java.io.PrintStream;
 
@@ -56,6 +57,10 @@ public class GlobalConfig {
      * The swgl-core version string.
      */
     public static final String SWGL_CORE_VERSION = SWGL_CORE_VER_MAJOR + "." + SWGL_CORE_VER_MINOR + "." + SWGL_CORE_VER_PATCH + (SWGL_CORE_VER_SNAPSHOT != 0 ? "." + SWGL_CORE_VER_SNAPSHOT : "");
+    /**
+     * The initial GLFW error callback.
+     */
+    public static GLFWErrorCallbackI initialErrorCallback = null;
     /**
      * The initial window width.
      */