diff --git a/CHANGES b/CHANGES index 7531ed81..ee24ebbc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +[0.1.4] +- Update libGDX to 1.12.1 +- Update VisUI to 1.5.3 + [0.1.3] - Update libGDX to 1.12.0 - Update gradle to 7.6 diff --git a/gradle.properties b/gradle.properties index 41c22ea5..59edb0bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ -gdxVersion = 1.12.0 -lwjgl3Version = 3.3.2 +gdxVersion = 1.12.1 +lwjgl3Version = 3.3.3 artemisVersion = 2.3.0 spineVersion = 4.1.0 -visuiVersion = 1.5.2 +visuiVersion = 1.5.3 typingLabelVersion = 1.3.0 shapedrawerVersion = 2.5.0 talosVersion = 1.4.0 diff --git a/hyperlap2d-runtime-libgdx b/hyperlap2d-runtime-libgdx index fbb072db..cd76f141 160000 --- a/hyperlap2d-runtime-libgdx +++ b/hyperlap2d-runtime-libgdx @@ -1 +1 @@ -Subproject commit fbb072db1f1114a4edd216bddaba8ba563087fa7 +Subproject commit cd76f1419664a5e9d46638431d431424d2a8b73d diff --git a/src/main/java/com/badlogic/gdx/backends/lwjgl3/GLESUtil.java b/src/main/java/com/badlogic/gdx/backends/lwjgl3/GLESUtil.java index b269a52d..dfbdf605 100644 --- a/src/main/java/com/badlogic/gdx/backends/lwjgl3/GLESUtil.java +++ b/src/main/java/com/badlogic/gdx/backends/lwjgl3/GLESUtil.java @@ -5,8 +5,6 @@ import org.lwjgl.system.Callback; import java.io.PrintStream; -import static org.lwjgl.opengl.GL11C.glEnable; -import static org.lwjgl.opengl.GL11C.glGetInteger; import static org.lwjgl.opengl.GL30C.GL_CONTEXT_FLAGS; import static org.lwjgl.opengl.GL43C.*; import static org.lwjgl.opengl.GL43C.GL_DEBUG_SOURCE_OTHER; @@ -46,9 +44,9 @@ public class GLESUtil { printDetail(stream, "Message", GLDebugMessageCallback.getMessage(length, message)); }); GLES32.glDebugMessageCallback(proc, NULL); - if ((glGetInteger(GL_CONTEXT_FLAGS) & GL_CONTEXT_FLAG_DEBUG_BIT) == 0) { + if ((GLES32.glGetInteger(GL_CONTEXT_FLAGS) & GL_CONTEXT_FLAG_DEBUG_BIT) == 0) { apiLog("[GLES] Warning: A non-debug context may not produce any debug output."); - glEnable(GL_DEBUG_OUTPUT); + GLES32.glEnable(GL_DEBUG_OUTPUT); } return proc; } diff --git a/src/main/java/com/badlogic/gdx/backends/lwjgl3/Lwjgl3ApplicationGLESFix.java b/src/main/java/com/badlogic/gdx/backends/lwjgl3/Lwjgl3ApplicationGLESFix.java index ce49385b..0dbf22f0 100644 --- a/src/main/java/com/badlogic/gdx/backends/lwjgl3/Lwjgl3ApplicationGLESFix.java +++ b/src/main/java/com/badlogic/gdx/backends/lwjgl3/Lwjgl3ApplicationGLESFix.java @@ -464,9 +464,9 @@ public class Lwjgl3ApplicationGLESFix implements Lwjgl3ApplicationBase { window.setVisible(config.initialVisible); for (int i = 0; i < 2; i++) { - GL11.glClearColor(config.initialBackgroundColor.r, config.initialBackgroundColor.g, config.initialBackgroundColor.b, + window.getGraphics().gl20.glClearColor(config.initialBackgroundColor.r, config.initialBackgroundColor.g, config.initialBackgroundColor.b, config.initialBackgroundColor.a); - GL11.glClear(GL11.GL_COLOR_BUFFER_BIT); + window.getGraphics().gl20.glClear(GL11.GL_COLOR_BUFFER_BIT); GLFW.glfwSwapBuffers(windowHandle); } } @@ -587,13 +587,14 @@ public class Lwjgl3ApplicationGLESFix implements Lwjgl3ApplicationBase { } initiateGL(config.glEmulation == Lwjgl3ApplicationConfiguration.GLEmulation.ANGLE_GLES20); + //TODO fix glVersion.getVendorString() to glVersion.getVersionString() in 1.12.2 if (!glVersion.isVersionEqualToOrHigher(2, 0)) throw new GdxRuntimeException("OpenGL 2.0 or higher with the FBO extension is required. OpenGL version: " - + GL11.glGetString(GL11.GL_VERSION) + "\n" + glVersion.getDebugVersionString()); + + glVersion.getVendorString() + "\n" + glVersion.getDebugVersionString()); if (config.glEmulation != Lwjgl3ApplicationConfiguration.GLEmulation.ANGLE_GLES20 && !supportsFBO()) { throw new GdxRuntimeException("OpenGL 2.0 or higher with the FBO extension is required. OpenGL version: " - + GL11.glGetString(GL11.GL_VERSION) + ", FBO extension: false\n" + glVersion.getDebugVersionString()); + + glVersion.getVendorString() + ", FBO extension: false\n" + glVersion.getDebugVersionString()); } if (config.debug) {